diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index c700328f3d..f8b05abb47 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -529,7 +529,7 @@ public class Lindvior extends AbstractNpcAI for (Location loc : CONTROL_GENERATOR_SPAWNS) { guard = (FriendlyNpc) addSpawn(NPC_GENERATOR, loc, true); - guard.setDisplayEffect(0x01); + guard.setDisplayEffect(1); guard.setScriptValue(i++); _generatorSpawn.add(guard); } @@ -685,7 +685,7 @@ public class Lindvior extends AbstractNpcAI if (!hasFlag(_activeMask, 1 << index)) { _activeMask |= 1 << index; - npc.setDisplayEffect(0x02); + npc.setDisplayEffect(2); sendEventTrigger(true, GENERATOR_TRIGERS[index]); _zoneLair.getPlayersInside().stream().forEach(p -> p.broadcastPacket(new Earthquake(p.getX(), p.getY(), p.getZ(), 20, 10))); if (hasFlag(_activeMask, 0xf)) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/BaseRecievePacket.java index c682cb741d..a6ed15ce32 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/BaseRecievePacket.java @@ -73,7 +73,7 @@ public abstract class BaseRecievePacket try { result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE); - result = result.substring(0, result.indexOf(0x00)); + result = result.substring(0, result.indexOf(0)); _off += (result.length() * 2) + 2; } catch (Exception e) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/BaseSendablePacket.java index a9d918de4c..8fa8491cbf 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/commons/network/BaseSendablePacket.java @@ -117,16 +117,16 @@ public abstract class BaseSendablePacket public byte[] getBytes() { // if (this instanceof Init) - // writeD(0x00); // reserve for XOR initial key + // writeD(0); // reserve for XOR initial key - writeD(0x00); // reserve for checksum + writeD(0); // reserve for checksum final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++) { - writeC(0x00); + writeC(0); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/AttackType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/AttackType.java index 6064b10ed7..e9983f15e3 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/AttackType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/AttackType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum AttackType { - MISSED(0x01), - BLOCKED(0x02), - CRITICAL(0x04), - SHOT_USED(0x08); + MISSED(1), + BLOCKED(2), + CRITICAL(4), + SHOT_USED(8); private final int _mask; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/GroupType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/GroupType.java index 954aaace8b..916a14fd05 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/GroupType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/GroupType.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum GroupType implements IUpdateTypeComponent { - NONE(0x01), - PARTY(0x02), - COMMAND_CHANNEL(0x04); + NONE(1), + PARTY(2), + COMMAND_CHANNEL(4); private int _mask; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/ItemListType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/ItemListType.java index 2d38c8f5b1..c80234439f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/ItemListType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/ItemListType.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum ItemListType implements IUpdateTypeComponent { - AUGMENT_BONUS(0x01), - ELEMENTAL_ATTRIBUTE(0x02), - ENCHANT_EFFECT(0x04), - VISUAL_ID(0x08), - SOUL_CRYSTAL(0x10); + AUGMENT_BONUS(1), + ELEMENTAL_ATTRIBUTE(2), + ENCHANT_EFFECT(4), + VISUAL_ID(8), + SOUL_CRYSTAL(16); private final int _mask; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java index b3d08596c6..29403b783d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum MacroUpdateType { - ADD(0x01), - LIST(0x01), - MODIFY(0x02), - DELETE(0x00); + ADD(1), + LIST(1), + MODIFY(2), + DELETE(0); private final int _id; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java index 86c6159869..7776721c0f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java @@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum PartySmallWindowUpdateType implements IUpdateTypeComponent { - CURRENT_CP(0x01), - MAX_CP(0x02), - CURRENT_HP(0x04), - MAX_HP(0x08), - CURRENT_MP(0x10), - MAX_MP(0x20), - LEVEL(0x40), - CLASS_ID(0x80), - PARTY_SUBSTITUTE(0x100), - VITALITY_POINTS(0x200); + CURRENT_CP(1), + MAX_CP(2), + CURRENT_HP(4), + MAX_HP(8), + CURRENT_MP(16), + MAX_MP(32), + LEVEL(64), + CLASS_ID(128), + PARTY_SUBSTITUTE(256), + VITALITY_POINTS(512); private final int _mask; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 00bb331778..667ce7f17c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.Broadcast; import org.l2jmobius.gameserver.util.Util; /** - * Fromat:(ch) dddddc + * Format:(ch) dddddc * @author -Wooden- */ public class RequestExMagicSkillUseGround implements IClientIncomingPacket diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java index 8744393432..033095e74d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java @@ -39,7 +39,6 @@ public class AbnormalStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ABNORMAL_STATUS_UPDATE.writeId(packet); - packet.writeH(_effects.size()); for (BuffInfo info : _effects) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 1b8ddb2042..bec794bef3 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -44,7 +44,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; } @@ -60,7 +59,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; setHtml(html); } @@ -77,13 +75,11 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } - if (!html.contains(""; return; } - _html = html; } @@ -96,7 +92,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } - setHtml(content); return true; } @@ -138,12 +133,10 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { player.clearHtmlActions(getScope()); } - if (_disabledValidation) { return; } - if (player != null) { Util.buildHtmlActionCache(player, getScope(), _npcObjId, _html); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 515bcf4534..a61c8e01d7 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -72,7 +72,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket= 0) || (item.getAttributeDefence(AttributeType.FIRE) > 0) || (item.getAttributeDefence(AttributeType.WATER) > 0) || (item.getAttributeDefence(AttributeType.WIND) > 0) || (item.getAttributeDefence(AttributeType.EARTH) > 0) || (item.getAttributeDefence(AttributeType.HOLY) > 0) || (item.getAttributeDefence(AttributeType.DARK) > 0)) { mask |= ItemListType.ELEMENTAL_ATTRIBUTE.getMask(); } - if (item.getEnchantOptions() != null) { for (int id : item.getEnchantOptions()) @@ -137,7 +135,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket 0) { mask |= ItemListType.VISUAL_ID.getMask(); @@ -213,7 +210,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket skillRem = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); packet.writeC(skillRem.size()); for (Skill skillRemove : skillRem) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java index 8fa6259f64..6451dffd02 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ActionFailed implements IClientOutgoingPacket { public static final ActionFailed STATIC_PACKET = new ActionFailed(); - private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); + private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); static { for (SkillCastingType castingType : SkillCastingType.values()) @@ -57,7 +57,6 @@ public class ActionFailed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ACTION_FAIL.writeId(packet); - packet.writeD(_castingType); // MagicSkillUse castingType return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java index 6e868368c9..30ce58da60 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java @@ -44,9 +44,8 @@ public class AgitDecoInfo implements IClientOutgoingPacket { continue; } - packet.writeC(_residense.hasFunction(type) ? 0x01 : 0x00); + packet.writeC(_residense.hasFunction(type) ? 1 : 0); } - // Unknown packet.writeD(0); // TODO: Find me! packet.writeD(0); // TODO: Find me! diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java index 6cb71fc985..4683fb30f0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java @@ -44,7 +44,6 @@ public class AllianceInfo implements IClientOutgoingPacket _name = leader.getAllyName(); _leaderC = leader.getName(); _leaderP = leader.getLeaderName(); - final Collection allies = ClanTable.getInstance().getClanAllies(allianceId); _allies = new ClanInfo[allies.size()]; int idx = 0; @@ -57,7 +56,6 @@ public class AllianceInfo implements IClientOutgoingPacket total += ci.getTotal(); online += ci.getOnline(); } - _total = total; _online = online; } @@ -66,18 +64,16 @@ public class AllianceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_INFO.writeId(packet); - packet.writeS(_name); packet.writeD(_total); packet.writeD(_online); packet.writeS(_leaderC); packet.writeS(_leaderP); - packet.writeD(_allies.length); for (ClanInfo aci : _allies) { packet.writeS(aci.getClan().getName()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(aci.getClan().getLevel()); packet.writeS(aci.getClan().getLeaderName()); packet.writeD(aci.getTotal()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java index f9d08f6600..186fd12e81 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java @@ -44,7 +44,6 @@ public class AllyCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java index 6218f1717f..1ae4653f91 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java @@ -38,7 +38,6 @@ public class AskJoinAlly implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_ALLIANCE.writeId(packet); - packet.writeD(_requestorObjId); packet.writeS(null); // Ally Name ? packet.writeS(null); // TODO: Find me! diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java index a66bb3cd33..b9cfbe81b9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java @@ -39,7 +39,6 @@ public class AskJoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_PARTY.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 05c420ff59..227ab571be 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -45,7 +45,6 @@ public class Attack implements IClientOutgoingPacket _attackerObjId = attacker.getObjectId(); _attackerLoc = new Location(attacker); _targetLoc = new Location(target); - final Player player = attacker.getActingPlayer(); if (player == null) { @@ -111,7 +110,6 @@ public class Attack implements IClientOutgoingPacket final Iterator it = _hits.iterator(); final Hit firstHit = it.next(); OutgoingPackets.ATTACK.writeId(packet); - packet.writeD(_attackerObjId); packet.writeD(firstHit.getTargetId()); packet.writeD(_soulshotVisualSubstitute); // Ertheia @@ -121,13 +119,11 @@ public class Attack implements IClientOutgoingPacket packet.writeD(_attackerLoc.getX()); packet.writeD(_attackerLoc.getY()); packet.writeD(_attackerLoc.getZ()); - packet.writeH(_hits.size() - 1); while (it.hasNext()) { writeHit(packet, it.next()); } - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java index bd6878eb42..8b85fe85e3 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java @@ -35,7 +35,6 @@ public class AutoAttackStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_START.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java index e767d1877a..a294b1e212 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java @@ -35,7 +35,6 @@ public class AutoAttackStop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_STOP.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java index 3f329415df..0c79677eae 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java @@ -38,7 +38,6 @@ public class BlockListPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BLOCK_LIST.writeId(packet); - packet.writeD(_playersId.size()); for (int playerId : _playersId) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index f610cdc6aa..d95f0543b9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -45,8 +45,7 @@ public class BuyList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x00); // Type BUY + packet.writeD(0); // Type BUY packet.writeQ(_money); // current money packet.writeD(_listId); packet.writeD(_inventorySlots); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index cd25af908d..7cb2bf4425 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -50,36 +50,34 @@ public class BuyListSeed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BUY_LIST_SEED.writeId(packet); - packet.writeQ(_money); // current money - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeD(_manorId); // manor id - if (!_list.isEmpty()) { packet.writeH(_list.size()); // list length for (SeedProduction s : _list) { - packet.writeC(0x00); // mask item 0 to print minimal item information + packet.writeC(0); // mask item 0 to print minimal item information packet.writeD(s.getId()); // ObjectId packet.writeD(s.getId()); // ItemId packet.writeC(0xFF); // T1 packet.writeQ(s.getAmount()); // Quantity - packet.writeC(0x05); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item - packet.writeC(0x00); // Filler (always 0) - packet.writeH(0x00); // Equipped : 00-No, 01-yes - packet.writeQ(0x00); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand - packet.writeH(0x00); // Enchant level (pet level shown in control item) + packet.writeC(5); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item + packet.writeC(0); // Filler (always 0) + packet.writeH(0); // Equipped : 00-No, 01-yes + packet.writeQ(0); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand + packet.writeH(0); // Enchant level (pet level shown in control item) packet.writeD(-1); packet.writeD(-9999); - packet.writeC(0x01); // GOD Item enabled = 1 disabled (red) = 0 + packet.writeC(1); // GOD Item enabled = 1 disabled (red) = 0 packet.writeQ(s.getPrice()); // price } _list.clear(); } else { - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java index 3a7b67af23..f3dc872dca 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java @@ -32,8 +32,7 @@ public class CSShowComBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - - packet.writeC(0x01); // c4 1 to show community 00 to hide + packet.writeC(1); // c4 1 to show community 00 to hide packet.writeB(_html); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java index eacc27aa07..b18dac4cc3 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java @@ -36,7 +36,6 @@ public class CameraMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CAMERA_MODE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java index 1682f5bc62..adea754676 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java @@ -39,7 +39,6 @@ public class ChairSit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAIR_SIT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_staticObjectId); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java index 2bc31a285a..de141fa067 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java @@ -38,7 +38,6 @@ public class ChangeMoveType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_MOVE_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_running ? RUN : WALK); packet.writeD(0); // c2 diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index 73277d923d..fbe5e39e2e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -22,17 +22,17 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ChangeWaitType implements IClientOutgoingPacket { + public static final int WT_SITTING = 0; + public static final int WT_STANDING = 1; + public static final int WT_START_FAKEDEATH = 2; + public static final int WT_STOP_FAKEDEATH = 3; + private final int _objectId; private final int _moveType; private final int _x; private final int _y; private final int _z; - public static final int WT_SITTING = 0; - public static final int WT_STANDING = 1; - public static final int WT_START_FAKEDEATH = 2; - public static final int WT_STOP_FAKEDEATH = 3; - public ChangeWaitType(Creature creature, int newMoveType) { _objectId = creature.getObjectId(); @@ -46,7 +46,6 @@ public class ChangeWaitType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_WAIT_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_moveType); packet.writeD(_x); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index 41180bac50..aa2e7b2eaa 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -30,7 +30,6 @@ public class CharCreateFail implements IClientOutgoingPacket public static final int REASON_CREATE_NOT_ALLOWED = 0x05; // "Characters cannot be created from this server." public static final int REASON_CHOOSE_ANOTHER_SVR = 0x06; // "Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please // choose another server." - private final int _error; public CharCreateFail(int errorCode) @@ -42,7 +41,6 @@ public class CharCreateFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index f0e99885ad..768617e558 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -31,8 +31,7 @@ public class CharCreateOk implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_SUCCESS.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index bed289ca0a..1674eef343 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -33,7 +33,6 @@ public class CharDeleteFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_DELETE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 4c00912f5c..d767a48d41 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -33,6 +33,22 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { + private static final int[] PAPERDOLL_ORDER = new int[] + { + Inventory.PAPERDOLL_UNDER, + Inventory.PAPERDOLL_HEAD, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_LHAND, + Inventory.PAPERDOLL_GLOVES, + Inventory.PAPERDOLL_CHEST, + Inventory.PAPERDOLL_LEGS, + Inventory.PAPERDOLL_FEET, + Inventory.PAPERDOLL_CLOAK, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_HAIR, + Inventory.PAPERDOLL_HAIR2 + }; + private final Player _player; private final Clan _clan; private int _objId; @@ -55,22 +71,6 @@ public class CharInfo implements IClientOutgoingPacket private int _vehicleId = 0; private final boolean _gmSeeInvis; - private static final int[] PAPERDOLL_ORDER = new int[] - { - Inventory.PAPERDOLL_UNDER, - Inventory.PAPERDOLL_HEAD, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_LHAND, - Inventory.PAPERDOLL_GLOVES, - Inventory.PAPERDOLL_CHEST, - Inventory.PAPERDOLL_LEGS, - Inventory.PAPERDOLL_FEET, - Inventory.PAPERDOLL_CLOAK, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_HAIR, - Inventory.PAPERDOLL_HAIR2 - }; - public CharInfo(Player player, boolean gmSeeInvis) { _player = player; @@ -125,9 +125,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_vehicleId); // Confirmed packet.writeD(_objId); // Confirmed packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed - packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) @@ -152,10 +151,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.getPvpFlag()); packet.writeD(_player.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -166,53 +163,40 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); - packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeS(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle()); - packet.writeD(_player.getAppearance().getVisibleClanId()); packet.writeD(_player.getAppearance().getVisibleClanCrestId()); packet.writeD(_player.getAppearance().getVisibleAllyId()); packet.writeD(_player.getAppearance().getVisibleAllyCrestId()); - - packet.writeC(_player.isSitting() ? 0x00 : 0x01); // Confirmed - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // Confirmed - packet.writeC(_player.isInCombat() ? 0x01 : 0x00); // Confirmed - - packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 0x01 : 0x00); // Confirmed - - packet.writeC(_player.isInvisible() ? 0x01 : 0x00); - + packet.writeC(_player.isSitting() ? 0 : 1); // Confirmed + packet.writeC(_player.isRunning() ? 1 : 0); // Confirmed + packet.writeC(_player.isInCombat() ? 1 : 0); // Confirmed + packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 1 : 0); // Confirmed + packet.writeC(_player.isInvisible() ? 1 : 0); packet.writeC(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount packet.writeC(_player.getPrivateStoreType().getId()); // Confirmed packet.writeH(_player.getCubics().size()); // Confirmed _player.getCubics().keySet().forEach(packet::writeH); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); // Confirmed packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); packet.writeH(_player.getRecomHave()); // Confirmed packet.writeD(_player.getMountNpcId() == 0 ? 0 : _player.getMountNpcId() + 1000000); - packet.writeD(_player.getClassId().getId()); // Confirmed - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeC(_player.isMounted() ? 0 : _enchantLevel); // Confirmed - packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeD(_player.getClanCrestLargeId()); packet.writeC(_player.isNoble() ? 1 : 0); // Confirmed packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed - final ILocational baitLocation = _player.getFishing().getBaitLocation(); if (baitLocation != null) { @@ -228,29 +212,21 @@ public class CharInfo implements IClientOutgoingPacket } packet.writeD(_player.getAppearance().getNameColor()); // Confirmed - packet.writeD(_heading); // Confirmed - packet.writeC(_player.getPledgeClass()); packet.writeH(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); // Confirmed - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - - packet.writeC(0x00); // nPvPRestrainStatus - + packet.writeC(0); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentHp())); // Confirmed packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - - packet.writeC(0x00); // cBRLectureMark + packet.writeC(0); // cBRLectureMark final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed @@ -262,8 +238,9 @@ public class CharInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } + packet.writeC(_player.isTrueHero() ? 100 : 0); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); // Hair accessory + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); // Hair accessory packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 7187b73184..11f5f4df52 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -40,17 +40,16 @@ public class CharSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTED.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getTitle()); packet.writeD(_sessionId); packet.writeD(_player.getClanId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x01); // active ?? + packet.writeD(1); // active ?? packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -62,25 +61,20 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_player.getReputation()); packet.writeD(_player.getPkKills()); packet.writeD(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_player.getClassId().getId()); - packet.writeB(new byte[16]); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeB(new byte[28]); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 90f3a3a889..7e4acd33fb 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -44,10 +44,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { private static final Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); - private final String _loginName; - private final int _sessionId; - private int _activeId; - private final List _characterPackages; private static final int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { @@ -62,6 +58,11 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_HAIR2, }; + private final String _loginName; + private final int _sessionId; + private int _activeId; + private final List _characterPackages; + /** * Constructor for CharSelectionInfo. * @param loginName @@ -92,16 +93,13 @@ public class CharSelectionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.size(); packet.writeD(size); // Created character count - packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) - packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 0x01 : 0x00); // if 1 can't create new char - packet.writeC(0x01); // 0=can't play, 1=can play free until level 85, 2=100% free play - packet.writeD(0x02); // if 1, Korean client - packet.writeC(0x00); // If 1 suggests premium account - + packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 1 : 0); // if 1 can't create new char + packet.writeC(1); // 0=can't play, 1=can play free until level 85, 2=100% free play + packet.writeD(2); // if 1, Korean client + packet.writeC(0); // If 1 suggests premium account long lastAccess = 0; if (_activeId == -1) { @@ -114,7 +112,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - for (int i = 0; i < size; i++) { final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); @@ -122,91 +119,74 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name packet.writeD(_sessionId); // Account ID - packet.writeD(0x00); // Clan ID - packet.writeD(0x00); // Builder level - + packet.writeD(0); // Clan ID + packet.writeD(0); // Builder level packet.writeD(charInfoPackage.getSex()); // Sex packet.writeD(charInfoPackage.getRace()); // Race packet.writeD(charInfoPackage.getBaseClassId()); - - packet.writeD(0x01); // GameServerName - + packet.writeD(1); // GameServerName packet.writeD(charInfoPackage.getX()); packet.writeD(charInfoPackage.getY()); packet.writeD(charInfoPackage.getZ()); packet.writeF(charInfoPackage.getCurrentHp()); packet.writeF(charInfoPackage.getCurrentMp()); - packet.writeQ(charInfoPackage.getSp()); packet.writeQ(charInfoPackage.getExp()); packet.writeF((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel()))); // High // Five packet.writeD(charInfoPackage.getLevel()); - packet.writeD(charInfoPackage.getReputation()); packet.writeD(charInfoPackage.getPkKills()); packet.writeD(charInfoPackage.getPvPKills()); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); // Ertheia - packet.writeD(0x00); // Ertheia - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); // Ertheia + packet.writeD(0); // Ertheia for (int slot : getPaperdollOrder()) { packet.writeD(charInfoPackage.getPaperdollItemId(slot)); } - for (int slot : getPaperdollOrderVisualId()) { packet.writeD(charInfoPackage.getPaperdollItemVisualId(slot)); } - packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_CHEST)); // Upper Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_LEGS)); // Lower Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_HEAD)); // Headgear enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_GLOVES)); // Gloves enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_FEET)); // Boots enchant level - packet.writeD(charInfoPackage.getHairStyle()); packet.writeD(charInfoPackage.getHairColor()); packet.writeD(charInfoPackage.getFace()); - packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); - packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption1Id() : 0); // Mobius: Maybe use 2x writeH? // packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption2Id() : 0); - // packet.writeD(charInfoPackage.getTransformId()); // Used to display Transformations - packet.writeD(0x00); // Currently on retail when you are on character select you don't see your transformation. - - packet.writeD(0x00); // Pet NpcId - packet.writeD(0x00); // Pet level - packet.writeD(0x00); // Pet Food - packet.writeD(0x00); // Pet Food Level - packet.writeF(0x00); // Current pet HP - packet.writeF(0x00); // Current pet MP - + packet.writeD(0); // Currently on retail when you are on character select you don't see your transformation. + packet.writeD(0); // Pet NpcId + packet.writeD(0); // Pet level + packet.writeD(0); // Pet Food + packet.writeD(0); // Pet Food Level + packet.writeF(0); // Current pet HP + packet.writeF(0); // Current pet MP packet.writeD(charInfoPackage.getVitalityPoints()); // Vitality packet.writeD((int) Config.RATE_VITALITY_EXP_MULTIPLIER * 100); // Vitality Percent packet.writeD(charInfoPackage.getVitalityItemsUsed()); // Remaining vitality item uses - packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0x00 : 0x01); // Char is active or not - packet.writeC(charInfoPackage.isNoble() ? 0x01 : 0x00); - packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 0x01 : 0x00); // Hero glow - packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 0x01 : 0x00); // Show hair accessory if enabled + packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0 : 1); // Char is active or not + packet.writeC(charInfoPackage.isNoble() ? 1 : 0); + packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 1 : 0); // Hero glow + packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 1 : 0); // Show hair accessory if enabled } return true; } @@ -215,7 +195,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); - try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate")) { @@ -228,7 +207,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (charInfopackage != null) { characterList.add(charInfopackage); - final Player player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { @@ -242,7 +220,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return characterList; } @@ -284,7 +261,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { clan.removeClanMember(objectId, 0); } - GameClient.deleteCharByObjId(objectId); return null; } @@ -303,20 +279,16 @@ public class CharSelectionInfo implements IClientOutgoingPacket charInfopackage.setHairStyle(chardata.getInt("hairstyle")); charInfopackage.setHairColor(chardata.getInt("haircolor")); charInfopackage.setSex(chardata.getInt("sex")); - charInfopackage.setExp(chardata.getLong("exp")); charInfopackage.setSp(chardata.getLong("sp")); charInfopackage.setVitalityPoints(chardata.getInt("vitality_points")); charInfopackage.setClanId(chardata.getInt("clanid")); - charInfopackage.setRace(chardata.getInt("race")); - final int baseClassId = chardata.getInt("base_class"); final int activeClassId = chardata.getInt("classid"); charInfopackage.setX(chardata.getInt("x")); charInfopackage.setY(chardata.getInt("y")); charInfopackage.setZ(chardata.getInt("z")); - final int faction = chardata.getInt("faction"); if (faction == 1) { @@ -326,7 +298,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setEvil(); } - if (Config.MULTILANG_ENABLE) { String lang = chardata.getString("language"); @@ -336,22 +307,18 @@ public class CharSelectionInfo implements IClientOutgoingPacket } charInfopackage.setHtmlPrefix("data/lang/" + lang + "/"); } - // if is in subclass, load subclass exp, sp, level info if (baseClassId != activeClassId) { loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId); } - charInfopackage.setClassId(activeClassId); - // Get the augmentation id for equipped weapon int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); if (weaponObjId < 1) { weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); } - if (weaponObjId > 0) { try (Connection con = DatabaseFactory.getConnection(); @@ -377,7 +344,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } - // Check if the base class is set to zero and also doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly. if ((baseClassId == 0) && (activeClassId > 0)) { @@ -387,7 +353,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setBaseClassId(baseClassId); } - charInfopackage.setDeleteTimer(deletetime); charInfopackage.setLastAccess(chardata.getLong("lastAccess")); charInfopackage.setNoble(chardata.getInt("nobless") == 1); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java index 847e24db87..d59df7911a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java @@ -32,7 +32,6 @@ public class ChooseInventoryItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHOOSE_INVENTORY_ITEM.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java index 12a3940521..ac66c2fa0f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java @@ -32,7 +32,6 @@ public class ClientSetTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CLIENT_SET_TIME.writeId(packet); - packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // time in client minutes packet.writeD(6); // constant to match the server time( this determines the speed of the client clock) return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java index f1f37874c8..c748581e7c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java @@ -68,7 +68,6 @@ public class ConfirmDlg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CONFIRM_DLG.writeId(packet); - final SMParam[] params = _systemMessage.getParams(); packet.writeD(_systemMessage.getId()); packet.writeD(params.length); @@ -129,7 +128,6 @@ public class ConfirmDlg implements IClientOutgoingPacket } } } - packet.writeD(_time); packet.writeD(_requesterId); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 2a98428740..85d5630327 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -71,7 +71,6 @@ public class CreatureSay implements IClientOutgoingPacket _mask |= 0x08; } } - // Does not shows level if (sender.isGM()) { @@ -123,7 +122,6 @@ public class CreatureSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_sender == null ? 0 : _sender.getObjectId()); packet.writeD(_chatType.getClientId()); if (_senderName != null) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index dfc40d995f..a307b06e4b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -38,9 +38,8 @@ public class DeleteObject implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DELETE_OBJECT.writeId(packet); - packet.writeD(_objectId); - packet.writeC(0x00); // c2 + packet.writeC(0); // c2 return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java index 982c8f3311..3b5917e55b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java @@ -50,7 +50,6 @@ public class Dice implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DICE.writeId(packet); - packet.writeD(_objectId); // object id of player packet.writeD(_itemId); // item id of dice (spade) 4625,4626,4627,4628 packet.writeD(_number); // number rolled diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 3d741a86a6..ebc93d0fc4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -68,7 +68,6 @@ public class Die implements IClientOutgoingPacket siegeClan = fort.getSiege().getAttackerClan(clan); isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan); } - _toVillage = creature.canRevive() && !creature.isPendingRevive(); _toClanHall = (clan != null) && (clan.getHideoutId() > 0); _toCastle = ((clan != null) && (clan.getCastleId() > 0)) || isInCastleDefense; @@ -76,7 +75,6 @@ public class Die implements IClientOutgoingPacket _useFeather = creature.getAccessLevel().allowFixedRes() || creature.getInventory().haveItemForSelfResurrection(); _toFortress = ((clan != null) && (clan.getFortId() > 0)) || isInFortDefense; } - _isSweepable = creature.isAttackable() && creature.isSweepActive(); } @@ -91,7 +89,6 @@ public class Die implements IClientOutgoingPacket { _items = new ArrayList<>(8); } - if (_items.size() < 8) { _items.add(itemId); @@ -116,20 +113,18 @@ public class Die implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DIE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_toVillage ? 0x01 : 0x00); - packet.writeD(_toClanHall ? 0x01 : 0x00); - packet.writeD(_toCastle ? 0x01 : 0x00); - packet.writeD(_toOutpost ? 0x01 : 0x00); - packet.writeD(_isSweepable ? 0x01 : 0x00); - packet.writeD(_useFeather ? 0x01 : 0x00); - packet.writeD(_toFortress ? 0x01 : 0x00); - packet.writeD(0x00); // Disables use Feather button for X seconds - packet.writeD(0x00); // Adventure's Song - packet.writeC(_hideAnimation ? 0x01 : 0x00); - - packet.writeD(_itemsEnabled ? 0x01 : 0x00); + packet.writeD(_toVillage ? 1 : 0); + packet.writeD(_toClanHall ? 1 : 0); + packet.writeD(_toCastle ? 1 : 0); + packet.writeD(_toOutpost ? 1 : 0); + packet.writeD(_isSweepable ? 1 : 0); + packet.writeD(_useFeather ? 1 : 0); + packet.writeD(_toFortress ? 1 : 0); + packet.writeD(0); // Disables use Feather button for X seconds + packet.writeD(0); // Adventure's Song + packet.writeC(_hideAnimation ? 1 : 0); + packet.writeD(_itemsEnabled ? 1 : 0); packet.writeD(getItems().size()); getItems().forEach(packet::writeD); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java index 15404f9dee..5837faec19 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java @@ -33,7 +33,6 @@ public class DoorInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_INFO.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.getId()); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java index 54f8742a73..14d41afee7 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java @@ -33,7 +33,6 @@ public class DoorStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_STATUS_UPDATE.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.isOpen() ? 0 : 1); packet.writeD(_door.getDamage()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index cfa4f6759d..52e04af09c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -40,20 +40,17 @@ public class DropItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DROP_ITEM.writeId(packet); - packet.writeD(_objectId); packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeC(_item.isStackable() ? 0x01 : 0x00); + packet.writeC(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - - packet.writeC(0x00); - // packet.writeD(0x01); if above C == true (1) then packet.readD() + packet.writeC(0); + // packet.writeD(1); if above C == true (1) then packet.readD() return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java index 631c43ba0c..99bd80d97e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java @@ -62,13 +62,12 @@ public class Earthquake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EARTHQUAKE.writeId(packet); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_intensity); packet.writeD(_duration); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index db168592f1..335ea9dced 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -58,7 +58,6 @@ public class EnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_crystal); packet.writeQ(_count); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java index 837be1f5e3..169410245b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java @@ -41,7 +41,6 @@ public class EtcStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ETC_STATUS_UPDATE.writeId(packet); - packet.writeC(_player.getCharges()); // 1-7 increase force, level packet.writeD(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%) packet.writeC(_player.getExpertiseWeaponPenalty()); // Weapon Grade Penalty [1-4] diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java index 5dca90f960..9f8d576148 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java @@ -24,13 +24,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class Ex2ndPasswordAck implements IClientOutgoingPacket { + // TODO: Enum + public static final int SUCCESS = 0; + public static final int WRONG_PATTERN = 1; + private final int _status; private final int _response; - // TODO: Enum - public static final int SUCCESS = 0x00; - public static final int WRONG_PATTERN = 0x01; - public Ex2ndPasswordAck(int status, int response) { _status = status; @@ -41,10 +41,9 @@ public class Ex2ndPasswordAck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_ACK.writeId(packet); - packet.writeC(_status); - packet.writeD(_response == WRONG_PATTERN ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(_response == WRONG_PATTERN ? 1 : 0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java index 48bde5161d..c86b5185d0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordCheck implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_NEW = 0x00; - public static final int PASSWORD_PROMPT = 0x01; - public static final int PASSWORD_OK = 0x02; + public static final int PASSWORD_NEW = 0; + public static final int PASSWORD_PROMPT = 1; + public static final int PASSWORD_OK = 2; private final int _windowType; @@ -40,9 +40,8 @@ public class Ex2ndPasswordCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_CHECK.writeId(packet); - packet.writeD(_windowType); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java index 1abf50ab01..f6731bf18f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordVerify implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_OK = 0x00; - public static final int PASSWORD_WRONG = 0x01; - public static final int PASSWORD_BAN = 0x02; + public static final int PASSWORD_OK = 0; + public static final int PASSWORD_WRONG = 1; + public static final int PASSWORD_BAN = 2; private final int _wrongTentatives; private final int _mode; @@ -42,7 +42,6 @@ public class Ex2ndPasswordVerify implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_VERIFY.writeId(packet); - packet.writeD(_mode); packet.writeD(_wrongTentatives); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java index 55abf718c5..db551344ef 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java @@ -45,10 +45,8 @@ public class ExAbnormalStatusUpdateFromTarget implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ABNORMAL_STATUS_UPDATE_FROM_TARGET.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeH(_effects.size()); - for (BuffInfo info : _effects) { packet.writeD(info.getSkill().getDisplayId()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java index c4b9cd8356..f3abd6ec5c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java @@ -41,7 +41,6 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRABLE_SKILL_LIST_BY_CLASS.writeId(packet); - packet.writeH(_type.getId()); packet.writeH(_learnable.size()); for (SkillLearn skill : _learnable) @@ -54,7 +53,7 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket packet.writeC(skill.getRequiredItems().size()); if (_type == AcquireSkillType.SUBPLEDGE) { - packet.writeH(0x00); + packet.writeH(0); } } return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java index fd0e2fc97c..8555bb6e86 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java @@ -61,7 +61,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_SKILL_INFO.writeId(packet); - packet.writeD(_id); packet.writeD(_level); packet.writeQ(_spCost); @@ -73,7 +72,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket packet.writeD(holder.getId()); packet.writeQ(holder.getCount()); } - packet.writeD(_skillRem.size()); for (Skill skill : _skillRem) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java index 29793f4d6c..ff8c526ec4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java @@ -36,7 +36,6 @@ public class ExAdenaInvenCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ADENA_INVEN_COUNT.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeH(_player.getInventory().getSize()); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java index 2aa2d85bc5..5ef11e0f1e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java @@ -50,13 +50,11 @@ public class ExAirShipInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_INFO.writeId(packet); - packet.writeD(_ship.getObjectId()); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(_captain); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); @@ -73,14 +71,13 @@ public class ExAirShipInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - packet.writeD(_ship.getFuel()); packet.writeD(_ship.getMaxFuel()); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java index 4cfc76bfba..8b37f4fc0a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java @@ -42,7 +42,6 @@ public class ExAirShipStopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_airShipId); packet.writeD(_playerId); packet.writeD(_x); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java index 33c57712da..52958f931b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java @@ -37,12 +37,10 @@ public class ExAirShipTeleportList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_TELEPORT_LIST.writeId(packet); - packet.writeD(_dockId); if (_teleports != null) { packet.writeD(_teleports.length); - for (int i = 0; i < _teleports.length; i++) { packet.writeD(i - 1); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java index 392b228f0d..7918022c72 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java @@ -50,13 +50,12 @@ public class ExAlchemySkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_SKILL_LIST.writeId(packet); - packet.writeD(_skills.size()); for (Skill skill : _skills) { packet.writeD(skill.getId()); packet.writeD(skill.getLevel()); - packet.writeQ(0x00); // Always 0 on Naia, SP i guess? + packet.writeQ(0); // Always 0 on Naia, SP i guess? packet.writeC(skill.getId() == CommonSkill.ALCHEMY_CUBE.getId() ? 0 : 1); // This is type in flash, visible or not } return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java index 3bfadd2650..ed7f8d4255 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java @@ -47,12 +47,10 @@ public class ExAlterSkillRequest implements IClientOutgoingPacket { return true; } - OutgoingPackets.EX_ALTER_SKILL_REQUEST.writeId(packet); packet.writeD(_nextSkillId); packet.writeD(_currentSkillId); packet.writeD(_alterTime); - if (_alterTime > 0) { _player.setAlterSkillActive(true); @@ -62,7 +60,6 @@ public class ExAlterSkillRequest implements IClientOutgoingPacket _player.setAlterSkillActive(false); }, _alterTime * 1000); } - return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java index 3d7ee12a81..1990e1e701 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java @@ -37,7 +37,6 @@ public class ExAskCoupleAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_COUPLE_ACTION.writeId(packet); - packet.writeD(_actionId); packet.writeD(_objectId); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java index 61cabedd98..45615daf5a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java @@ -39,9 +39,8 @@ public class ExAskJoinMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_MPCC.writeId(packet); - packet.writeS(_requestorName); // name of CCLeader - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java index 17fa9d028f..908022ff7e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java @@ -38,7 +38,6 @@ public class ExAskJoinPartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_PARTY_ROOM.writeId(packet); - packet.writeS(_charName); packet.writeS(_roomName); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java index 2a6b958dc9..1551840013 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java @@ -38,7 +38,6 @@ public class ExAskModifyPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_MODIFY_PARTY_LOOTING.writeId(packet); - packet.writeS(_requestor); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java index 958e7c3d06..fa62c8a207 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java @@ -45,7 +45,6 @@ public class ExAttributeEnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ATTRIBUTE_ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeC(_isWeapon); packet.writeH(_type); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java index 351c92de32..9866b5b536 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java @@ -42,9 +42,8 @@ public class ExAutoSoulShot implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AUTO_SOUL_SHOT.writeId(packet); - packet.writeD(_itemId); - // packet.writeD(_enable ? 0x01 : 0x00); + // packet.writeD(_enable ? 1 : 0); packet.writeD(_type); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java index 8680c6bd7a..a8137347ec 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java @@ -37,8 +37,7 @@ public class ExBaseAttributeCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASE_ATTRIBUTE_CANCEL_RESULT.writeId(packet); - - packet.writeD(0x01); // result + packet.writeD(1); // result packet.writeD(_objId); packet.writeD(_attribute); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java index acbad69599..27f7fb5a63 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java @@ -75,7 +75,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 1149, 1150, 1151, 1152, 1153, 1154, 1155 }; - public static final int[] DEFAULT_ACTION_LIST = { 0, 1, 2, 3, @@ -145,7 +144,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 5012, 5013, 5014, 5015 }; //@formatter:on - public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST); private final int[] _actionIds; @@ -159,7 +157,6 @@ public class ExBasicActionList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASIC_ACTION_LIST.writeId(packet); - packet.writeD(_actionIds.length); for (int _actionId : _actionIds) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java index 4c4fac8c91..d32dca4d21 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java @@ -34,13 +34,14 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBeautyItemList implements IClientOutgoingPacket { - private int _colorCount; - private final BeautyData _beautyData; - private final Map> _colorData = new HashMap<>(); private static final int HAIR_TYPE = 0; private static final int FACE_TYPE = 1; private static final int COLOR_TYPE = 2; + private int _colorCount; + private final BeautyData _beautyData; + private final Map> _colorData = new HashMap<>(); + public ExBeautyItemList(Player player) { _beautyData = BeautyShopData.getInstance().getBeautyData(player.getRace(), player.getAppearance().getSexType()); @@ -60,7 +61,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BEAUTY_ITEM_LIST.writeId(packet); - packet.writeD(HAIR_TYPE); packet.writeD(_beautyData.getHairList().size()); for (BeautyItem hair : _beautyData.getHairList().values()) @@ -72,7 +72,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(hair.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(FACE_TYPE); packet.writeD(_beautyData.getFaceList().size()); for (BeautyItem face : _beautyData.getFaceList().values()) @@ -84,7 +83,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(face.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(COLOR_TYPE); packet.writeD(_colorCount); for (Entry> entry : _colorData.entrySet()) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java index 1825236886..6d4c45cb2b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java @@ -34,7 +34,6 @@ public class ExBirthdayPopup implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_BIRTH_DAY.writeId(packet); - return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java index 7d2f17e697..43e525f05f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java @@ -26,6 +26,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBrBroadcastEventState implements IClientOutgoingPacket { + public static final int APRIL_FOOLS = 20090401; + public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) + public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) + public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) + public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) + private final int _eventId; private final int _eventState; private int _param0; @@ -36,12 +42,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket private String _param5; private String _param6; - public static final int APRIL_FOOLS = 20090401; - public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) - public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) - public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) - public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) - public ExBrBroadcastEventState(int eventId, int eventState) { _eventId = eventId; @@ -65,7 +65,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BROADCAST_EVENT_STATE.writeId(packet); - packet.writeD(_eventId); packet.writeD(_eventState); packet.writeD(_param0); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java index 1fd7ec663a..c0683c8797 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java @@ -44,7 +44,6 @@ public class ExBrBuffEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUFF_EVENT_STATE.writeId(packet); - packet.writeD(_type); packet.writeD(_value); packet.writeD(_state); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java index 943aae8a62..8e009d7b09 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java @@ -43,7 +43,6 @@ public class ExBrLoadEventTopRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_LOAD_EVENT_TOP_RANKERS.writeId(packet); - packet.writeD(_eventId); packet.writeD(_day); packet.writeD(_count); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java index 6a98c01654..9105e39efe 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java @@ -36,9 +36,8 @@ public class ExBrPremiumState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PREMIUM_STATE.writeId(packet); - packet.writeD(_player.getObjectId()); - packet.writeC(_player.hasPremiumStatus() ? 0x01 : 0x00); + packet.writeC(_player.hasPremiumStatus() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 381dd859ad..567cfc70f9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -59,10 +59,8 @@ public class ExBuySellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x01); // Type SELL + packet.writeD(1); // Type SELL packet.writeD(_inventorySlots); - if ((_sellList != null)) { packet.writeH(_sellList.size()); @@ -74,9 +72,8 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - if ((_refundList != null) && !_refundList.isEmpty()) { packet.writeH(_refundList.size()); @@ -90,10 +87,9 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - - packet.writeC(_done ? 0x01 : 0x00); + packet.writeC(_done ? 1 : 0); return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java index 2b43c0ce4b..e0ec81e0e7 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java @@ -39,7 +39,6 @@ public class ExCastleState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CASTLE_STATE.writeId(packet); - packet.writeD(_castleId); packet.writeD(_castleSide.ordinal()); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java index b7f90d261b..a8196c7a83 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java @@ -52,7 +52,6 @@ public class ExChangeClientEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_CLIENT_EFFECT_INFO.writeId(packet); - packet.writeD(_type); packet.writeD(_key); packet.writeD(_value); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java index 472abc88df..eea59162ee 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java @@ -37,7 +37,6 @@ public class ExChangeNpcState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NPC_STATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java index 8cdcb4460d..45f2805517 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java @@ -49,7 +49,6 @@ public class ExChangePostState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_POST_STATE.writeId(packet); - packet.writeD(_receivedBoard ? 1 : 0); packet.writeD(_changedMsgIds.length); for (int postId : _changedMsgIds) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java index fc58ec9a2e..d765ab54e0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java @@ -35,7 +35,6 @@ public class ExChangeToAwakenedClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_TO_AWAKENED_CLASS.writeId(packet); - packet.writeD(_classId); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index f51a3eb3ae..1e9b8e9dc8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -47,7 +47,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket throw new IllegalArgumentException("Undefined Atribute item: " + stone); } _level = ElementalAttributeData.getInstance().getMaxElementLevel(_itemId); - // Register only items that can be put an attribute stone/crystal for (Item item : player.getInventory().getItems()) { @@ -62,7 +61,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_INVENTORY_ATTRIBUTE_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeQ(_count); packet.writeD(_atribute == AttributeType.FIRE ? 1 : 0); // Fire diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java index a272d85469..238882cd11 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java @@ -35,7 +35,6 @@ public class ExCloseMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java index d2ecd70952..877bca760a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java @@ -34,7 +34,6 @@ public class ExClosePartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_PARTY_ROOM.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java index 27c112776b..1d02c972b5 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java @@ -54,7 +54,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLOSSEUM_FENCE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_clientState); packet.writeD(_x); @@ -62,7 +61,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_width); packet.writeD(_length); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java index 766d3619ad..b72bef93e8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java @@ -37,9 +37,8 @@ public class ExConfirmAddingContact implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AGIT_AUCTION_CMD.writeId(packet); - packet.writeS(_charName); - packet.writeD(_added ? 0x01 : 0x00); + packet.writeD(_added ? 1 : 0); return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java index beded32254..c832d507ed 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameAddPlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x01); - + packet.writeD(1); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java index 5f36f730d0..847ea93e6a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java @@ -45,9 +45,7 @@ public class ExCubeGameChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java index 66abbf4b75..a2f2e61ded 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java @@ -43,12 +43,10 @@ public class ExCubeGameChangeTeam implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x05); - + packet.writeD(5); packet.writeD(_player.getObjectId()); - packet.writeD(_fromRedTeam ? 0x01 : 0x00); - packet.writeD(_fromRedTeam ? 0x00 : 0x01); + packet.writeD(_fromRedTeam ? 1 : 0); + packet.writeD(_fromRedTeam ? 0 : 1); return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java index 5273b2099a..136b439283 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java @@ -39,9 +39,7 @@ public class ExCubeGameChangeTimeToStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x03); - + packet.writeD(3); packet.writeD(_seconds); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java index f81a302941..9bdba49029 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java @@ -35,7 +35,6 @@ public class ExCubeGameCloseUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0xffffffff); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java index 259a0e9407..3177e7a488 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java @@ -40,11 +40,9 @@ public class ExCubeGameEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x01); - - packet.writeD(_isRedTeamWin ? 0x01 : 0x00); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(1); + packet.writeD(_isRedTeamWin ? 1 : 0); + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java index 4d89e621ce..8b96bb545f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java @@ -55,14 +55,11 @@ public class ExCubeGameExtendedChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeD(_playerPoints); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java index e5a00f1ab7..c084789f13 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameRemovePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java index 00be884d2f..35a3f289d1 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java @@ -35,8 +35,7 @@ public class ExCubeGameRequestReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x04); + packet.writeD(4); return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java index 1bc89e0c32..8b755dd3cc 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java @@ -30,7 +30,6 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket // Players Lists private final List _bluePlayers; private final List _redPlayers; - // Common Values private final int _roomNumber; @@ -51,12 +50,9 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_roomNumber); packet.writeD(0xffffffff); - packet.writeD(_bluePlayers.size()); for (Player player : _bluePlayers) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java index 2f2c092c08..d000112787 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java @@ -31,7 +31,6 @@ public class ExCursedWeaponList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet); - final Set ids = CursedWeaponsManager.getInstance().getCursedWeaponsIds(); packet.writeD(ids.size()); ids.forEach(packet::writeD); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java index 2f60a1b80c..5bc7ff3238 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java @@ -39,7 +39,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet); - if (!_cursedWeaponInfo.isEmpty()) { packet.writeD(_cursedWeaponInfo.size()); @@ -47,7 +46,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { packet.writeD(w.id); packet.writeD(w.activated); - packet.writeD(w.pos.getX()); packet.writeD(w.pos.getY()); packet.writeD(w.pos.getZ()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java index f475a02b28..0456fb9dae 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java @@ -34,7 +34,6 @@ public class ExDissmissMPCCRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DISSMISS_MPCC_ROOM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java index 258010f717..c731b7c7a9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java @@ -37,7 +37,6 @@ public class ExDuelAskStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_ASK_START.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDuel); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java index 043c82c0db..e9a31bee57 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java @@ -38,7 +38,6 @@ public class ExDuelEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_END.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java index 264409b3d6..e1fa1cea88 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java @@ -38,7 +38,6 @@ public class ExDuelReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_READY.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java index 488aafcb7d..ecdd528a16 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java @@ -38,7 +38,6 @@ public class ExDuelStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_START.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java index 7df040c5e7..5ed0c09675 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java @@ -36,7 +36,6 @@ public class ExDuelUpdateUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_UPDATE_USER_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeD(_player.getClassId().getId()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 6ef5fabe55..e386105732 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -26,7 +26,6 @@ import org.l2jmobius.gameserver.util.SkillEnchantConverter; public class ExEnchantSkillInfo implements IClientOutgoingPacket { private final Set _routes; - private final int _skillId; private final int _skillLevel; private final int _skillSubLevel; @@ -45,7 +44,6 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_INFO.writeId(packet); - packet.writeD(_skillId); packet.writeD(_skillSubLevel > 1000 ? SkillEnchantConverter.levelToErtheia(_skillSubLevel) : _skillLevel); packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 98b26f6c83..e796d9a2e9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -46,7 +46,6 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_INFO_DETAIL.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeD(_skillLevel); @@ -54,7 +53,7 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket { packet.writeQ(_enchantSkillHolder.getSp(_type)); packet.writeD(_enchantSkillHolder.getChance(_type)); - packet.writeD(0x02); // item count + packet.writeD(2); // item count packet.writeD(_enchantSkillHolder.getRequiredAdena(_type).getId()); packet.writeD((int) _enchantSkillHolder.getRequiredAdena(_type).getCount()); packet.writeD(_enchantSkillHolder.getRequiredBook(_type).getId()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java index 7956e85906..e1dc1b7a6e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java @@ -43,7 +43,6 @@ public class ExEnchantSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_LIST.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skills.size()); for (Skill skill : _skills) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java index 6ab5e869f2..853d74039f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java @@ -38,7 +38,6 @@ public class ExEnchantSkillResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_RESULT.writeId(packet); - packet.writeD(_enchanted ? 1 : 0); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java index 7b7d2d008d..410bf16510 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java @@ -42,7 +42,6 @@ public class ExEventMatchMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_EVENT_MATCH_MESSAGE.writeId(packet); - packet.writeC(_type); packet.writeS(_message); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java index 7264e90233..1946758bf5 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java @@ -37,11 +37,9 @@ public class ExGetBookMarkInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOOK_MARK_INFO.writeId(packet); - - packet.writeD(0x00); // Dummy + packet.writeD(0); // Dummy packet.writeD(_player.getBookMarkSlot()); packet.writeD(_player.getTeleportBookmarks().size()); - for (TeleportBookmark tpbm : _player.getTeleportBookmarks()) { packet.writeD(tpbm.getId()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java index 36e7bb81af..201e8eb49b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java @@ -42,15 +42,14 @@ public class ExGetBossRecord implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOSS_RECORD.writeId(packet); - packet.writeD(_ranking); packet.writeD(_totalPoints); if (_bossRecordInfo == null) { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } else { @@ -59,7 +58,7 @@ public class ExGetBossRecord implements IClientOutgoingPacket { packet.writeD(entry.getKey()); packet.writeD(entry.getValue()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? } } return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java index ea0a5f8b18..85ccad0758 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java @@ -41,7 +41,6 @@ public class ExGetOffAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_OFF_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_x); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java index f8e16a4191..9a02e49223 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java @@ -39,7 +39,6 @@ public class ExGetOnAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_ON_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java index 51197344a5..704b3212a1 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExGetPremiumItemList implements IClientOutgoingPacket { private final Player _player; - private final Map _map; public ExGetPremiumItemList(Player player) @@ -43,7 +42,6 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_PREMIUM_ITEM_LIST.writeId(packet); - packet.writeD(_map.size()); for (Entry entry : _map.entrySet()) { @@ -51,7 +49,7 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket packet.writeQ(entry.getKey()); packet.writeD(item.getItemId()); packet.writeQ(item.getCount()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeS(item.getSender()); } return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index 71754ea3ca..0dd410ca2b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -40,7 +40,6 @@ public class ExHeroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HERO_LIST.writeId(packet); - packet.writeD(_heroList.size()); for (StatSet hero : _heroList.values()) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index f7ab7c4fa3..c424b903be 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -46,7 +46,6 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); - packet.writeD(_currentTemplateId); packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java index 81db66b88f..323c0cdf1e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java @@ -35,7 +35,6 @@ public class ExIsCharNameCreatable implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_IS_CHAR_NAME_CREATABLE.writeId(packet); - packet.writeD(_allowed); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java index ecc751eab3..45def9e0be 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java @@ -38,7 +38,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { throw new NullPointerException(); } - if (currentAuction.getAuctionState() != ItemAuctionState.STARTED) { _timeRemaining = 0; @@ -47,7 +46,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { _timeRemaining = (int) (currentAuction.getFinishingTimeRemaining() / 1000); // in seconds } - _refresh = refresh; _currentAuction = currentAuction; _nextAuction = nextAuction; @@ -57,16 +55,12 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_AUCTION_INFO.writeId(packet); - - packet.writeC(_refresh ? 0x00 : 0x01); + packet.writeC(_refresh ? 0 : 1); packet.writeD(_currentAuction.getInstanceId()); - final ItemAuctionBid highestBid = _currentAuction.getHighestBid(); packet.writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid()); - packet.writeD(_timeRemaining); writeItem(packet, _currentAuction.getItemInfo()); - if (_nextAuction != null) { packet.writeQ(_nextAuction.getAuctionInitBid()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java index 53ad8abd58..1c5e38cbab 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListMpccWaiting implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _rooms = new LinkedList<>(); @@ -53,7 +54,6 @@ public class ExListMpccWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_MPCC_WAITING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 78f2fec636..eafea24fa6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _players = new LinkedList<>(); @@ -60,7 +61,6 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(packet); - packet.writeD(_size); packet.writeD(_players.size()); for (Player player : _players) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java index 786c616875..c8723a9fc0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java @@ -46,7 +46,6 @@ public class ExMPCCPartyInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCPARTY_INFO_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_LeaderOID); packet.writeD(_memberCount); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java index 4bf07f0133..08259e4e6c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java @@ -37,7 +37,6 @@ public class ExMPCCPartymasterList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_PARTYMASTER_LIST.writeId(packet); - packet.writeD(_leadersName.size()); _leadersName.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java index abbdc8fe76..f021ef5f1f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java @@ -36,7 +36,6 @@ public class ExMPCCRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java index 154e156270..2eec590cb4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java @@ -41,7 +41,6 @@ public class ExMPCCRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java index 06e3027bfc..a0e9d0a4b0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java @@ -37,7 +37,6 @@ public class ExMPCCShowPartyMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCSHOW_PARTY_MEMBER_INFO.writeId(packet); - packet.writeD(_party.getMemberCount()); for (Player pc : _party.getMembers()) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java index e454a746f3..771b2f22cb 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java @@ -49,7 +49,6 @@ public class ExMagicAttackInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAGIC_ATTACK_INFO.writeId(packet); - packet.writeD(_caster); packet.writeD(_target); packet.writeD(_type); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java index 9cfbeb5aee..1aaa5b6520 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java @@ -35,7 +35,6 @@ public class ExMailArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAIL_ARRIVED.writeId(packet); - return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java index 983ff22b92..48156c0600 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java @@ -44,7 +44,6 @@ public class ExManageMpccRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MANAGE_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java index f710c006e8..9d7d14211e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java @@ -45,7 +45,6 @@ public class ExMoveToLocationAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_objId); packet.writeD(_tx); packet.writeD(_ty); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java index 3e3bdc9fed..87e44b51cd 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java @@ -43,7 +43,6 @@ public class ExMoveToLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java index 7ab0d1c7da..3c1902892a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java @@ -40,11 +40,9 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet); - packet.writeS(_channel.getLeader().getName()); - packet.writeD(0x00); // Channel loot 0 or 1 + packet.writeD(0); // Channel loot 0 or 1 packet.writeD(_channel.getMemberCount()); - packet.writeD(_channel.getParties().size()); for (Party p : _channel.getParties()) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java index 1536bd5f9b..f2a32bb6e8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java @@ -43,7 +43,6 @@ public class ExNeedToChangeName implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEED_TO_CHANGE_NAME.writeId(packet); - packet.writeD(_type); packet.writeD(_subType); packet.writeS(_name); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java index be9bec8559..d18b4606b3 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java @@ -35,7 +35,6 @@ public class ExNevitAdventEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CHANNELING_EFFECT.writeId(packet); - packet.writeD(_timeLeft); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java index 3a0367c178..09f6250f51 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java @@ -35,7 +35,6 @@ public class ExNevitAdventPointInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_AGATHION_ENERGY_INFO.writeId(packet); - packet.writeD(_points); // 72 = 1%, max 7200 = 100% return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java index 88fdaae499..ef220d86de 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java @@ -37,9 +37,8 @@ public class ExNevitAdventTimeChange implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - // state 0 - pause 1 - started - packet.writeC(_paused ? 0x00 : 0x01); + packet.writeC(_paused ? 0 : 1); // left time in ms max is 16000 its 4m and state is automatically changed to quit packet.writeD(_time); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java index fccdf510cc..4025bf78fa 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java @@ -34,7 +34,6 @@ public class ExNewSkillToLearnByLevelUp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEW_SKILL_TO_LEARN_BY_LEVEL_UP.writeId(packet); - return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java index 324c18a517..f2ce8614dc 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java @@ -43,8 +43,7 @@ public class ExNoticePostArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTICE_POST_ARRIVED.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java index afe3719d9b..050c7ccea5 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java @@ -43,8 +43,7 @@ public class ExNoticePostSent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_WRITE_POST.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java index 5d98c20b09..e0bd08d39a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java @@ -30,7 +30,6 @@ public class ExNotifyPremiumItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_PREMIUM_ITEM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java index 6cb3724448..ba3c0cfeaa 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java @@ -34,7 +34,6 @@ public class ExOlympiadMatchEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MATCH_END.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java index 264d5aa484..7ffd5ed3bd 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java @@ -55,19 +55,15 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x00); // Type 0 = Match List, 1 = Match Result - + packet.writeD(0); // Type 0 = Match List, 1 = Match Result packet.writeD(_games.size()); - packet.writeD(0x00); - + packet.writeD(0); for (OlympiadGameTask curGame : _games) { final AbstractOlympiadGame game = curGame.getGame(); if (game != null) { packet.writeD(game.getStadiumId()); // Stadium Id (Arena 1 = 0) - if (game instanceof OlympiadGameNonClassed) { packet.writeD(1); @@ -80,8 +76,7 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket { packet.writeD(0); } - - packet.writeD(curGame.isRunning() ? 0x02 : 0x01); // (1 = Standby, 2 = Playing) + packet.writeD(curGame.isRunning() ? 2 : 1); // (1 = Standby, 2 = Playing) packet.writeS(game.getPlayerNames()[0]); // Player 1 Name packet.writeS(game.getPlayerNames()[1]); // Player 2 Name } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java index e828c2123e..fecab74e40 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java @@ -53,9 +53,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x01); // Type 0 = Match List, 1 = Match Result - + packet.writeD(1); // Type 0 = Match List, 1 = Match Result packet.writeD(_tie ? 1 : 0); // 0 - win, 1 - tie packet.writeS(_winnerList.get(0).getName()); packet.writeD(_winTeam); @@ -70,7 +68,6 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); } - packet.writeD(_loseTeam); packet.writeD(_loserList.size()); for (OlympiadInfo info : _loserList) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java index 34d81d1f53..712b9e06c6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java @@ -38,7 +38,6 @@ public class ExOlympiadMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MODE.writeId(packet); - packet.writeC(_mode); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java index ebea6c56f3..5b4f2c2523 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java @@ -53,7 +53,6 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_SPELLED_INFO.writeId(packet); - packet.writeD(_playerId); packet.writeD(_effects.size() + _effects2.size()); for (BuffInfo info : _effects) @@ -62,7 +61,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(info.getSkill().getDisplayId()); packet.writeH(info.getSkill().getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(info.getSkill().getAbnormalType().getClientId()); writeOptionalD(packet, info.getSkill().isAura() ? -1 : info.getTime()); } @@ -73,7 +72,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(skill.getDisplayId()); packet.writeH(skill.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(skill.getAbnormalType().getClientId()); packet.writeH(-1); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java index 18c34fe9de..ca473edfcf 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java @@ -76,7 +76,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_USER_INFO.writeId(packet); - if (_player != null) { packet.writeC(_player.getOlympiadSide()); @@ -91,7 +90,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket packet.writeS(_par.getName()); packet.writeD(_par.getBaseClass()); } - packet.writeD(_curHp); packet.writeD(_maxHp); packet.writeD(_curCp); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java index e84d0251bd..7ec64cc8c3 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java @@ -35,7 +35,6 @@ public class ExOpenMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OPEN_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java index 90349cc1a2..5661dc9f57 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java @@ -56,7 +56,6 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PCCAFE_POINT_INFO.writeId(packet); - packet.writeD(_points); // num points packet.writeD(_mAddPoint); // points inc display packet.writeC(_mPeriodType); // period(0=don't show window,1=acquisition,2=use points) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java index f7e8b4a99a..248a2f7d98 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_ADD.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java index 832bee0012..1f452f4bae 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_DELETE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_summon.getSummonType()); packet.writeD(_summon.getOwner().getObjectId()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java index 0646a67001..703694fa2f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_UPDATE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 0e3edb3ea7..e4c6b79ae0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -47,7 +47,6 @@ public class ExPartyRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2bffdec368..2ebf1dc7f0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -43,10 +43,8 @@ public class ExPetInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class ExPetInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class ExPetInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,9 +154,8 @@ public class ExPetInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -227,28 +205,24 @@ public class ExPetInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PET_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -267,7 +241,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -283,19 +257,19 @@ public class ExPetInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -307,20 +281,20 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -344,12 +318,12 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -379,12 +353,10 @@ public class ExPetInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java index 082f4c7662..0f72c05a3a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java @@ -34,7 +34,6 @@ public class ExPlayScene implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLAY_SCENE.writeId(packet); - return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java index e98d317e14..7e3803bdaa 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java @@ -36,7 +36,6 @@ public class ExPledgeCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_COUNT.writeId(packet); - packet.writeD(_count); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java index 838029e284..4084de3481 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java @@ -38,7 +38,6 @@ public class ExPledgeDraftListSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_DRAFT_LIST_SEARCH.writeId(packet); - packet.writeD(_pledgeRecruitList.size()); for (PledgeWaitingInfo prl : _pledgeRecruitList) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java index fb956e9996..44e34004ea 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java @@ -25,11 +25,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExPledgeEmblem implements IClientOutgoingPacket { + private static final int TOTAL_SIZE = 65664; + private final int _crestId; private final int _clanId; private final byte[] _data; private final int _chunkId; - private static final int TOTAL_SIZE = 65664; public ExPledgeEmblem(int crestId, byte[] chunkedData, int clanId, int chunkId) { @@ -43,7 +44,6 @@ public class ExPledgeEmblem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clanId); packet.writeD(_crestId); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java index ed19bf976b..b32f8c0645 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitApplyInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_APPLY_INFO.writeId(packet); - packet.writeD(_status.ordinal()); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java index fc98b7b6f7..af4af9c9c1 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitBoardDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_DETAIL.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClanId()); packet.writeD(_pledgeRecruitInfo.getKarma()); packet.writeS(_pledgeRecruitInfo.getInformation()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index d2c9c088d1..457d60b2d5 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -34,7 +34,6 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket private final int _clanOnCurrentPage; private final int _startIndex; private final int _endIndex; - static final int CLAN_PER_PAGE = 12; public ExPledgeRecruitBoardSearch(List clanList, int currentPage) @@ -51,11 +50,9 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_SEARCH.writeId(packet); - packet.writeD(_currentPage); packet.writeD(_totalNumberOfPage); packet.writeD(_clanOnCurrentPage); - for (int i = _startIndex; i < _endIndex; i++) { packet.writeD(_clanList.get(i).getClanId()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 4ae5ffe316..b1f139226d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -40,7 +40,6 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java index 77080a3820..5844f220ec 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java @@ -39,7 +39,6 @@ public class ExPledgeWaitingList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST.writeId(packet); - packet.writeD(pledgePlayerRecruitInfos.size()); for (PledgeApplicantInfo recruitInfo : pledgePlayerRecruitInfos.values()) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java index a9245c1309..6b88572057 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java @@ -30,7 +30,6 @@ public class ExPledgeWaitingListAlarm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_ALARM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java index 60997b3da0..28c3967119 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java @@ -40,7 +40,6 @@ public class ExPledgeWaitingListApplied implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_APPLIED.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClan().getId()); packet.writeS(_pledgeRecruitInfo.getClan().getName()); packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java index 66a06892c2..1f53d1bb38 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java @@ -36,7 +36,6 @@ public class ExPledgeWaitingUser implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_USER.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getPlayerId()); packet.writeS(_pledgeRecruitInfo.getMessage()); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java index 49bc9b0995..5f404779f5 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java @@ -43,7 +43,6 @@ public class ExPrivateStoreSetWholeMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_objectId); packet.writeS(_msg); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java index cb5e8fbce9..ff996b5d0c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutCommissionResultForVariationMake implements IClientOutgoingPac public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_COMMISSION_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_gemstoneObjId); packet.writeD(_itemId); packet.writeQ(_gemstoneCount); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java index 81721e921f..098472b7ae 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantScrollItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SCROLL_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java index 871f377db2..ffea182a49 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java index c47a4bcff4..8016e128f4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java index c8b46be499..95c0c0e4e1 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_INTENSIVE_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_refinerItemObjId); packet.writeD(_lifestoneItemId); packet.writeD(_gemstoneItemId); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 2128b2b19f..2970ca00a2 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -41,13 +41,12 @@ public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_CANCEL.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); packet.writeD(_itemAug1); packet.writeD(_itemAug2); packet.writeQ(_price); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java index 80541e65cd..c25dd16b01 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java @@ -34,10 +34,9 @@ public class ExPutItemResultForVariationMake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index b739a94c55..c4d27d1728 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -48,7 +48,6 @@ public class ExQuestItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java index fe5eb74eb0..bc8896164d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java @@ -56,13 +56,12 @@ public class ExQuestNpcLogList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_NPC_LOG_LIST.writeId(packet); - packet.writeD(_questId); packet.writeC(_npcLogList.size()); for (NpcLogListHolder holder : _npcLogList) { packet.writeD(holder.isNpcString() ? holder.getId() : holder.getId() + 1000000); - packet.writeC(holder.isNpcString() ? 0x01 : 0x00); + packet.writeC(holder.isNpcString() ? 1 : 0); packet.writeD(holder.getCount()); } return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java index 62d622caff..60616b256d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java @@ -35,7 +35,6 @@ public class ExRedSky implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RED_SKY.writeId(packet); - packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java index ce40b1a792..163faff855 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java @@ -36,7 +36,6 @@ public class ExRegenMax implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REGEN_MAX.writeId(packet); - packet.writeD(1); packet.writeD(_time); packet.writeD(_tickInterval); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java index d864795cd6..a17525576b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java @@ -34,7 +34,6 @@ public class ExRemoveEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REMOVE_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 29d5eafeef..77458fd485 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -41,7 +41,6 @@ public class ExReplyPostItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_POST_ITEM_LIST.writeId(packet); - packet.writeD(_itemList.size()); for (Item item : _itemList) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 57ed88ac29..4e479e75a6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -56,7 +56,6 @@ public class ExReplyReceivedPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_RECEIVED_POST.writeId(packet); - packet.writeD(_msg.getMailType().ordinal()); // GOD if (_msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED) { @@ -76,11 +75,10 @@ public class ExReplyReceivedPost extends AbstractItemPacket } packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown packet.writeS(_msg.getSenderName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -92,9 +90,8 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeQ(_msg.getReqAdena()); packet.writeD(_msg.hasAttachments() ? 1 : 0); packet.writeD(_msg.isReturned() ? 1 : 0); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 75f6596194..ed490eae91 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -54,14 +54,12 @@ public class ExReplySentPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_SENT_POST.writeId(packet); - - packet.writeD(0x00); // GOD + packet.writeD(0); // GOD packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); packet.writeS(_msg.getReceiverName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -73,11 +71,11 @@ public class ExReplySentPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeQ(_msg.getReqAdena()); - packet.writeD(_msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(_msg.isReturned() ? 0x01 : 00); + packet.writeD(_msg.hasAttachments() ? 1 : 0); + packet.writeD(_msg.isReturned() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index cc4f7ce1d8..e6a3f9bca2 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -35,7 +35,6 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java index 2634aa1cdd..60201b177f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java @@ -35,7 +35,6 @@ public class ExRequestHackShield implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REQUEST_HACK_SHIELD.writeId(packet); - return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java index c51ff31d0b..75e3b3a945 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java @@ -29,13 +29,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyList implements IClientOutgoingPacket { + public static final int SHOW_FACESHAPE = 1; + public static final int SHOW_HAIRSTYLE = 0; + private final Player _player; private final int _type; private final Map _beautyItem; - public static final int SHOW_FACESHAPE = 1; - public static final int SHOW_HAIRSTYLE = 0; - public ExResponseBeautyList(Player player, int type) { _player = player; @@ -54,7 +54,6 @@ public class ExResponseBeautyList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java index ca2ed360ab..4b19201833 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java @@ -25,16 +25,15 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket { + public static final int FAILURE = 0; + public static final int SUCCESS = 1; + public static final int CHANGE = 0; + public static final int RESTORE = 1; + private final Player _player; private final int _type; private final int _result; - public static final int FAILURE = 0; - public static final int SUCCESS = 1; - - public static final int CHANGE = 0; - public static final int RESTORE = 1; - public ExResponseBeautyRegistReset(Player player, int type, int result) { _player = player; @@ -46,7 +45,6 @@ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_REGIST_RESET.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java index 0e313ef3b7..c0922cfb04 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java @@ -36,10 +36,8 @@ public class ExResponseResetList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_RESET_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); - packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java index 01fe1945ef..a230033d67 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java @@ -37,7 +37,6 @@ public class ExRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ROTATION.writeId(packet); - packet.writeD(_charId); packet.writeD(_heading); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index c58ccfc233..2646a71e77 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -36,7 +36,6 @@ public class ExRpItemLink extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RP_ITEM_LINK.writeId(packet); - writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java index 04556bbed2..f0c6eba8e9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java @@ -34,7 +34,6 @@ public class ExSearchOrc implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEARCH_ORC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index 1e06cc2a3f..7a4dced122 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -38,7 +38,6 @@ public class ExSendManorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_MANOR_LIST.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java index b63c69f37e..2c25cc8bfc 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java @@ -124,7 +124,6 @@ public class ExSendUIEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_UIEVENT.writeId(packet); - packet.writeD(_objectId); packet.writeD(_type); // 0 = show, 1 = hide (there is 2 = pause and 3 = resume also but they don't work well you can only pause count down and you cannot resume it because resume hides the counter). packet.writeD(0); // unknown diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java index 89678c1836..3778d7e57c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java @@ -385,16 +385,13 @@ public class ExServerPrimitive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SERVER_PRIMITIVE.writeId(packet); - packet.writeS(_name); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(65535); // has to do something with display range and angle packet.writeD(65535); // has to do something with display range and angle - packet.writeD(_points.size() + _lines.size()); - for (Point point : _points) { packet.writeC(1); // Its the type in this case Point @@ -408,7 +405,6 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(point.getY()); packet.writeD(point.getZ()); } - for (Line line : _lines) { packet.writeC(2); // Its the type in this case Line diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java index fb32e199b2..51fb91b643 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java @@ -46,7 +46,6 @@ public class ExSetCompassZoneCode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_COMPASS_ZONE_CODE.writeId(packet); - packet.writeD(_zoneType); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java index 1d0fbae3a4..34dee8bda0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java @@ -38,7 +38,6 @@ public class ExSetPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_PARTY_LOOTING.writeId(packet); - packet.writeD(_result); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java index 7b14ec8412..4e491af9d1 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java @@ -34,7 +34,6 @@ public class ExShowAdventurerGuideBook implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_ADVENTURER_GUIDE_BOOK.writeId(packet); - return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index 82554fdc5f..1f8df76083 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -39,7 +39,6 @@ public class ExShowAgitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AGIT_INFO.writeId(packet); - final Collection clanHalls = ClanHallData.getInstance().getClanHalls(); packet.writeD(clanHalls.size()); clanHalls.forEach(clanHall -> diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index dd11ee0150..51e6646ff5 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -44,7 +44,6 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BASE_ATTRIBUTE_CANCEL_WINDOW.writeId(packet); - packet.writeD(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java index 14e55d39f3..e22345c4fd 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java @@ -25,13 +25,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExShowBeautyMenu implements IClientOutgoingPacket { - private final Player _player; - private final int _type; - // TODO: Enum public static final int MODIFY_APPEARANCE = 0; public static final int RESTORE_APPEARANCE = 1; + private final Player _player; + private final int _type; + public ExShowBeautyMenu(Player player, int type) { _player = player; @@ -42,7 +42,6 @@ public class ExShowBeautyMenu implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BEAUTY_MENU.writeId(packet); - packet.writeD(_type); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 6ca5edc29b..c0cd4bc02a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -41,7 +41,6 @@ public class ExShowCastleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CASTLE_INFO.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java index aeb4079f3a..f9a6ebe0e7 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java @@ -38,7 +38,6 @@ public class ExShowContactList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_SHOW_POST_FRIEND.writeId(packet); - packet.writeD(_contacts.size()); _contacts.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index a079ea3129..94b989b583 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -37,7 +37,6 @@ public class ExShowCropInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _crops = (nextPeriod && !manor.isManorApproved()) ? null : manor.getCropProcure(manorId, nextPeriod); } @@ -46,10 +45,9 @@ public class ExShowCropInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Crop Sales" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Crop Sales" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); + packet.writeD(0); if (_crops != null) { packet.writeD(_crops.size()); @@ -64,17 +62,17 @@ public class ExShowCropInfo implements IClientOutgoingPacket if (seed == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(seed.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(seed.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(seed.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index ebffd775d8..1f01ee7b87 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -62,10 +62,8 @@ public class ExShowCropSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getCropId()); // crop id diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index ee9fa9fd37..b625a1e4e7 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -39,7 +39,6 @@ public class ExShowFortressInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_INFO.writeId(packet); - final Collection forts = FortManager.getInstance().getForts(); packet.writeD(forts.size()); for (Fort fort : forts) @@ -47,7 +46,7 @@ public class ExShowFortressInfo implements IClientOutgoingPacket final Clan clan = fort.getOwnerClan(); packet.writeD(fort.getResidenceId()); packet.writeS(clan != null ? clan.getName() : ""); - packet.writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00); + packet.writeD(fort.getSiege().isInProgress() ? 1 : 0); // Time of possession packet.writeD(fort.getOwnedTime()); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index f389b26ed5..678ab43e96 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -42,11 +42,9 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_MAP_INFO.writeId(packet); - packet.writeD(_fortress.getResidenceId()); packet.writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status packet.writeD(_fortress.getFortSize()); // barracks count - final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId()); if ((commanders != null) && !commanders.isEmpty() && _fortress.getSiege().isInProgress()) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 27da99cf41..da186103ae 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -51,7 +51,6 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_SIEGE_INFO.writeId(packet); - packet.writeD(_fortId); // Fortress Id packet.writeD(_size); // Total Barracks Count if (_csize > 0) @@ -64,22 +63,22 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { case 0: { - packet.writeD(0x03); + packet.writeD(3); break; } case 1: { - packet.writeD(0x02); + packet.writeD(2); break; } case 2: { - packet.writeD(0x01); + packet.writeD(1); break; } case 3: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -92,27 +91,27 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket // TODO: once control room supported, update packet.writeD(0x0x) to support 5th room case 0: { - packet.writeD(0x05); + packet.writeD(5); break; } case 1: { - packet.writeD(0x04); + packet.writeD(4); break; } case 2: { - packet.writeD(0x03); + packet.writeD(3); break; } case 3: { - packet.writeD(0x02); + packet.writeD(2); break; } case 4: { - packet.writeD(0x01); + packet.writeD(1); break; } } @@ -124,7 +123,7 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { for (int i = 0; i < _size; i++) { - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java index f7aca7dffd..912839e242 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java @@ -41,8 +41,7 @@ public class ExShowManorDefaultInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_MANOR_DEFAULT_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" and "Crop Sales" buttons + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" and "Crop Sales" buttons packet.writeD(_crops.size()); for (Seed crop : _crops) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 1d3312d668..d03ce2a5fd 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -52,10 +52,8 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet); - packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java index cf38d18c1c..f41999329f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java @@ -34,7 +34,6 @@ public class ExShowQuestInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_INFO.writeId(packet); - return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java index 70f31e318f..0fa64c401d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java @@ -37,7 +37,6 @@ public class ExShowQuestMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_MARK.writeId(packet); - packet.writeD(_questId); packet.writeD(_questState); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index ab85228caf..1a6ee00a10 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ExShowReceivedPostList implements IClientOutgoingPacket { - private final List _inbox; - private static final int MESSAGE_FEE = 100; private static final int MESSAGE_FEE_PER_SLOT = 1000; + private final List _inbox; + public ExShowReceivedPostList(int objectId) { _inbox = MailManager.getInstance().getInbox(objectId); @@ -45,7 +45,6 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { @@ -64,18 +63,18 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getSenderName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); + packet.writeD(msg.isUnread() ? 1 : 0); packet.writeD(((msg.getMailType() == MailType.COMMISSION_ITEM_SOLD) || (msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED)) ? 0 : 1); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(msg.isReturned() ? 0x01 : 0x00); - packet.writeD(0x00); // SysString in some case it seems + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(msg.isReturned() ? 1 : 0); + packet.writeD(0); // SysString in some case it seems } } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(MESSAGE_FEE); packet.writeD(MESSAGE_FEE_PER_SLOT); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java index 9679468789..deebb99c8f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java @@ -33,6 +33,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; */ public class ExShowScreenMessage implements IClientOutgoingPacket { + // Positions + public static final byte TOP_LEFT = 1; + public static final byte TOP_CENTER = 2; + public static final byte TOP_RIGHT = 3; + public static final byte MIDDLE_LEFT = 4; + public static final byte MIDDLE_CENTER = 5; + public static final byte MIDDLE_RIGHT = 6; + public static final byte BOTTOM_CENTER = 7; + public static final byte BOTTOM_RIGHT = 8; + private final int _type; private final int _sysMessageId; private final int _unk1; @@ -48,15 +58,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket private List _parameters; // Localisation related. private String _lang; - // Positions - public static final byte TOP_LEFT = 0x01; - public static final byte TOP_CENTER = 0x02; - public static final byte TOP_RIGHT = 0x03; - public static final byte MIDDLE_LEFT = 0x04; - public static final byte MIDDLE_CENTER = 0x05; - public static final byte MIDDLE_RIGHT = 0x06; - public static final byte BOTTOM_CENTER = 0x07; - public static final byte BOTTOM_RIGHT = 0x08; public void setLang(String lang) { @@ -265,7 +266,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SCREEN_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -284,9 +284,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(sml.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -308,9 +308,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -318,7 +318,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket } } } - packet.writeD(_type); packet.writeD(_sysMessageId); packet.writeD(_position); @@ -326,9 +325,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java index 29ab5d355f..6123b08991 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java @@ -37,7 +37,6 @@ public class ExShowSeedInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _seeds = (nextPeriod && !manor.isManorApproved()) ? null : manor.getSeedProduction(manorId, nextPeriod); } @@ -46,16 +45,14 @@ public class ExShowSeedInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown if (_seeds == null) { packet.writeD(0); return true; } - packet.writeD(_seeds.size()); for (SeedProduction seed : _seeds) { @@ -67,17 +64,17 @@ public class ExShowSeedInfo implements IClientOutgoingPacket if (s == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(s.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(s.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(s.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java index 009dce459b..7c757f08a9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java @@ -32,15 +32,12 @@ public class ExShowSeedMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_MAP_INFO.writeId(packet); - packet.writeD(2); // seed count - // Seed of Destruction packet.writeD(-246857); // x coord packet.writeD(251960); // y coord packet.writeD(4331); // z coord packet.writeD(2770 + GraciaSeedsManager.getInstance().getSoDState()); // sys msg id - // Seed of Infinity packet.writeD(-213770); // x coord packet.writeD(210760); // y coord diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index 4fd891a466..373c314eba 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -62,10 +62,8 @@ public class ExShowSeedSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getSeedId()); // seed id diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 1994402da2..269bec5b97 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -47,7 +47,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _cropsItems.put(cropId, item); } } - for (CropProcure crop : CastleManorManager.getInstance().getCropProcure(_manorId, false)) { if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) @@ -61,7 +60,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_cropsItems.size()); // size for (Item item : _cropsItems.values()) @@ -70,9 +68,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket packet.writeD(item.getObjectId()); // Object id packet.writeD(item.getId()); // crop id packet.writeD(seed.getLevel()); // seed level - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(1)); // reward 1 id - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(2)); // reward 2 id if (_castleCrops.containsKey(item.getId())) { @@ -85,9 +83,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket else { packet.writeD(0xFFFFFFFF); // manor - packet.writeQ(0x00); // buy residual - packet.writeQ(0x00); // buy price - packet.writeC(0x00); // reward + packet.writeQ(0); // buy residual + packet.writeQ(0); // buy price + packet.writeC(0); // reward } packet.writeQ(item.getCount()); // my crops } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index db4bccc928..b61d5b2301 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -40,7 +40,6 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { @@ -50,17 +49,17 @@ public class ExShowSentPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getReceiverName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); - packet.writeD(0x01); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(msg.isUnread() ? 1 : 0); + packet.writeD(1); + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(0); } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java index 0e4e9fd2ef..0dca57f2f8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java @@ -48,7 +48,6 @@ public class ExShowTerritory implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TERRITORY.writeId(packet); - packet.writeD(_vertices.size()); packet.writeD(_minZ); packet.writeD(_maxZ); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java index 4e284f82c5..86e1009bbf 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java @@ -46,7 +46,6 @@ public class ExShowTrace implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TRACE.writeId(packet); - packet.writeH(0); // type broken in H5 packet.writeD(0); // time broken in H5 packet.writeH(_locations.size()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java index 3245767ed7..836a5c9624 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java @@ -44,7 +44,6 @@ public class ExShowUsm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_USM.writeId(packet); - packet.writeD(_videoId); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java index 4acdffa842..1f1a14c31b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java @@ -34,7 +34,6 @@ public class ExShowVariationCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_CANCEL_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java index 3a2298019e..9870424e26 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java @@ -35,7 +35,6 @@ public class ExShowVariationMakeWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_MAKE_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java index 169827bab3..86211c8d97 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java @@ -44,10 +44,9 @@ public class ExSpawnEmitter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SPAWN_EMITTER.writeId(packet); - packet.writeD(_npcObjectId); packet.writeD(_playerObjectId); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java index 620800c1c4..534549b4fe 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java @@ -36,7 +36,6 @@ public class ExStartScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_START_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java index 0bd990cf34..babac59129 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java index 0e2689d598..d3e67afe99 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipObjId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java index 44b064113f..f5b3e1340f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java @@ -36,7 +36,6 @@ public class ExStopScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index 0b1e077353..7c8def3864 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -66,7 +66,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket } OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet); - packet.writeD(_inventory); packet.writeD(_warehouse); packet.writeD(_freight); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java index 3293a5b557..57563ca2f9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java @@ -39,7 +39,6 @@ public class ExSubPledgeSkillAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUB_PLEDGET_SKILL_ADD.writeId(packet); - packet.writeD(_type); packet.writeD(_skillId); packet.writeD(_skillLevel); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java index d61dfa20ab..816d6f16a6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java @@ -97,7 +97,6 @@ public class ExSubjobInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUBJOB_INFO.writeId(packet); - packet.writeC(_type); packet.writeD(_currClassId); packet.writeD(_currRace); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java index 85616016c7..b7a152629d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java @@ -38,7 +38,6 @@ public class ExTacticalSign implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TACTICAL_SIGN.writeId(packet); - packet.writeD(_target.getObjectId()); packet.writeD(_tokenId); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java index 3486e6281d..9e03a8bd0a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java @@ -39,7 +39,6 @@ public class ExTeleportToLocationActivate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_TO_LOCATION_ACTIVATE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java index a214c53a0f..7bcddd964d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java @@ -27,6 +27,7 @@ public class ExUISetting implements IClientOutgoingPacket { public static final String UI_KEY_MAPPING_VAR = "UI_KEY_MAPPING"; public static final String SPLIT_VAR = " "; + private final byte[] _uiKeyMapping; public ExUISetting(Player player) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java index 187770cfc8..eff4285a8b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java @@ -37,7 +37,6 @@ public class ExUnReadMailCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_UN_READ_MAIL_COUNT.writeId(packet); - packet.writeD(_mailUnreadCount); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java index f992b3c937..e59c651371 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java @@ -41,7 +41,6 @@ public class ExUseSharedGroupItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USE_SHARED_GROUP_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeD(_grpId); packet.writeD(_remainingTime); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java index 474fcc5208..f49d451587 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class ExUserInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getTransformationId()); - final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); final boolean isInvisible = _player.isInvisible(); packet.writeD(abnormalVisualEffects.size() + (isInvisible ? 1 : 0)); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java index b841449ab3..1069a64e3e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java @@ -36,12 +36,9 @@ public class ExUserInfoCubic implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_CUBIC.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(_player.getCubics().size()); - _player.getCubics().keySet().forEach(packet::writeH); - packet.writeD(_player.getAgathionId()); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java index 6bafb5033d..ca35a6ce85 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java @@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExUserInfoEquipSlot extends AbstractMaskPacket { private final Player _player; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -63,11 +62,9 @@ public class ExUserInfoEquipSlot extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_EQUIP_SLOT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(InventorySlot.values().length); packet.writeB(_masks); - final PlayerInventory inventory = _player.getInventory(); for (InventorySlot slot : InventorySlot.values()) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java index 3eb1cf9578..d655e48843 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java @@ -36,7 +36,6 @@ public class ExUserInfoInvenWeight implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_INVEN_WEIGHT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java index 91e0e92338..16aa81e9c0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java @@ -44,7 +44,6 @@ public class ExValidateLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java index 727267c9d5..50cb4025e4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java @@ -35,7 +35,6 @@ public class ExVariationCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_CANCEL_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java index 5cdc1b8d0e..4fde190ae2 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java @@ -32,14 +32,13 @@ public class ExVariationResult implements IClientOutgoingPacket { _option1 = option1; _option2 = option2; - _success = success ? 0x01 : 0x00; + _success = success ? 1 : 0; } @Override public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_RESULT.writeId(packet); - packet.writeD(_option1); packet.writeD(_option2); packet.writeD(_success); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java index 03229f9abf..23619b7555 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java @@ -41,10 +41,9 @@ public class ExVitalityEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_EFFECT_INFO.writeId(packet); - packet.writeD(_points); packet.writeD(_vitalityBonus); // Vitality Bonus - // packet.writeH(0x00); // Vitality additional bonus in % + // packet.writeH(0); // Vitality additional bonus in % packet.writeH(_vitalityItemsRemaining); // How much vitality items remaining for use packet.writeH(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java index 3cd9d26602..9a401c2321 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java @@ -35,7 +35,6 @@ public class ExVitalityPointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_POINT_INFO.writeId(packet); - packet.writeD(_vitalityPoints); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java index 71baff96ea..c4c5539ca4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java @@ -45,7 +45,6 @@ public class ExVoteSystemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VOTE_SYSTEM_INFO.writeId(packet); - packet.writeD(_recomLeft); packet.writeD(_recomHave); packet.writeD(_bonusTime); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java index 21411f5abc..452b0dc43a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java @@ -37,7 +37,6 @@ public class ExWorldChatCnt implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_WORLD_CHAT_CNT.writeId(packet); - packet.writeD(_points); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java index 38df5fb382..58fdfee484 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java @@ -82,15 +82,13 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // vehicleId + packet.writeD(0); // vehicleId packet.writeD(_objId); packet.writeS(_npc.getName()); - packet.writeH(_npc.getRace().ordinal()); - packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 0x01 : 0x00); + packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 1 : 0); packet.writeD(_fpcHolder.getClassId()); - - packet.writeD(0x00); // Inventory.PAPERDOLL_UNDER + packet.writeD(0); // Inventory.PAPERDOLL_UNDER packet.writeD(_fpcHolder.getEquipHead()); packet.writeD(_fpcHolder.getEquipRHand()); packet.writeD(_fpcHolder.getEquipLHand()); @@ -102,27 +100,21 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_fpcHolder.getEquipRHand()); // dual hand packet.writeD(_fpcHolder.getEquipHair()); packet.writeD(_fpcHolder.getEquipHair2()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderAugument()) { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeC(_fpcHolder.getArmorEnchantLevel()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderVisualId()) { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeC(_npc.getScriptValue()); // getPvpFlag() packet.writeD(_npc.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -133,16 +125,12 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_npc.getCollisionRadius()); packet.writeF(_npc.getCollisionHeight()); - packet.writeD(_fpcHolder.getHair()); packet.writeD(_fpcHolder.getHairColor()); packet.writeD(_fpcHolder.getFace()); - packet.writeS(_npc.getTemplate().getTitle()); - if (_clan != null) { packet.writeD(_clan.getId()); @@ -152,71 +140,51 @@ public class FakePlayerInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - - packet.writeC(0x01); // isSitting() ? 0x00 : 0x01 (at some initial tests it worked) - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); - packet.writeC(_npc.isInCombat() ? 0x01 : 0x00); - - packet.writeC(_npc.isAlikeDead() ? 0x01 : 0x00); - - packet.writeC(_npc.isInvisible() ? 0x01 : 0x00); - - packet.writeC(0x00); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount - packet.writeC(0x00); // getPrivateStoreType().getId() - - packet.writeH(0x00); // getCubics().size() + packet.writeC(1); // isSitting() ? 0 : 1 (at some initial tests it worked) + packet.writeC(_npc.isRunning() ? 1 : 0); + packet.writeC(_npc.isInCombat() ? 1 : 0); + packet.writeC(_npc.isAlikeDead() ? 1 : 0); + packet.writeC(_npc.isInvisible() ? 1 : 0); + packet.writeC(0); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount + packet.writeC(0); // getPrivateStoreType().getId() + packet.writeH(0); // getCubics().size() // getCubics().keySet().forEach(packet::writeH); - packet.writeC(0x00); - + packet.writeC(0); packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : 0); packet.writeH(_fpcHolder.getRecommends()); - packet.writeD(0x00); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 - + packet.writeD(0); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 packet.writeD(_fpcHolder.getClassId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(_fpcHolder.getWeaponEnchantLevel()); // isMounted() ? 0 : _enchantLevel - packet.writeC(_npc.getTeam().getId()); - - packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0x00); + packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0); packet.writeC(_fpcHolder.getNobleLevel()); - packet.writeC(_fpcHolder.isHero() ? 0x01 : 0x00); - - packet.writeC(_fpcHolder.isFishing() ? 0x01 : 0x00); - + packet.writeC(_fpcHolder.isHero() ? 1 : 0); + packet.writeC(_fpcHolder.isFishing() ? 1 : 0); packet.writeD(_fpcHolder.getBaitLocationX()); packet.writeD(_fpcHolder.getBaitLocationY()); packet.writeD(_fpcHolder.getBaitLocationZ()); - packet.writeD(_fpcHolder.getNameColor()); - packet.writeD(_heading); - packet.writeC(_fpcHolder.getPledgeStatus()); - packet.writeH(0x00); // getPledgeType() - + packet.writeH(0); // getPledgeType() packet.writeD(_fpcHolder.getTitleColor()); - - packet.writeC(0x00); // isCursedWeaponEquipped - - packet.writeD(0x00); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 - packet.writeD(0x00); // getTransformationDisplayId() + packet.writeC(0); // isCursedWeaponEquipped + packet.writeD(0); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 + packet.writeD(0); // getTransformationDisplayId() packet.writeD(_fpcHolder.getAgathionId()); - - packet.writeC(0x00); - - packet.writeD(0x00); // getCurrentCp() + packet.writeC(0); + packet.writeD(0); // getCurrentCp() packet.writeD(_npc.getMaxHp()); packet.writeD((int) Math.round(_npc.getCurrentHp())); packet.writeD(_npc.getMaxMp()); packet.writeD((int) Math.round(_npc.getCurrentMp())); - - packet.writeC(0x00); + packet.writeC(0); final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) @@ -227,9 +195,9 @@ public class FakePlayerInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(0x00); // cocPlayer.getPosition() - packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 0x01 : 0x00); - packet.writeC(0x00); // Used Ability Points + packet.writeC(0); // cocPlayer.getPosition() + packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 1 : 0); + packet.writeC(0); // Used Ability Points return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java index ae088538da..03223c8a3e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java @@ -62,7 +62,6 @@ public class FlyToLocation implements IClientOutgoingPacket _destY = destY; _destZ = destZ; _type = type; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -82,7 +81,6 @@ public class FlyToLocation implements IClientOutgoingPacket _flySpeed = flySpeed; _flyDelay = flyDelay; _animationSpeed = animationSpeed; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -103,7 +101,6 @@ public class FlyToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FLY_TO_LOCATION.writeId(packet); - packet.writeD(_chaObjId); packet.writeD(_destX); packet.writeD(_destY); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java index 1e52b0ef72..471d70f791 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java @@ -35,8 +35,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x01); + packet.writeC(1); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 28de208185..c4b2a78ae0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -50,7 +50,6 @@ public class GMHennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GMHENNA_INFO.writeId(packet); - packet.writeC(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeC(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeC(_player.getHennaValue(BaseStat.CON)); // equip CON @@ -64,19 +63,19 @@ public class GMHennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(0x01); + packet.writeD(1); } if (_player.getHenna(4) != null) { packet.writeD(_player.getHenna(4).getDyeId()); - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 1 : 0); } else { - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid } return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java index 38ca4c7be0..59bf0d9d93 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java @@ -38,7 +38,6 @@ public class GMHide implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_HIDE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index 304d80b87d..010eb2f54e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -50,7 +50,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -79,17 +78,14 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); packet.writeD(_player.getPkKills()); - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollObjectId(slot)); } - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); } - for (int slot : getPaperdollOrder()) { final VariationInstance augment = _player.getInventory().getPaperdollAugmentation(slot); @@ -97,14 +93,13 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket // Mobius: Maybe use 2x writeH? // packet.writeD(augment != null ? augment.getOption2Id() : 0); // Confirmed } - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeC(_player.getInventory().getTalismanSlots()); // CT2.3 packet.writeC(_player.getInventory().canEquipCloak() ? 1 : 0); // CT2.3 - packet.writeD(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeH(0); packet.writeD(_player.getPAtk()); packet.writeD(_player.getPAtkSpd()); packet.writeD(_player.getPDef()); @@ -112,18 +107,14 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAccuracy()); packet.writeD(_player.getCriticalHit()); packet.writeD(_player.getMAtk()); - packet.writeD(_player.getMAtkSpd()); packet.writeD(_player.getPAtkSpd()); - packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicEvasionRate()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name packet.writeD(_player.getReputation()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -139,8 +130,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeD(_player.isGM() ? 0x01 : 0x00); // builder level - + packet.writeD(_player.isGM() ? 1 : 0); // builder level packet.writeS(_player.getTitle()); packet.writeD(_player.getClanId()); // pledge id packet.writeD(_player.getClanCrestId()); // pledge crest id @@ -150,26 +140,19 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeC(_player.hasDwarvenCraft() ? 1 : 0); packet.writeD(_player.getPkKills()); packet.writeD(_player.getPvpKills()); - packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); - - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeC(321); - packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window - - packet.writeC(_player.isNoble() ? 0x01 : 0x00); - packet.writeC(_player.isHero() ? 0x01 : 0x00); - + packet.writeC(_player.isNoble() ? 1 : 0); + packet.writeC(_player.isHero() ? 1 : 0); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); - final AttributeType attackAttribute = _player.getAttackElement(); packet.writeH(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); @@ -179,8 +162,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket } packet.writeD(_player.getFame()); packet.writeD(_player.getVitalityPoints()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index f212539af7..41f151be6f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -55,10 +55,9 @@ public class GMViewItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_ITEM_LIST.writeId(packet); - packet.writeS(_playerName); packet.writeD(_limit); // inventory limit - packet.writeH(0x01); // show window ?? + packet.writeH(1); // show window ?? packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index 1d88596096..552b6e6168 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -37,14 +37,12 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_player.getName()); packet.writeD(_clan.getId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); @@ -52,15 +50,14 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 packet.writeD(_clan.getAllyCrestId()); // c2 packet.writeD(_clan.isAtWar() ? 1 : 0); // c3 - packet.writeD(0x00); // T3 Unknown - + packet.writeD(0); // T3 Unknown packet.writeD(_clan.getMembers().size()); for (ClanMember member : _clan.getMembers()) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java index 384073cfb2..5b27412d01 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -38,17 +38,15 @@ public class GMViewSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_SKILL_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_skills.size()); - final boolean isDisabled = (_player.getClan() != null) && (_player.getClan().getReputationScore() < 0); for (Skill skill : _skills) { packet.writeD(skill.isPassive() ? 1 : 0); packet.writeD(skill.getDisplayLevel()); packet.writeD(skill.getDisplayId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(isDisabled && skill.isClanSkill() ? 1 : 0); packet.writeC(skill.isEnchantable() ? 1 : 0); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java index d8c273f914..449271993b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java @@ -35,7 +35,6 @@ public class GameGuardQuery implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GAME_GUARD_QUERY.writeId(packet); - packet.writeD(0x27533DD9); packet.writeD(0x2E72A51D); packet.writeD(0x2017038B); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index b0c011b696..037b2e6b6b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -35,10 +35,8 @@ public class GetItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ITEM.writeId(packet); - packet.writeD(_playerId); packet.writeD(_item.getObjectId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java index f8c6126c87..5f4d7bf3ca 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java @@ -50,7 +50,6 @@ public class GetOffVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_OFF_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_x); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java index ffa8d5f310..77d1e6ba28 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java @@ -45,7 +45,6 @@ public class GetOnVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ON_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java index e5dcb9ded6..b1f5b588f9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java @@ -44,14 +44,13 @@ public class GmViewQuestInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_QUEST_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeH(_questList.size()); // quest count - for (Quest quest : _questList) { final QuestState qs = _player.getQuestState(quest.getName()); packet.writeD(quest.getId()); packet.writeD(qs == null ? 0 : qs.getCond()); } - packet.writeH(0x00); // some size + packet.writeH(0); // some size // for size; ddQQ return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 395487097c..4309e2d74f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -51,7 +51,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeQ(_player.getAdena()); // activeChar current amount of Adena packet.writeD(3); // available equip slot packet.writeD(_hennaEquipList.size()); - for (Henna henna : _hennaEquipList) { // Player must have at least one dye in inventory @@ -62,8 +61,8 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); // item Id of the dye packet.writeQ(henna.getWearCount()); // amount of dyes required packet.writeQ(henna.getWearFee()); // amount of Adena required - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not - packet.writeD(0x00); // TODO: Find me! + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // meet the requirement or not + packet.writeD(0); // TODO: Find me! } } return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index bc11ece388..fd7085a047 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -51,7 +51,6 @@ public class HennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_INFO.writeId(packet); - packet.writeC(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeC(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeC(_player.getHennaValue(BaseStat.CON)); // equip CON @@ -65,9 +64,8 @@ public class HennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); } - final Henna premium = _player.getHenna(4); if (premium != null) { @@ -77,16 +75,15 @@ public class HennaInfo implements IClientOutgoingPacket final long currentTime = Chronos.currentTimeMillis(); duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000; } - packet.writeD(premium.getDyeId()); packet.writeD(duration); // Premium Slot Dye Time Left - packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 1 : 0); } else { - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid } return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index b1dec0a155..f3650b46e0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -40,12 +40,11 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_ITEM_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getWearCount()); // total amount of dye require packet.writeQ(_henna.getWearFee()); // total amount of Adena require to draw symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to draw or not 0 is false and 1 is true + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to draw or not 0 is false and 1 is true packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeC(_player.getINT() + _player.getHennaValue(BaseStat.INT)); // equip INT @@ -63,7 +62,7 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket packet.writeC(_player.getLUC() + _player.getHennaValue(BaseStat.LUC)); // equip LUC packet.writeD(_player.getCHA()); // current CHA packet.writeC(_player.getCHA() + _player.getHennaValue(BaseStat.CHA)); // equip CHA - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 80eb9973d1..50ac2f3c4a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -40,12 +40,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getCancelCount()); // total amount of dye require packet.writeQ(_henna.getCancelFee()); // total amount of Adena require to remove symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to remove or not + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to remove or not packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeC(_player.getINT() - _player.getHennaValue(BaseStat.INT)); // equip INT @@ -63,7 +62,7 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket packet.writeC(_player.getLUC() - _player.getHennaValue(BaseStat.LUC)); // equip LUC packet.writeD(_player.getCHA()); // current CHA packet.writeC(_player.getCHA() - _player.getHennaValue(BaseStat.CHA)); // equip CHA - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 844fad86c7..452d354ac4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -39,7 +39,7 @@ public class HennaRemoveList implements IClientOutgoingPacket OutgoingPackets.HENNA_UNEQUIP_LIST.writeId(packet); packet.writeQ(_player.getAdena()); final boolean premiumSlotEnabled = _player.getHenna(4) != null; - packet.writeD(premiumSlotEnabled ? 0x04 : 0x03); // seems to be max size + packet.writeD(premiumSlotEnabled ? 4 : 3); // seems to be max size packet.writeD((premiumSlotEnabled ? 4 : 3) - _player.getHennaEmptySlots()); // slots used for (Henna henna : _player.getHennaList()) { @@ -49,8 +49,8 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); packet.writeQ(henna.getCancelCount()); packet.writeQ(henna.getCancelFee()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index 650261e010..9399a1626e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -62,14 +62,12 @@ public interface IClientOutgoingPacket extends IOutgoingPacket Inventory.PAPERDOLL_BROOCH_JEWEL5, Inventory.PAPERDOLL_BROOCH_JEWEL6 }; - int[] PAPERDOLL_ORDER_AUGMENT = new int[] { Inventory.PAPERDOLL_RHAND, Inventory.PAPERDOLL_LHAND, Inventory.PAPERDOLL_RHAND }; - int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 0c54e810f0..3378827f34 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -46,7 +46,6 @@ public class InventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index 8735b315b6..7912558f00 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -47,8 +47,7 @@ public class ItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.ITEM_LIST.writeId(packet); - - packet.writeH(_showWindow ? 0x01 : 0x00); + packet.writeH(_showWindow ? 1 : 0); packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java index b32b4df4a3..c3b9918230 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java @@ -32,9 +32,8 @@ public class JoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PARTY.writeId(packet); - packet.writeD(_response); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java index 65e06efeb7..f347f7efcd 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java @@ -32,7 +32,6 @@ public class JoinPledge implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PLEDGE.writeId(packet); - packet.writeD(_pledgeId); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index 96f6d7c34d..996622b9e9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -35,17 +35,16 @@ public class KeyPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VERSION_CHECK.writeId(packet); - packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok for (int i = 0; i < 8; i++) { packet.writeC(_key[i]); // key } - packet.writeD(0x01); + packet.writeD(1); packet.writeD(Config.SERVER_ID); // server id - packet.writeC(0x01); - packet.writeD(0x00); // obfuscation key - packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 0x01 : 0x00); // isClassic + packet.writeC(1); + packet.writeD(0); // obfuscation key + packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 1 : 0); // isClassic return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java index 484c10f0c4..62424fd03a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java @@ -40,7 +40,6 @@ public class L2FriendSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_SAY.writeId(packet); - packet.writeD(0); // ?? packet.writeS(_receiver); packet.writeS(_sender); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java index c7c3243833..a6703a1e9d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ListPartyWaiting implements IClientOutgoingPacket { + private static final int NUM_PER_PAGE = 64; + private final List _rooms = new LinkedList<>(); private final int _size; - private static final int NUM_PER_PAGE = 64; - public ListPartyWaiting(PartyMatchingRoomLevelType type, int location, int page, int requestorLevel) { final List rooms = MatchingRoomManager.getInstance().getPartyMathchingRooms(location, type, requestorLevel); @@ -56,7 +56,6 @@ public class ListPartyWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_PARTY_WATING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java index b647ba2e8f..f1e3158eb9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java @@ -48,7 +48,6 @@ public class LoginFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LOGIN_FAIL.writeId(packet); - packet.writeD(_reason); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java index 18a522c315..6743e3e66f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java @@ -32,7 +32,6 @@ public class MagicSkillCanceld implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_CANCELED.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java index d56de10079..7ab29cc1a8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java @@ -66,7 +66,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // MagicSkillUse castingType packet.writeD(_objectId); packet.writeD(_skillId); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java index 3df8463279..a86626cfa6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java @@ -84,7 +84,6 @@ public class MagicSkillUse implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_USE.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // Casting bar type: 0 - default, 1 - default up, 2 - blue, 3 - green, 4 - red. packet.writeD(_creature.getObjectId()); packet.writeD(_target.getObjectId()); @@ -111,7 +110,7 @@ public class MagicSkillUse implements IClientOutgoingPacket packet.writeD(_target.getX()); packet.writeD(_target.getY()); packet.writeD(_target.getZ()); - packet.writeD(_actionId >= 0 ? 0x01 : 0x00); // 1 when ID from RequestActionUse is used + packet.writeD(_actionId >= 0 ? 1 : 0); // 1 when ID from RequestActionUse is used packet.writeD(_actionId >= 0 ? _actionId : 0); // ID from RequestActionUse. Used to set cooldown on summon skills. return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java index 6b710c692e..12e2488f24 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java @@ -37,11 +37,9 @@ public class ManagePledgePower implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet); - packet.writeD(_rank); packet.writeD(_action); packet.writeD(_clan.getRankPrivs(_rank).getBitmask()); - return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 95f4b6f201..4e2ab3f00b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -42,11 +42,9 @@ public class MonRaceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MON_RACE_INFO.writeId(packet); - packet.writeD(_unknown1); packet.writeD(_unknown2); - packet.writeD(0x08); - + packet.writeD(8); for (int i = 0; i < 8; i++) { packet.writeD(_monsters[i].getObjectId()); // npcObjectID @@ -68,7 +66,7 @@ public class MonRaceInfo implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java index 0093b3edc9..e6386921ff 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java @@ -45,13 +45,10 @@ public class MoveToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_xDst); packet.writeD(_yDst); packet.writeD(_zDst); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java index b1fb3ea003..59103c6c4c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java @@ -48,7 +48,6 @@ public class MoveToLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java index 30ff3c96af..aa261f924f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java @@ -50,11 +50,9 @@ public class MoveToPawn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_PAWN.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetId); packet.writeD(_distance); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index cfb62e583f..088992e731 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -58,15 +58,13 @@ public class MultiSellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.MULTI_SELL_LIST.writeId(packet); - packet.writeD(_list.getId()); // list id - packet.writeC(0x00); // GOD Unknown + packet.writeC(0); // GOD Unknown packet.writeD(1 + (_index / PAGE_SIZE)); // page started from 1 - packet.writeD(_finished ? 0x01 : 0x00); // finished + packet.writeD(_finished ? 1 : 0); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window - + packet.writeC(_list.isChanceMultisell() ? 1 : 0); // new multisell window while (_size-- > 0) { ItemInfo itemEnchantment = _list.getItemEnchantment(_index); @@ -83,19 +81,15 @@ public class MultiSellList extends AbstractItemPacket } } } - packet.writeD(_index); // Entry ID. Start from 1. packet.writeC(entry.isStackable() ? 1 : 0); - // Those values will be passed down to MultiSellChoose packet. packet.writeH(itemEnchantment != null ? itemEnchantment.getEnchantLevel() : 0); // enchant level packet.writeD((itemEnchantment != null) && (itemEnchantment.getAugmentation() != null) ? itemEnchantment.getAugmentation().getOption1Id() : 0); packet.writeD((itemEnchantment != null) && (itemEnchantment.getAugmentation() != null) ? itemEnchantment.getAugmentation().getOption2Id() : 0); writeItemElemental(packet, itemEnchantment); - packet.writeH(entry.getProducts().size()); packet.writeH(entry.getIngredients().size()); - for (ItemChanceHolder product : entry.getProducts()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(product.getId()); @@ -119,7 +113,6 @@ public class MultiSellList extends AbstractItemPacket packet.writeD((displayItemEnchantment != null) && (displayItemEnchantment.getAugmentation() != null) ? displayItemEnchantment.getAugmentation().getOption2Id() : 0); writeItemElemental(packet, displayItemEnchantment); } - for (ItemChanceHolder ingredient : entry.getIngredients()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(ingredient.getId()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java index 5482659004..29265f5734 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java @@ -45,10 +45,9 @@ public class MyTargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MY_TARGET_SELECTED.writeId(packet); - packet.writeD(_objectId); packet.writeH(_color); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java index 1901ad1297..166c5c1e00 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java @@ -36,7 +36,6 @@ public class NewCharacterSuccess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NEW_CHARACTER_SUCCESS.writeId(packet); - packet.writeD(_chars.size()); for (PlayerTemplate chr : _chars) { @@ -44,31 +43,24 @@ public class NewCharacterSuccess implements IClientOutgoingPacket { continue; } - // TODO: Unhardcode these packet.writeD(chr.getRace().ordinal()); packet.writeD(chr.getClassId().getId()); - packet.writeD(99); packet.writeD(chr.getBaseSTR()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseDEX()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseCON()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseINT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseWIT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseMEN()); packet.writeD(1); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java index be1605f679..6061ea26ef 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java @@ -38,7 +38,6 @@ public class NicknameChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NICK_NAME_CHANGED.writeId(packet); - packet.writeD(_objectId); packet.writeS(_title); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index f9cd107e2c..3e4837b4a4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -54,24 +54,20 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public NpcHtmlMessage(int npcObjId, int itemId) { super(npcObjId); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } public NpcHtmlMessage(int npcObjId, int itemId, String html) { super(npcObjId, html); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } @@ -79,11 +75,10 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java index 61f195e35d..05489103cb 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java @@ -47,10 +47,8 @@ public class NpcInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -58,7 +56,6 @@ public class NpcInfo extends AbstractMaskPacket private int _clanId = 0; private int _statusMask = 0; private final Set _abnormalVisualEffects; - private String[] _localisation; public void setLang(String lang) @@ -101,112 +98,90 @@ public class NpcInfo extends AbstractMaskPacket { addComponentType(NpcInfoType.HEADING); } - if ((npc.getStat().getPAtkSpd() > 0) || (npc.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (npc.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((npc.getLeftHandItem() > 0) || (npc.getRightHandItem() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (npc.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (npc.getDisplayEffect() > 0) { addComponentType(NpcInfoType.DISPLAY_EFFECT); } - if (npc.isInsideZone(ZoneId.WATER) || npc.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (npc.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (npc.getCloneObjId() > 0) { addComponentType(NpcInfoType.CLONE); } - if (npc.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (npc.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (npc.getCurrentHp() <= npc.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (npc.getCurrentMp() <= npc.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (npc.getTemplate().isUsingServerSideName()) { addComponentType(NpcInfoType.NAME); } - if (npc.getTemplate().isUsingServerSideTitle() || (npc.isMonster() && (Config.SHOW_NPC_LEVEL || Config.SHOW_NPC_AGGRESSION)) || npc.isChampion() || npc.isTrap()) { addComponentType(NpcInfoType.TITLE); } - if (npc.getNameString() != null) { addComponentType(NpcInfoType.NAME_NPCSTRINGID); } - if (npc.getTitleString() != null) { addComponentType(NpcInfoType.TITLE_NPCSTRINGID); } - if (_npc.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (!_abnormalVisualEffects.isEmpty() || npc.isInvisible()) { addComponentType(NpcInfoType.ABNORMALS); } - if (npc.getEnchantEffect() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (npc.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (npc.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (npc.getClanId() > 0) { final Clan clan = ClanTable.getInstance().getClan(npc.getClanId()); @@ -220,14 +195,11 @@ public class NpcInfo extends AbstractMaskPacket addComponentType(NpcInfoType.CLAN); } } - addComponentType(NpcInfoType.COLOR_EFFECT); - if (npc.getPvpFlag() > 0) { addComponentType(NpcInfoType.PVP_FLAG); } - // TODO: Confirm me if (npc.isInCombat()) { @@ -245,8 +217,7 @@ public class NpcInfo extends AbstractMaskPacket { _statusMask |= 0x08; } - - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -296,27 +267,23 @@ public class NpcInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO.writeId(packet); - packet.writeD(_npc.getObjectId()); - packet.writeC(_npc.isShowSummonAnimation() ? 0x02 : 0x00); // // 0=teleported 1=default 2=summoned + packet.writeC(_npc.isShowSummonAnimation() ? 2 : 0); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 0x01 : 0x00); + packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { String title = _npc.getTitle(); - // Localisation related. if ((_localisation != null) && !_localisation[1].equals("")) { @@ -329,10 +296,8 @@ public class NpcInfo extends AbstractMaskPacket title = title.replace(NpcData.getInstance().getTemplate(_npc.getId()).getTitle(), _localisation[1]); } } - packet.writeS(title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -351,7 +316,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -366,20 +331,20 @@ public class NpcInfo extends AbstractMaskPacket if (containsMask(NpcInfoType.EQUIPPED)) { packet.writeD(_npc.getRightHandItem()); - packet.writeD(0x00); // Armor id? + packet.writeD(0); // Armor id? packet.writeD(_npc.getLeftHandItem()); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_npc.isDead() ? 0x00 : 0x01); + packet.writeC(_npc.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); + packet.writeC(_npc.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 0x01 : _npc.isFlying() ? 0x02 : 0x00); + packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -391,7 +356,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_npc.isFlying() ? 0x01 : 0x00); + packet.writeD(_npc.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { @@ -427,12 +392,12 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(0x00); // 2 - do some animation on spawn + packet.writeC(0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -464,12 +429,10 @@ public class NpcInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java index c95a8e5274..923e9cebad 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class NpcInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_npc.getObjectId()); packet.writeD(_npc.getTransformationDisplayId()); - final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size()); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java index a294edc57a..2a0ba41eeb 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java @@ -38,7 +38,6 @@ public class NpcQuestHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NPC_QUEST_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_questId); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java index d3328ade97..fc6d0d4a3a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java @@ -106,7 +106,6 @@ public class NpcSay implements IClientOutgoingPacket { _parameters = new ArrayList<>(); } - for (String item : params) { if ((item != null) && (item.length() > 0)) @@ -127,11 +126,9 @@ public class NpcSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_SAY.writeId(packet); - packet.writeD(_objectId); packet.writeD(_textType.getClientId()); packet.writeD(_npcId); - // Localisation related. if (_lang != null) { @@ -147,7 +144,6 @@ public class NpcSay implements IClientOutgoingPacket } } } - packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java index 356e3f48a9..ac61f9d247 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java @@ -33,11 +33,10 @@ public class ObservationMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_START.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me packet.writeD(0xc0); // TODO: Find me return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java index 5c0a0766b3..896ccea02b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java @@ -33,7 +33,6 @@ public class ObservationReturn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_END.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java index c2f7ab404f..173772c870 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java @@ -37,7 +37,6 @@ public class OnEventTrigger implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EVENT_TRIGGER.writeId(packet); - packet.writeD(_emitterId); packet.writeC(_enabled); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index d499719f31..70a51b2b0d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -44,7 +44,6 @@ public class PackageSendableList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet); - packet.writeD(_objectId); packet.writeQ(_adena); packet.writeD(_items.size()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java index a53f589386..e24d63f717 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java @@ -39,7 +39,6 @@ public class PackageToList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_TO_LIST.writeId(packet); - packet.writeD(_players.size()); for (Entry entry : _players.entrySet()) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 655c7abcd1..44b23b37f4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -55,7 +55,6 @@ public class PartyMemberPosition implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); - packet.writeD(locations.size()); for (Entry entry : locations.entrySet()) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java index 9e275ec246..c9d3595037 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java @@ -36,7 +36,6 @@ public class PartyRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java index b9c7d06769..8c97cac6b5 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java @@ -36,12 +36,10 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ADD.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); // c3 packet.writeD(_party.getDistributionType().getId()); // c3 packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); - packet.writeD((int) _member.getCurrentCp()); // c4 packet.writeD(_member.getMaxCp()); // c4 packet.writeD((int) _member.getCurrentHp()); @@ -51,7 +49,7 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket packet.writeD(_member.getVitalityPoints()); packet.writeC(_member.getLevel()); packet.writeH(_member.getClassId().getId()); - packet.writeC(0x00); + packet.writeC(0); packet.writeH(_member.getRace().ordinal()); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java index 65d0c60c2e..5ad91f5463 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java @@ -37,21 +37,17 @@ public class PartySmallWindowAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ALL.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); packet.writeC(_party.getDistributionType().getId()); packet.writeC(_party.getMemberCount() - 1); - for (Player member : _party.getMembers()) { if ((member != null) && (member != _exclude)) { packet.writeD(member.getObjectId()); packet.writeS(member.getName()); - packet.writeD((int) member.getCurrentCp()); // c4 packet.writeD(member.getMaxCp()); // c4 - packet.writeD((int) member.getCurrentHp()); packet.writeD(member.getMaxHp()); packet.writeD((int) member.getCurrentMp()); @@ -59,7 +55,7 @@ public class PartySmallWindowAll implements IClientOutgoingPacket packet.writeD(member.getVitalityPoints()); packet.writeC(member.getLevel()); packet.writeH(member.getClassId().getId()); - packet.writeC(0x01); // Unk + packet.writeC(1); // Unk packet.writeH(member.getRace().ordinal()); final Summon pet = member.getPet(); packet.writeD(member.getServitors().size() + (pet != null ? 1 : 0)); // Summon size, one only atm diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java index 94a8a5a2ce..09ce132af4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java @@ -33,7 +33,6 @@ public class PartySmallWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_DELETE.writeId(packet); - packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java index c53c6c7779..e9ea2efbbe 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java @@ -42,7 +42,6 @@ public class PartySmallWindowUpdate extends AbstractMaskPacket _summon.getStat().getExp()) { packet.writeQ(_summon.getStat().getExp()); // 0% absolute value @@ -160,9 +148,7 @@ public class PetInfo implements IClientOutgoingPacket { packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value } - packet.writeQ(_summon.getExpForNextLevel()); // 100% absoulte value - packet.writeD(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight packet.writeD(_summon.getMaxLoad()); // max weight it can carry packet.writeD(_summon.getPAtk()); // patk @@ -178,25 +164,20 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD((int) _summon.getStat().getMoveSpeed()); // speed packet.writeD(_summon.getPAtkSpd()); // atkspeed packet.writeD(_summon.getMAtkSpd()); // casting speed - packet.writeC(0); // TODO: Check me, might be ride status packet.writeC(_summon.getTeam().getId()); // Confirmed packet.writeC(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed packet.writeC(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed - - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. - + packet.writeD(0); // TODO: Find me + packet.writeD(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. packet.writeC(_summon.getOwner().getSummonPoints()); // Used Summon Points packet.writeC(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points - final Set aves = _summon.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeH(aves.size()); // Confirmed for (AbnormalVisualEffect ave : aves) { packet.writeH(ave.getClientId()); // Confirmed } - packet.writeC(_statusMask); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 5b43daa74b..1f60ec39d1 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -46,7 +46,6 @@ public class PetInventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.PET_INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index e4cf35779f..16dc83b7ed 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -35,7 +35,6 @@ public class PetItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java index fdb00ddbb1..913f65d470 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java @@ -38,7 +38,6 @@ public class PetStatusShow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_SHOW.writeId(packet); - packet.writeD(_summonType); packet.writeD(_summonObjectId); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 25c2c74292..823a8c405a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -52,7 +52,6 @@ public class PetStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_UPDATE.writeId(packet); - packet.writeD(_summon.getSummonType()); packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getX()); @@ -69,7 +68,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket packet.writeQ(_summon.getStat().getExp()); packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value packet.writeQ(_summon.getExpForNextLevel()); // 100% absolute value - packet.writeD(0x01); // TODO: Find me! + packet.writeD(1); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java index 4bc3570779..0898b01f67 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java @@ -63,7 +63,6 @@ public class PlaySound implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLAY_SOUND.writeId(packet); - packet.writeD(_unknown1); // unknown 0 for quest and ship; packet.writeS(_soundFile); packet.writeD(_unknown3); // unknown 0 for quest; 1 for ship; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java index fbe57d4aaf..5108fe7e1b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java @@ -44,7 +44,6 @@ public class PledgeCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java index aa11b1213e..6805f64d7c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java @@ -34,7 +34,6 @@ public class PledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_INFO.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getId()); packet.writeS(_clan.getName()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java index 72f2c71838..193ee17589 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java @@ -36,12 +36,10 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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 - // clan or subpledge name if (_member.getPledgeType() != 0) { @@ -51,7 +49,6 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket { packet.writeS(_member.getClan().getName()); } - packet.writeS(_member.getApprenticeOrSponsorName()); // name of this member's apprentice/sponsor return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java index eefd482979..6aa5067c8f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java @@ -36,7 +36,6 @@ public class PledgeReceivePowerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_POWER_INFO.writeId(packet); - packet.writeD(_member.getPowerGrade()); // power grade packet.writeS(_member.getName()); packet.writeD(_member.getClan().getRankPrivs(_member.getPowerGrade()).getBitmask()); // privileges diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 818c38a076..01f71eea17 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -40,8 +40,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_SUB_PLEDGE_CREATED.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); packet.writeD(_subPledge.getId()); packet.writeS(_subPledge.getName()); packet.writeS(getLeaderName()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java index 4d0efeb82a..7649947064 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java @@ -43,7 +43,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(packet); - packet.writeD(_tab); // page packet.writeD(_clanList.size()); for (ClanWar clanWar : _clanList) @@ -53,7 +52,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket { continue; } - packet.writeS(clan.getName()); packet.writeD(clanWar.getState().ordinal()); // type: 0 = Declaration, 1 = Blood Declaration, 2 = In War, 3 = Victory, 4 = Defeat, 5 = Tie, 6 = Error packet.writeD(clanWar.getRemainingTime()); // Time if friends to start remaining diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java index fb58bfdc4c..d1372f450f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java @@ -34,26 +34,25 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_INFO_UPDATE.writeId(packet); - // sending empty data so client will ask all the info in response ;) packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); // TODO: Remove line on problems packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getLevel()); // clan level packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); // castle state ? + packet.writeD(0); // castle state ? packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); // clan reputation score - packet.writeD(0x00); // ? - packet.writeD(0x00); // ? + packet.writeD(0); // ? + packet.writeD(0); // ? packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); // c5 packet.writeD(_clan.getAllyCrestId()); // c5 packet.writeD(_clan.isAtWar() ? 1 : 0); // c5 - packet.writeD(0x00); // TODO: Find me! - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java index ae26e50dbb..2fa9f26d4a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java @@ -51,12 +51,11 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ADD.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); - packet.writeD(0x00); - packet.writeD(0x01); + packet.writeD(0); + packet.writeD(1); packet.writeD(_isOnline); // 1 = online 0 = offline packet.writeD(_pledgeType); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index 2a82b182bb..bf76cca9fa 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -41,7 +41,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket { _clan = clan; _pledge = pledge; - _pledgeId = _pledge == null ? 0x00 : _pledge.getId(); + _pledgeId = _pledge == null ? 0 : _pledge.getId(); _leaderName = pledge == null ? clan.getLeaderName() : CharNameTable.getInstance().getNameById(pledge.getLeaderId()); _name = pledge == null ? clan.getName() : pledge.getName(); _members = _clan.getMembers(); @@ -65,31 +65,28 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(packet); - - packet.writeD(_isSubPledge ? 0x00 : 0x01); + packet.writeD(_isSubPledge ? 0 : 1); packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_pledgeId); packet.writeS(_name); packet.writeS(_leaderName); - packet.writeD(_clan.getCrestId()); // crest id .. is used again packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); // 0 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(0); // 0 packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.isAtWar() ? 1 : 0); // new c3 - packet.writeD(0x00); // Territory castle ID + packet.writeD(0); // Territory castle ID packet.writeD(_clan.getSubPledgeMembersCount(_pledgeId)); - for (ClanMember m : _members) { if (m.getPledgeType() != _pledgeId) @@ -107,8 +104,8 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket } else { - packet.writeD(0x01); // no visible effect - packet.writeD(0x01); // packet.writeD(1); + packet.writeD(1); // no visible effect + packet.writeD(1); // packet.writeD(1); } packet.writeD(m.isOnline() ? m.getObjectId() : 0); // objectId = online 0 = offline packet.writeD(m.getSponsor() != 0 ? 1 : 0); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java index 0fd387e419..154bcc610d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java @@ -32,7 +32,6 @@ public class PledgeShowMemberListDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_DELETE.writeId(packet); - packet.writeS(_player); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java index c61f412ed0..7b8c7c516b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java @@ -66,7 +66,6 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index 4e89797e45..09f70ea024 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -62,14 +62,14 @@ public class PledgeSkillList implements IClientOutgoingPacket { packet.writeD(sk.getDisplayId()); packet.writeH(sk.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } for (SubPledgeSkill sk : _subSkills) { packet.writeD(sk._subType); // Clan Sub-unit types packet.writeD(sk._skillId); packet.writeH(sk._skillLevel); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java index f3b8d4c26c..a94601294f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java @@ -37,7 +37,6 @@ public class PledgeSkillListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST_ADD.writeId(packet); - packet.writeD(_id); packet.writeD(_level); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java index 9e1b4843ac..5f32f2bf54 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java @@ -33,15 +33,14 @@ public class PledgeStatusChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_STATUS_CHANGED.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getLeaderId()); packet.writeD(_clan.getId()); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getAllyId()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.getCrestLargeId()); - packet.writeD(0x00); // pledge type ? + packet.writeD(0); // pledge type ? return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java index 5b56d0b28d..41d0f9f7d8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java @@ -44,12 +44,10 @@ public class PrivateStoreListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_LIST.writeId(packet); - packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); // Viewer's item count? + packet.writeD(0); // Viewer's item count? packet.writeD(_items.size()); - int slotNumber = 0; for (TradeItem item : _items) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 67b6ba8d94..d72050283e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -43,11 +43,10 @@ public class PrivateStoreListSell extends AbstractItemPacket else { OutgoingPackets.PRIVATE_STORE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index bb462b6cd2..5e95f8b9b8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -43,17 +43,14 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MANAGE_LIST.writeId(packet); - packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(_itemList.size()); // inventory items for potential buy for (Item item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(_buyList.size()); // count for all items already added for buy for (TradeItem item : _buyList) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index 400307eb79..94ff06a790 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -45,18 +45,15 @@ public class PrivateStoreManageListSell extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MANAGE_LIST.writeId(packet); - packet.writeD(_objId); packet.writeD(_packageSale ? 1 : 0); // Package sell packet.writeQ(_playerAdena); - packet.writeD(_itemList.size()); // for potential sells for (TradeItem item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(_sellList.size()); // count for any items already added for sell for (TradeItem item : _sellList) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java index 8a5b9eef92..0d7bcbea16 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgBuy implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java index b00bd2add2..8fdb5701b8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgSell implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java index c3958367e8..5ddaa46ba0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java @@ -40,7 +40,6 @@ public class RadarControl implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RADAR_CONTROL.writeId(packet); - packet.writeD(_showRadar); packet.writeD(_type); // maybe type packet.writeD(_x); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java index 3918894601..5d67413b6f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java @@ -43,10 +43,8 @@ public class RecipeBookItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_BOOK_ITEM_LIST.writeId(packet); - - packet.writeD(_isDwarvenCraft ? 0x00 : 0x01); // 0 = Dwarven - 1 = Common + packet.writeD(_isDwarvenCraft ? 0 : 1); // 0 = Dwarven - 1 = Common packet.writeD(_maxMp); - if (_recipes == null) { packet.writeD(0); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 459ffd5837..50a5ce3daf 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -57,7 +57,6 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeD(_success ? 1 : 0); // item creation success/failed return true; } - PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java index 7f6a177921..b2b3b5daf9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java @@ -35,13 +35,12 @@ public class RecipeShopItemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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); - packet.writeQ(0x00); + packet.writeQ(0); return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java index 75e45f5877..38b0b8ea4e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java @@ -43,7 +43,6 @@ public class RecipeShopManageList implements IClientOutgoingPacket { _recipes = _seller.getCommonRecipeBook(); } - if (_seller.hasManufactureShop()) { final Iterator it = _seller.getManufactureItems().values().iterator(); @@ -63,11 +62,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MANAGE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD((int) _seller.getAdena()); - packet.writeD(_isDwarven ? 0x00 : 0x01); - + packet.writeD(_isDwarven ? 0 : 1); if (_recipes == null) { packet.writeD(0); @@ -83,10 +80,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket packet.writeD(count); } } - if (!_seller.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -94,7 +90,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket for (ManufactureItem item : _seller.getManufactureItems().values()) { packet.writeD(item.getRecipeId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeQ(item.getCost()); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java index c025b5e4ed..2b9bc5b6e7 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java @@ -33,7 +33,6 @@ public class RecipeShopMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MSG.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeS(_player.getStoreName()); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java index be8ae1181e..8b3cb42f47 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java @@ -36,14 +36,13 @@ public class RecipeShopSellList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_SELL_LIST.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD((int) _manufacturer.getCurrentMp()); // Creator's MP packet.writeD(_manufacturer.getMaxMp()); // Creator's MP packet.writeQ(_buyer.getAdena()); // Buyer Adena if (!_manufacturer.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -51,7 +50,7 @@ public class RecipeShopSellList implements IClientOutgoingPacket for (ManufactureItem temp : _manufacturer.getManufactureItems().values()) { packet.writeD(temp.getRecipeId()); - packet.writeD(0x00); // unknown + packet.writeD(0); // unknown packet.writeQ(temp.getCost()); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 74700e29b0..269e14d50b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -88,7 +88,6 @@ public class RelationChanged implements IClientOutgoingPacket { return; } - final Relation r = new Relation(); r._objId = activeChar.getObjectId(); r._relation = relation; @@ -102,7 +101,6 @@ public class RelationChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RELATION_CHANGED.writeId(packet); - packet.writeC(_mask); if (_multi == null) { @@ -122,7 +120,6 @@ public class RelationChanged implements IClientOutgoingPacket private void writeRelation(PacketWriter packet, Relation relation) { packet.writeD(relation._objId); - if ((_mask & SEND_DEFAULT) != SEND_DEFAULT) { packet.writeD(relation._relation); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java index b4e9dc25c5..4477cfb705 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java @@ -35,7 +35,6 @@ public class RequestEnchant implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java index 4ef15fb74c..7a0a6cbe58 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java @@ -33,7 +33,6 @@ public class Revive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.REVIVE.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java index 9c409601e3..b9ddf7733f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java @@ -42,7 +42,6 @@ public class Ride implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RIDE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_mounted); packet.writeD(_rideType); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 813ce03f4d..13ef62f55f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -49,11 +49,9 @@ public class SellListProcure implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SELL_LIST_PROCURE.writeId(packet); - packet.writeQ(_money); // money - packet.writeD(0x00); // lease ? + packet.writeD(0); // lease ? packet.writeH(_sellList.size()); // list size - for (Entry entry : _sellList.entrySet()) { final Item item = entry.getKey(); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java index 7ea6e2c8ca..26f88961e8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java @@ -39,12 +39,10 @@ public class SendMacroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MACRO_LIST.writeId(packet); - packet.writeC(_updateType.getId()); - packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0x00); // modified, created or deleted macro's id + packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0); // modified, created or deleted macro's id packet.writeC(_count); // count of Macros packet.writeC(_macro != null ? 1 : 0); // unknown - if ((_macro != null) && (_updateType != MacroUpdateType.DELETE)) { packet.writeD(_macro.getId()); // Macro ID @@ -52,9 +50,7 @@ public class SendMacroList implements IClientOutgoingPacket packet.writeS(_macro.getDescr()); // Desc packet.writeS(_macro.getAcronym()); // acronym packet.writeC(_macro.getIcon()); // icon - packet.writeC(_macro.getCommands().size()); // count - int i = 1; for (MacroCmd cmd : _macro.getCommands()) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java index 47fada25be..21622b5f19 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java @@ -32,7 +32,6 @@ public class SendTradeRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_REQUEST.writeId(packet); - packet.writeD(_senderId); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java index 69aa749406..1513a0e3d1 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java @@ -55,7 +55,6 @@ public class ServerObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SERVER_OBJECT_INFO.writeId(packet); - packet.writeD(_activeChar.getObjectId()); packet.writeD(_displayId + 1000000); packet.writeS(_name); // name @@ -70,8 +69,8 @@ public class ServerObjectInfo implements IClientOutgoingPacket packet.writeF(_collisionHeight); packet.writeD((int) (_isAttackable ? _activeChar.getCurrentHp() : 0)); packet.writeD(_isAttackable ? _activeChar.getMaxHp() : 0); - packet.writeD(0x01); // object type - packet.writeD(0x00); // special effects + packet.writeD(1); // object type + packet.writeD(0); // special effects return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java index 88b370ad8b..0164e5c4a2 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java @@ -34,7 +34,6 @@ public class SetSummonRemainTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SET_SUMMON_REMAIN_TIME.writeId(packet); - packet.writeD(_maxTime); packet.writeD(_remainingTime); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java index db28b72acf..016f5a0c9a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java @@ -38,7 +38,6 @@ public class ShopPreviewInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_INFO.writeId(packet); - packet.writeD(Inventory.PAPERDOLL_TOTALSLOTS); // Slots packet.writeD(getFromList(Inventory.PAPERDOLL_UNDER)); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index df50db952f..a55186f551 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -51,11 +51,9 @@ public class ShopPreviewList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_LIST.writeId(packet); - packet.writeD(5056); packet.writeQ(_money); // current money packet.writeD(_listId); - int newlength = 0; for (Product product : _list) { @@ -65,23 +63,20 @@ public class ShopPreviewList implements IClientOutgoingPacket } } packet.writeH(newlength); - for (Product product : _list) { if ((product.getItem().getCrystalType().getLevel() <= _expertise) && product.getItem().isEquipable()) { packet.writeD(product.getItemId()); packet.writeH(product.getItem().getType2()); // item type2 - if (product.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { packet.writeQ(product.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } else { - packet.writeQ(0x00); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand + packet.writeQ(0); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } - packet.writeQ(Config.WEAR_PRICE); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 298301ed0d..b13080ff28 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -40,7 +40,6 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_BUFF_STATUS_UPDATE.writeId(packet); - packet.writeD(_skillId); packet.writeH(_skillLevel); packet.writeH(_skillSubLevel); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index 2454943a10..6e7d9eaa3e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -33,7 +33,6 @@ public class ShortCutInit implements IClientOutgoingPacket { return; } - _shortCuts = player.getAllShortCuts(); } @@ -41,25 +40,23 @@ public class ShortCutInit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); packet.writeD(sc.getSlot() + (sc.getPage() * 12)); - switch (sc.getType()) { case ITEM: { packet.writeD(sc.getId()); - packet.writeD(0x01); // Enabled or not + packet.writeD(1); // Enabled or not packet.writeD(sc.getSharedReuseGroup()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeD(0x00); // Visual id + packet.writeD(0); + packet.writeD(0); + packet.writeH(0); + packet.writeH(0); + packet.writeD(0); // Visual id break; } case SKILL: @@ -68,8 +65,8 @@ public class ShortCutInit implements IClientOutgoingPacket packet.writeH(sc.getLevel()); packet.writeH(sc.getSubLevel()); packet.writeD(sc.getSharedReuseGroup()); - packet.writeC(0x00); // C5 - packet.writeD(0x01); // C6 + packet.writeC(0); // C5 + packet.writeD(1); // C6 break; } case ACTION: @@ -78,7 +75,7 @@ public class ShortCutInit implements IClientOutgoingPacket case BOOKMARK: { packet.writeD(sc.getId()); - packet.writeD(0x01); // C6 + packet.writeD(1); // C6 } } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java index 43d61af661..f099eab47e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java @@ -37,7 +37,6 @@ public class ShortCutRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_REGISTER.writeId(packet); - packet.writeD(_shortcut.getType().ordinal()); packet.writeD(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client switch (_shortcut.getType()) @@ -47,10 +46,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeD(_shortcut.getId()); packet.writeD(_shortcut.getCharacterType()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeD(0x00); // unknown - packet.writeD(0x00); // unknown - packet.writeD(0x00); // item augment id - packet.writeD(0x00); // TODO: Find me, item visual id ? + packet.writeD(0); // unknown + packet.writeD(0); // unknown + packet.writeD(0); // item augment id + packet.writeD(0); // TODO: Find me, item visual id ? break; } case SKILL: @@ -59,10 +58,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeH(_shortcut.getLevel()); packet.writeH(_shortcut.getSubLevel()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeC(0x00); // C5 + packet.writeC(0); // C5 packet.writeD(_shortcut.getCharacterType()); - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me + packet.writeD(0); // TODO: Find me break; } case ACTION: diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java index d6f71b5f70..cfae3b3fad 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java @@ -54,7 +54,6 @@ public class ShowBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - packet.writeC(_showBoard); // c4 1 to show community 00 to hide packet.writeS("bypass _bbshome"); // top packet.writeS("bypass _bbsgetfav"); // favorite diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java index 4b62a7001b..4d62e99d7a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java @@ -32,7 +32,6 @@ public class ShowCalculator implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_CALC.writeId(packet); - packet.writeD(_calculatorId); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java index 55f58d5375..4574762467 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java @@ -32,9 +32,8 @@ public class ShowMiniMap implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_MINIMAP.writeId(packet); - packet.writeD(_mapId); - packet.writeC(0x00); // Seven Signs state + packet.writeC(0); // Seven Signs state return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java index 303eab4e8a..97100d09d2 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java @@ -34,7 +34,6 @@ public class ShowPCCafeCouponShowUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_PCCAFE_COUPON_SHOW_UI.writeId(packet); - return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java index d86958e586..0a0f3ae861 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java @@ -35,7 +35,6 @@ public class ShowXMasSeal implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_XMAS_SEAL.writeId(packet); - packet.writeD(_item); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java index 66eccc7fbf..1baa030c4d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java @@ -28,9 +28,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = ca
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Attackers Clans?
* d = Number of Attackers Clans
* { //repeats
@@ -58,11 +58,10 @@ public class SiegeAttackerList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _castle.getSiege().getAttackerClans().size(); if (size > 0) { @@ -76,12 +75,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -90,8 +88,8 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index 5d5c831f14..8afd1f38ce 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -29,9 +29,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = 0xcb
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Defending Clans?
* d = Number of Defending Clans
* { //repeats
@@ -60,16 +60,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // Unknown - packet.writeD(0x01); // Unknown - packet.writeD(0x00); // Unknown - + packet.writeD(0); // Unknown + packet.writeD(1); // Unknown + packet.writeD(0); // Unknown final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0); packet.writeD(size); packet.writeD(size); - // Add owners final Clan ownerClan = _castle.getOwner(); if (ownerClan != null) @@ -78,14 +75,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket packet.writeS(ownerClan.getName()); packet.writeS(ownerClan.getLeaderName()); packet.writeD(ownerClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.OWNER.ordinal()); packet.writeD(ownerClan.getAllyId()); packet.writeS(ownerClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(ownerClan.getAllyCrestId()); } - // List of confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans()) { @@ -94,19 +90,17 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(defendingClan.getAllyCrestId()); } - // List of not confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans()) { @@ -115,12 +109,11 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER_PENDING.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 0a3fe46cb7..dfeefdaecf 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -59,13 +59,11 @@ public class SiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_INFO.writeId(packet); - if (_castle != null) { packet.writeD(_castle.getResidenceId()); - final int ownerId = _castle.getOwnerId(); - packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 0x01 : 0x00); + packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0); packet.writeD(ownerId); if (ownerId > 0) { @@ -89,7 +87,6 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { @@ -97,7 +94,7 @@ public class SiegeInfo implements IClientOutgoingPacket cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis()); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(Config.SIEGE_HOUR_LIST.size()); for (int hour : Config.SIEGE_HOUR_LIST) { @@ -108,7 +105,7 @@ public class SiegeInfo implements IClientOutgoingPacket else { packet.writeD((int) (_castle.getSiegeDate().getTimeInMillis() / 1000)); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index d11b3817c0..3c4c475339 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -51,12 +51,11 @@ public class SkillCoolTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SKILL_COOL_TIME.writeId(packet); - packet.writeD(_skillReuseTimeStamps.size()); for (TimeStamp ts : _skillReuseTimeStamps) { packet.writeD(ts.getSkillId()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD((int) ts.getReuse() / 1000); packet.writeD((int) Math.max(ts.getStamp() - _currentTime, 0) / 1000); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index de54232b51..ed4615c403 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -41,10 +41,9 @@ public class Snoop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SNOOP.writeId(packet); - packet.writeD(_convoId); packet.writeS(_name); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_type.getClientId()); packet.writeS(_speaker); packet.writeS(_msg); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java index 37827bdf6c..52f15519a5 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java @@ -37,10 +37,9 @@ public class SocialAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SOCIAL_ACTION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_actionId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index c2fedd99c0..f2b0fadabd 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -33,16 +33,15 @@ public class SpawnItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPAWN_ITEM.writeId(packet); - packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeD(_item.isStackable() ? 0x01 : 0x00); + packet.writeD(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java index ccae75b850..04f3ad716c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java @@ -110,7 +110,6 @@ public class SpecialCamera implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPECIAL_CAMERA.writeId(packet); - packet.writeD(_id); packet.writeD(_force); packet.writeD(_angle1); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java index cdd3821740..281756e793 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java @@ -34,7 +34,6 @@ public class StartPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_PLEDGE_WAR.writeId(packet); - packet.writeS(_playerName); packet.writeS(_pledgeName); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java index 48b4238eea..27fb4f606b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java @@ -38,7 +38,6 @@ public class StartRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_side); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java index b4f421df36..067bdeb082 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java @@ -72,7 +72,6 @@ public class StaticObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATIC_OBJECT.writeId(packet); - packet.writeD(_staticObjectId); packet.writeD(_objectId); packet.writeD(_type); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index 928b54aa48..40836e4af8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -46,7 +46,6 @@ public class StatusUpdate implements IClientOutgoingPacket public void addUpdate(StatusUpdateType type, int level) { _updates.put(type, level); - if (_isPlayable) { switch (type) @@ -75,10 +74,9 @@ public class StatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATUS_UPDATE.writeId(packet); - packet.writeD(_objectId); // casterId - packet.writeD(_isVisible ? _casterObjectId : 0x00); - packet.writeC(_isVisible ? 0x01 : 0x00); + packet.writeD(_isVisible ? _casterObjectId : 0); + packet.writeC(_isVisible ? 1 : 0); packet.writeC(_updates.size()); for (Entry entry : _updates.entrySet()) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java index 9919307366..cf2b71df5a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java @@ -53,7 +53,6 @@ public class StopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java index 50fdc3fe4c..78fdb5d70c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java @@ -43,7 +43,6 @@ public class StopMoveInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java index 9c828c3962..b254cad8b1 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java @@ -34,7 +34,6 @@ public class StopPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java index b0392de226..ca69cd5346 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java @@ -36,7 +36,6 @@ public class StopRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FINISH_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_speed); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index c1feb37b2f..2d92796c75 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -43,10 +43,8 @@ public class SummonInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class SummonInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class SummonInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,11 +154,9 @@ public class SummonInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - // Show red aura? - // if (_statusMask != 0) + // if (_statusMask != 0x00) // { // addComponentType(NpcInfoType.VISUAL_STATE); // } @@ -229,28 +206,24 @@ public class SummonInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.SUMMON_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -269,7 +242,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -285,19 +258,19 @@ public class SummonInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -309,20 +282,20 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -346,12 +319,12 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -381,12 +354,10 @@ public class SummonInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java index 864462f76f..6f88551204 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java @@ -34,7 +34,6 @@ public class SurrenderPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SURRENDER_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index f058ddf030..dd4d2884da 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -160,7 +160,6 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } - _params[_paramIndex++] = param; } @@ -266,7 +265,6 @@ public class SystemMessage implements IClientOutgoingPacket { return addString(item.getName()); } - append(new SMParam(TYPE_ITEM_NAME, id)); return this; } @@ -382,7 +380,6 @@ public class SystemMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SYSTEM_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -395,13 +392,12 @@ public class SystemMessage implements IClientOutgoingPacket params[i] = _params[i].getValue(); } packet.writeH(SystemMessageId.S1_2.getId()); - packet.writeC(0x01); + packet.writeC(1); packet.writeC(TYPE_TEXT); packet.writeS(sml.getLocalisation(params)); return true; } } - packet.writeH(getId()); packet.writeC(_params.length); for (SMParam param : _params) @@ -411,9 +407,7 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } - packet.writeC(param.getType()); - switch (param.getType()) { case TYPE_ELEMENT_NAME: diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java index a91da07e77..d357efbb0e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java @@ -47,13 +47,12 @@ public class TargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_SELECTED.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java index 3dadd249f6..3d7208c06f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java @@ -42,12 +42,11 @@ public class TargetUnselected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_UNSELECTED.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index 943b5078b6..13f9b9565a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -41,14 +41,13 @@ public class TeleportToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TELEPORT_TO_LOCATION.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // Fade 0, Instant 1. + packet.writeD(0); // Fade 0, Instant 1. packet.writeD(_heading); - packet.writeD(0x00); // Unknown. + packet.writeD(0); // Unknown. return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java index cb82f2da59..8d09576d9d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java @@ -32,7 +32,6 @@ public class TradeDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_DONE.writeId(packet); - packet.writeD(_num); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index 470ce757db..0635e50548 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -56,7 +56,6 @@ public class TradeStart extends AbstractItemPacket { _mask |= 0x08; } - // Does not shows level if (_partner.isGM()) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java index 998f07a8c3..735cd8ce84 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java @@ -39,7 +39,6 @@ public class TradeUpdate extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_UPDATE.writeId(packet); - packet.writeH(1); packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2); writeTradeItem(packet, _item); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java index c7102ca385..728020c0b1 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java @@ -32,7 +32,6 @@ public class TutorialEnableClientEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_ENABLE_CLIENT_EVENT.writeId(packet); - packet.writeD(_eventId); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java index 92ac75afcf..7cc33a0f80 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java @@ -48,7 +48,6 @@ public class TutorialShowHtml extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_HTML.writeId(packet); - packet.writeD(_type); packet.writeS(getHtml()); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java index ef609a94ad..2a550c8dfc 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java @@ -32,7 +32,6 @@ public class TutorialShowQuestionMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_QUESTION_MARK.writeId(packet); - packet.writeD(_markId); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index fedaf622bf..edb8390cb7 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -34,7 +34,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class UserInfo extends AbstractMaskPacket { private Player _player; - private int _relation; private int _runSpd; private int _walkSpd; @@ -48,14 +47,12 @@ public class UserInfo extends AbstractMaskPacket private int _enchantLevel; private int _armorEnchant; private String _title; - private final byte[] _masks = new byte[] { (byte) 0x00, (byte) 0x00, (byte) 0x00 }; - private int _initSize = 5; public UserInfo(Player player) @@ -79,6 +76,7 @@ public class UserInfo extends AbstractMaskPacket _enchantLevel = player.getInventory().getWeaponEnchant(); _armorEnchant = player.getInventory().getArmorMinEnchant(); _title = player.getTitle(); + if (player.isGM() && player.isInvisible()) { _title = "[Invisible]"; @@ -134,29 +132,25 @@ public class UserInfo extends AbstractMaskPacket } OutgoingPackets.USER_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_initSize); packet.writeH(23); packet.writeB(_masks); - if (containsMask(UserInfoType.RELATION)) { packet.writeD(_relation); } - if (containsMask(UserInfoType.BASIC_INFO)) { packet.writeH(16 + (_player.getAppearance().getVisibleName().length() * 2)); packet.writeString(_player.getName()); - packet.writeC(_player.isGM() ? 0x01 : 0x00); + packet.writeC(_player.isGM() ? 1 : 0); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } - if (containsMask(UserInfoType.BASE_STATS)) { packet.writeH(18); @@ -169,7 +163,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getLUC()); packet.writeH(_player.getCHA()); } - if (containsMask(UserInfoType.MAX_HPCPMP)) { packet.writeH(14); @@ -177,7 +170,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMaxMp()); packet.writeD(_player.getMaxCp()); } - if (containsMask(UserInfoType.CURRENT_HPMPCP_EXP_SP)) { packet.writeH(38); @@ -188,23 +180,20 @@ public class UserInfo extends AbstractMaskPacket packet.writeQ(_player.getExp()); packet.writeF((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel()))); } - if (containsMask(UserInfoType.ENCHANTLEVEL)) { packet.writeH(4); packet.writeC(_enchantLevel); packet.writeC(_armorEnchant); } - if (containsMask(UserInfoType.APPAREANCE)) { packet.writeH(15); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); } - if (containsMask(UserInfoType.STATUS)) { packet.writeH(6); @@ -213,7 +202,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.hasDwarvenCraft() || (_player.getSkillLevel(248) > 0) ? 1 : 0); packet.writeC(_player.getAbilityPointsUsed()); } - if (containsMask(UserInfoType.STATS)) { packet.writeH(56); @@ -232,7 +220,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); } - if (containsMask(UserInfoType.ELEMENTALS)) { packet.writeH(14); @@ -243,7 +230,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getDefenseElementValue(AttributeType.HOLY)); packet.writeH(_player.getDefenseElementValue(AttributeType.DARK)); } - if (containsMask(UserInfoType.POSITION)) { packet.writeH(18); @@ -252,7 +238,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getZ()); packet.writeD(_player.isInVehicle() ? _player.getVehicle().getObjectId() : 0); } - if (containsMask(UserInfoType.SPEED)) { packet.writeH(18); @@ -265,21 +250,18 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_flyRunSpd); packet.writeH(_flyWalkSpd); } - if (containsMask(UserInfoType.MULTIPLIER)) { packet.writeH(18); packet.writeF(_moveMultiplier); packet.writeF(_player.getAttackSpeedMultiplier()); } - if (containsMask(UserInfoType.COL_RADIUS_HEIGHT)) { packet.writeH(18); packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); } - if (containsMask(UserInfoType.ATK_ELEMENTAL)) { packet.writeH(5); @@ -287,7 +269,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); } - if (containsMask(UserInfoType.CLAN)) { packet.writeH(32 + (_title.length() * 2)); @@ -297,18 +278,17 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getClanCrestLargeId()); packet.writeD(_player.getClanCrestId()); packet.writeD(_player.getClanPrivileges().getBitmask()); - packet.writeC(_player.isClanLeader() ? 0x01 : 0x00); + packet.writeC(_player.isClanLeader() ? 1 : 0); packet.writeD(_player.getAllyId()); packet.writeD(_player.getAllyCrestId()); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); } - if (containsMask(UserInfoType.SOCIAL)) { packet.writeH(22); packet.writeC(_player.getPvpFlag()); packet.writeD(_player.getReputation()); // Reputation - packet.writeC(_player.isNoble() ? 0x01 : 0x00); + packet.writeC(_player.isNoble() ? 1 : 0); packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 1 : 0); packet.writeC(_player.getPledgeClass()); packet.writeD(_player.getPkKills()); @@ -316,59 +296,52 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); } - if (containsMask(UserInfoType.VITA_FAME)) { packet.writeH(15); packet.writeD(_player.getVitalityPoints()); - packet.writeC(0x00); // Vita Bonus + packet.writeC(0); // Vita Bonus packet.writeD(_player.getFame()); packet.writeD(_player.getRaidbossPoints()); } - if (containsMask(UserInfoType.SLOTS)) { packet.writeH(9); packet.writeC(_player.getInventory().getTalismanSlots()); // Confirmed packet.writeC(_player.getInventory().getBroochJewelSlots()); // Confirmed packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeC(0x00); // (1 = Red, 2 = White, 3 = White Pink) dotted ring on the floor - packet.writeC(0x00); - packet.writeC(0x00); - packet.writeC(0x00); + packet.writeC(0); // (1 = Red, 2 = White, 3 = White Pink) dotted ring on the floor + packet.writeC(0); + packet.writeC(0); + packet.writeC(0); } - if (containsMask(UserInfoType.MOVEMENTS)) { packet.writeH(4); packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); - packet.writeC(_player.isRunning() ? 0x01 : 0x00); + packet.writeC(_player.isRunning() ? 1 : 0); } - if (containsMask(UserInfoType.COLOR)) { packet.writeH(10); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); } - if (containsMask(UserInfoType.INVENTORY_LIMIT)) { packet.writeH(9); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); packet.writeH(_player.getInventoryLimit()); packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); } - if (containsMask(UserInfoType.TRUE_HERO)) { packet.writeH(9); - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeC(_player.isTrueHero() ? 100 : 0x00); + packet.writeD(0); + packet.writeH(0); + packet.writeC(_player.isTrueHero() ? 100 : 0); } - return true; } @@ -385,7 +358,6 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x10; // Party leader } } - if (clan != null) { relation |= 0x20; // Clan member @@ -394,12 +366,10 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x40; // Clan leader } } - if (player.isInSiege()) { relation |= 0x80; // In siege } - return relation; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java index 283bcf1614..90c416726a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java @@ -36,7 +36,6 @@ public class ValidateLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java index 4d8f9683d0..83f72bf981 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java @@ -40,7 +40,6 @@ public class ValidateLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java index b684e70bdc..71367cd26d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java @@ -36,7 +36,6 @@ public class VehicleCheckLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_CHECK_LOCATION.writeId(packet); - packet.writeD(_boat.getObjectId()); packet.writeD(_boat.getX()); packet.writeD(_boat.getY()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java index a4a5780f30..5b565c08b7 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java @@ -46,7 +46,6 @@ public class VehicleDeparture implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_DEPARTURE.writeId(packet); - packet.writeD(_objId); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java index ec611028bf..4a995a6352 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java @@ -44,7 +44,6 @@ public class VehicleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java index 207a6fd899..bf629dcbbc 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java @@ -42,7 +42,6 @@ public class VehicleStarted implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_START.writeId(packet); - packet.writeD(_objectId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 455305ce79..76b391afc6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -30,6 +30,7 @@ public class WareHouseDepositList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; public static final int FREIGHT = 1; + private final long _playerAdena; private final int _warehouseSize; private final List _items = new ArrayList<>(); @@ -49,7 +50,6 @@ public class WareHouseDepositList extends AbstractItemPacket _whType = type; _playerAdena = player.getAdena(); _warehouseSize = player.getActiveWarehouse() != null ? player.getActiveWarehouse().getSize() : 0; - final boolean isPrivate = _whType == PRIVATE; for (Item temp : player.getInventory().getAvailableItems(true, isPrivate, false)) { @@ -68,19 +68,15 @@ public class WareHouseDepositList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.WAREHOUSE_DEPOSIT_LIST.writeId(packet); - packet.writeH(_whType); packet.writeQ(_playerAdena); packet.writeD(_warehouseSize); packet.writeH(_itemsStackable.size()); - for (int itemId : _itemsStackable) { packet.writeD(itemId); } - packet.writeH(_items.size()); - for (Item item : _items) { writeItem(packet, item); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 6f57005e47..785f0a0849 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -32,6 +32,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private Player _player; private long _playerAdena; private final int _invSize; @@ -58,7 +59,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } - _items = _player.getActiveWarehouse().getItems(); for (Item item : _items) { @@ -73,7 +73,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.WAREHOUSE_WITHDRAW_LIST.writeId(packet); - packet.writeH(_whType); packet.writeQ(_playerAdena); packet.writeH(_items.size()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java index 7917a7840d..a82a684a35 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java @@ -62,7 +62,6 @@ public class ExAcquireAPSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_AP_SKILL_LIST.writeId(packet); - packet.writeD(_enable ? 1 : 0); packet.writeQ(Config.ABILITY_POINTS_RESET_ADENA); packet.writeQ(_price); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java index f9af89e4db..ff296bf632 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java @@ -35,7 +35,6 @@ public class ExCloseAPListWnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_AP_LIST_WND.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java index d72baf2a44..69c47ce99f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java @@ -35,7 +35,6 @@ public class ExShowAPListWnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AP_LIST_WND.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java index 5f2dd05f3b..aea1476fb2 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java @@ -35,8 +35,7 @@ public class ExDivideAdenaCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_CANCEL.writeId(packet); - - packet.writeC(0x00); // TODO: Find me + packet.writeC(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java index 6af912cebf..de4e955aba 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java @@ -46,9 +46,8 @@ public class ExDivideAdenaDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_DONE.writeId(packet); - - packet.writeC(_isPartyLeader ? 0x01 : 0x00); - packet.writeC(_isCCLeader ? 0x01 : 0x00); + packet.writeC(_isPartyLeader ? 1 : 0); + packet.writeC(_isCCLeader ? 1 : 0); packet.writeD(_memberCount); packet.writeQ(_distributedAdenaCount); packet.writeQ(_adenaCount); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java index ab8a7471d6..32f99abfdc 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java @@ -38,8 +38,7 @@ public class ExAlchemyConversion implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_CONVERSION.writeId(packet); - - packet.writeC((_successCount == 0) && (_failureCount == 0) ? 0x01 : 0x00); + packet.writeC((_successCount == 0) && (_failureCount == 0) ? 1 : 0); packet.writeD(_successCount); packet.writeD(_failureCount); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java index be4a2a57e6..cb3cf4b3e0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java @@ -47,7 +47,6 @@ public class ExTryMixCube implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TRY_MIX_CUBE.writeId(packet); - packet.writeC(_type.ordinal()); packet.writeD(_items.size()); for (AlchemyResult holder : _items) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index 549def456e..84b5fead76 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -43,7 +43,6 @@ public class ExChooseShapeShiftingItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_SHAPE_SHIFTING_ITEM.writeId(packet); - packet.writeD(_targetType != null ? _targetType.ordinal() : 0); packet.writeD(_type != null ? _type.ordinal() : 0); packet.writeD(_itemId); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java index 33fb439aa5..ba55887a1a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java @@ -45,7 +45,6 @@ public class ExCuriousHouseMemberUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_UPDATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_maxHp); packet.writeD(_maxCp); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java index 8ad3659725..be2d29d864 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPacket { - public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0x00); - public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(0x01); + public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0); + public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(1); private final int _result; @@ -39,7 +39,6 @@ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPa public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_EXTRACTION_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java index ec82cc14f3..e84d7a7255 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; public static final ExPutShapeShiftingTargetItemResult FAILED = new ExPutShapeShiftingTargetItemResult(RESULT_FAILED, 0); @@ -43,7 +43,6 @@ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_resultId); packet.writeQ(_price); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java index f4d3118cc4..038eae0042 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExShapeShiftingResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; - public static final int RESULT_CLOSE = 0x02; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; + public static final int RESULT_CLOSE = 2; public static final ExShapeShiftingResult FAILED = new ExShapeShiftingResult(RESULT_FAILED, 0, 0); public static final ExShapeShiftingResult CLOSE = new ExShapeShiftingResult(RESULT_CLOSE, 0, 0); @@ -47,7 +47,6 @@ public class ExShapeShiftingResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHAPE_SHIFTING_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_targetItemId); packet.writeD(_extractItemId); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java index 7f1d6d60d1..73f93335ef 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java @@ -43,7 +43,6 @@ public class ExCuriousHouseMemberList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_LIST.writeId(packet); - packet.writeD(_id); packet.writeD(_maxPlayers); packet.writeD(_players.size()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java index b71caa5f14..5d9b34db61 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java @@ -37,7 +37,6 @@ public class ExCuriousHouseRemainTime implements IClientOutgoingPacket { OutgoingPackets.EX_CURIOUS_HOUSE_REMAIN_TIME.writeId(packet); packet.writeD(_time); - return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java index 0a1edc0085..b98d6d260e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java @@ -39,7 +39,6 @@ public class ExResponseCommissionBuyInfo extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_INFO.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java index ddfa8b6db1..c1d29735b8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java @@ -40,7 +40,6 @@ public class ExResponseCommissionBuyItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_ITEM.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java index aa4bbbde24..01e4782408 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java @@ -39,7 +39,6 @@ public class ExResponseCommissionDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_DELETE.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java index e7e3c39816..b915574175 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java @@ -55,7 +55,6 @@ public class ExResponseCommissionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_INFO.writeId(packet); - packet.writeD(_result); packet.writeD(_itemId); packet.writeQ(_presetPricePerUnit); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 876a24c7ad..89000dd57f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -39,7 +39,6 @@ public class ExResponseCommissionItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_ITEM_LIST.writeId(packet); - packet.writeD(_items.size()); for (Item itemInstance : _items) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java index df72e96d20..c170b03d29 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java @@ -64,7 +64,6 @@ public class ExResponseCommissionList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_LIST.writeId(packet); - packet.writeD(_replyType.getClientId()); switch (_replyType) { @@ -73,13 +72,11 @@ public class ExResponseCommissionList extends AbstractItemPacket { packet.writeD((int) Instant.now().getEpochSecond()); packet.writeD(_chunkId); - int chunkSize = _items.size() - _listIndexStart; if (chunkSize > MAX_CHUNK_SIZE) { chunkSize = MAX_CHUNK_SIZE; } - packet.writeD(chunkSize); for (int i = _listIndexStart; i < (_listIndexStart + chunkSize); i++) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java index b1b0a97d7a..183547af06 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java @@ -39,7 +39,6 @@ public class ExResponseCommissionRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_REGISTER.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java index 74d8a95587..b68386e4ed 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java @@ -35,8 +35,7 @@ public class ExShowCommission implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_COMMISSION.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java index 0c267ecf34..11b1ff1e0a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExEnchantFail implements IClientOutgoingPacket { public static final ExEnchantFail STATIC_PACKET = new ExEnchantFail(0, 0); + private final int _itemOne; private final int _itemTwo; @@ -39,7 +40,6 @@ public class ExEnchantFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_FAIL.writeId(packet); - packet.writeD(_itemOne); packet.writeD(_itemTwo); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java index 71ba811ed5..87d29a8e7c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java @@ -36,7 +36,6 @@ public class ExEnchantSucess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SUCESS.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java index eb4eb8b26c..ec67d50fb6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java @@ -39,7 +39,6 @@ public class ExGetCrystalizingEstimation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - packet.writeD(_items.size()); for (ItemChanceHolder holder : _items) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java index fa605b548a..a99ad7f4e3 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java @@ -52,7 +52,7 @@ public class ExFishingStart implements IClientOutgoingPacket packet.writeD(_baitLocation.getX()); packet.writeD(_baitLocation.getY()); packet.writeD(_baitLocation.getZ()); - packet.writeC(0x01); // 0 = newbie, 1 = normal, 2 = night + packet.writeC(1); // 0 = newbie, 1 = normal, 2 = night return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java index 046ad04cb6..74501fe7ff 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java @@ -49,7 +49,6 @@ public class ExUserInfoFishing implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_FISHING.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_isFishing ? 1 : 0); if (_baitLocation == null) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index dc0e3e05bc..336a384bcc 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -47,9 +47,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FRIEND_DETAIL_INFO.writeId(packet); - packet.writeD(_objectId); - if (_friend == null) { packet.writeS(_name); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java index b0dd65f095..8d11b92606 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java @@ -33,7 +33,6 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java index 9add9c9caa..d24139644c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java @@ -49,7 +49,6 @@ public class FriendAddRequestResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_charId); packet.writeS(_charName); @@ -57,7 +56,7 @@ public class FriendAddRequestResult implements IClientOutgoingPacket packet.writeD(_charObjectId); packet.writeD(_charLevel); packet.writeD(_charClassId); - packet.writeH(0x00); // Always 0 on retail + packet.writeH(0); // Always 0 on retail return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java index a135944662..13a7d01967 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java @@ -86,12 +86,10 @@ public class FriendList implements IClientOutgoingPacket } continue; } - if (player1.isOnline()) { online = true; } - classid = player1.getClassId().getId(); level = player1.getLevel(); _info.add(new FriendInfo(objId, name, online, classid, level)); @@ -102,14 +100,13 @@ public class FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._classid); packet.writeD(info._level); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java index 07c23f9fd2..1bb4142e34 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java @@ -38,7 +38,6 @@ public class FriendRemove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_REMOVE.writeId(packet); - packet.writeD(_responce); packet.writeS(_charName); return true; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java index e8dbddcd63..a3990c0879 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java @@ -52,7 +52,6 @@ public class FriendStatus implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_STATUS.writeId(packet); - packet.writeD(_type); packet.writeS(_name); switch (_type) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java index 8752104e06..78da5850b8 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java @@ -50,7 +50,6 @@ public class L2Friend implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND.writeId(packet); - packet.writeD(_action ? 1 : 3); // 1-add 3-remove packet.writeD(_objid); packet.writeS(_name); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java index b69a253635..e50693cb11 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java @@ -81,17 +81,16 @@ public class L2FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._level); packet.writeD(info._classId); - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java index 677c09091f..706c179a9c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java @@ -37,7 +37,6 @@ public class ExMentorAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_ADD.writeId(packet); - packet.writeS(_mentor.getName()); packet.writeD(_mentor.getActiveClass()); packet.writeD(_mentor.getLevel()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java index 4722a9cab3..18c1cdeedf 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java @@ -64,9 +64,8 @@ public class ExMentorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_LIST.writeId(packet); - packet.writeD(_type); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mentees.size()); for (Mentee mentee : _mentees) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java index d739dd94b7..2283920b98 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ListMenteeWaiting implements IClientOutgoingPacket { private static final int PLAYERS_PER_PAGE = 64; + private final List _possibleCandiates = new ArrayList<>(); private final int _page; @@ -51,18 +52,15 @@ public class ListMenteeWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_MENTEE_WAITING.writeId(packet); - - packet.writeD(0x01); // always 1 in retail + packet.writeD(1); // always 1 in retail if (_possibleCandiates.isEmpty()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } - packet.writeD(_possibleCandiates.size()); packet.writeD(_possibleCandiates.size() % PLAYERS_PER_PAGE); - for (Player player : _possibleCandiates) { if ((1 <= (PLAYERS_PER_PAGE * _page)) && (1 > (PLAYERS_PER_PAGE * (_page - 1)))) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index fb735b8925..e75426e598 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -69,7 +69,6 @@ public class ExBRBuyProduct implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUY_PRODUCT.writeId(packet); - packet.writeD(_reply); return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java index 742b3eba9d..91a186b81d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java @@ -39,10 +39,9 @@ public class ExBRGamePoint implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_GAME_POINT.writeId(packet); - packet.writeD(_charId); packet.writeQ(_charPoints); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java index 50f21df46a..e36f2ff502 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java @@ -45,7 +45,6 @@ public class ExBRProductInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_INFO.writeId(packet); - packet.writeD(_item.getBrId()); packet.writeD(_item.getPrice()); packet.writeD(_item.getItems().size()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java index dc851ffd43..0f042ba043 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java @@ -45,9 +45,8 @@ public class ExBRProductList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); // Adena - packet.writeQ(0x00); // Hero coins + packet.writeQ(0); // Hero coins packet.writeC(_type); // Type 0 - Home, 1 - History, 2 - Favorites packet.writeD(_primeList.size()); for (PrimeShopGroup brItem : _primeList) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java index 2463589c81..c09b3e899d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java @@ -47,18 +47,15 @@ public class ExFlyMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_mapId); - packet.writeD(_locations.size()); for (SayuneEntry loc : _locations) { packet.writeD(loc.getId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(loc.getX()); packet.writeD(loc.getY()); packet.writeD(loc.getZ()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java index 03fc6b580d..70b3fb25d2 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java @@ -47,16 +47,13 @@ public class ExFlyMoveBroadcast implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE_BROADCAST.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); packet.writeD(_mapId); - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD(_currentLoc.getX()); packet.writeD(_currentLoc.getY()); packet.writeD(_currentLoc.getZ()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java index cfe11a27e0..49e5d86910 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java @@ -35,7 +35,6 @@ public class ExNotifyFlyMoveStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_FLY_MOVE_START.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java index d5640a47ef..0efa37ae8c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java @@ -51,7 +51,6 @@ public class ExMoveToLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_SUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_targetX); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java index 0cbe2c3e02..a0314c39aa 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java @@ -46,7 +46,6 @@ public class ExShuttleGetOff implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_OFF.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_x); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java index 5211bef5ba..061bcafed9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java @@ -43,7 +43,6 @@ public class ExShuttleGetOn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_ON.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java index 97d54a9019..c8aee1fde7 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java @@ -43,7 +43,6 @@ public class ExShuttleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHUTTLE_INFO.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD(_shuttle.getX()); packet.writeD(_shuttle.getY()); @@ -60,8 +59,8 @@ public class ExShuttleInfo implements IClientOutgoingPacket packet.writeD(loc.getY()); packet.writeD(loc.getZ()); } - packet.writeD(stop.isDoorOpen() ? 0x01 : 0x00); - packet.writeD(stop.hasDoorChanged() ? 0x01 : 0x00); + packet.writeD(stop.isDoorOpen() ? 1 : 0); + packet.writeD(stop.hasDoorChanged() ? 1 : 0); } return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java index 6ba38f29a1..28b33b998e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java @@ -43,7 +43,6 @@ public class ExShuttleMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_MOVE.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD((int) _shuttle.getStat().getMoveSpeed()); packet.writeD((int) _shuttle.getStat().getRotationSpeed()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java index bf2b6ea6eb..6c31189d6a 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java @@ -44,7 +44,6 @@ public class ExStopMoveInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_SHUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java index f7f6849732..8492f42a6e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java @@ -44,7 +44,6 @@ public class ExValidateLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_SHUTTLE.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java index 1d59c6d002..e7654ed911 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java @@ -60,7 +60,7 @@ public class AccountKicked implements IOutgoingPacket { OutgoingPackets.ACCOUNT_KICKED.writeId(packet); packet.writeD(_reason.getCode()); - return true; } } + diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 2e3a1f6163..1fe813e393 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: response + * Format: d d: response */ public class GGAuth implements IOutgoingPacket { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/network/serverpackets/Init.java index 4b3f71f30e..d725f45ca2 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/network/serverpackets/Init.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/network/serverpackets/Init.java @@ -52,7 +52,6 @@ public class Init implements IOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.INIT.writeId(packet); - packet.writeD(_sessionId); // session id packet.writeD(0x0000c621); // protocol revision diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index 8c534554a8..f4dcd22b00 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: the failure reason + * Format: d d: the failure reason */ public class LoginFail implements IOutgoingPacket { diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index c700328f3d..f8b05abb47 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -529,7 +529,7 @@ public class Lindvior extends AbstractNpcAI for (Location loc : CONTROL_GENERATOR_SPAWNS) { guard = (FriendlyNpc) addSpawn(NPC_GENERATOR, loc, true); - guard.setDisplayEffect(0x01); + guard.setDisplayEffect(1); guard.setScriptValue(i++); _generatorSpawn.add(guard); } @@ -685,7 +685,7 @@ public class Lindvior extends AbstractNpcAI if (!hasFlag(_activeMask, 1 << index)) { _activeMask |= 1 << index; - npc.setDisplayEffect(0x02); + npc.setDisplayEffect(2); sendEventTrigger(true, GENERATOR_TRIGERS[index]); _zoneLair.getPlayersInside().stream().forEach(p -> p.broadcastPacket(new Earthquake(p.getX(), p.getY(), p.getZ(), 20, 10))); if (hasFlag(_activeMask, 0xf)) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/BaseRecievePacket.java index c682cb741d..a6ed15ce32 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/BaseRecievePacket.java @@ -73,7 +73,7 @@ public abstract class BaseRecievePacket try { result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE); - result = result.substring(0, result.indexOf(0x00)); + result = result.substring(0, result.indexOf(0)); _off += (result.length() * 2) + 2; } catch (Exception e) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/BaseSendablePacket.java index a9d918de4c..8fa8491cbf 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/commons/network/BaseSendablePacket.java @@ -117,16 +117,16 @@ public abstract class BaseSendablePacket public byte[] getBytes() { // if (this instanceof Init) - // writeD(0x00); // reserve for XOR initial key + // writeD(0); // reserve for XOR initial key - writeD(0x00); // reserve for checksum + writeD(0); // reserve for checksum final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++) { - writeC(0x00); + writeC(0); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/AttackType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/AttackType.java index 6064b10ed7..e9983f15e3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/AttackType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/AttackType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum AttackType { - MISSED(0x01), - BLOCKED(0x02), - CRITICAL(0x04), - SHOT_USED(0x08); + MISSED(1), + BLOCKED(2), + CRITICAL(4), + SHOT_USED(8); private final int _mask; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/GroupType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/GroupType.java index 954aaace8b..916a14fd05 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/GroupType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/GroupType.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum GroupType implements IUpdateTypeComponent { - NONE(0x01), - PARTY(0x02), - COMMAND_CHANNEL(0x04); + NONE(1), + PARTY(2), + COMMAND_CHANNEL(4); private int _mask; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/ItemListType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/ItemListType.java index 2d38c8f5b1..c80234439f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/ItemListType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/ItemListType.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum ItemListType implements IUpdateTypeComponent { - AUGMENT_BONUS(0x01), - ELEMENTAL_ATTRIBUTE(0x02), - ENCHANT_EFFECT(0x04), - VISUAL_ID(0x08), - SOUL_CRYSTAL(0x10); + AUGMENT_BONUS(1), + ELEMENTAL_ATTRIBUTE(2), + ENCHANT_EFFECT(4), + VISUAL_ID(8), + SOUL_CRYSTAL(16); private final int _mask; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java index b3d08596c6..29403b783d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum MacroUpdateType { - ADD(0x01), - LIST(0x01), - MODIFY(0x02), - DELETE(0x00); + ADD(1), + LIST(1), + MODIFY(2), + DELETE(0); private final int _id; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java index 86c6159869..7776721c0f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java @@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum PartySmallWindowUpdateType implements IUpdateTypeComponent { - CURRENT_CP(0x01), - MAX_CP(0x02), - CURRENT_HP(0x04), - MAX_HP(0x08), - CURRENT_MP(0x10), - MAX_MP(0x20), - LEVEL(0x40), - CLASS_ID(0x80), - PARTY_SUBSTITUTE(0x100), - VITALITY_POINTS(0x200); + CURRENT_CP(1), + MAX_CP(2), + CURRENT_HP(4), + MAX_HP(8), + CURRENT_MP(16), + MAX_MP(32), + LEVEL(64), + CLASS_ID(128), + PARTY_SUBSTITUTE(256), + VITALITY_POINTS(512); private final int _mask; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 00bb331778..667ce7f17c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.Broadcast; import org.l2jmobius.gameserver.util.Util; /** - * Fromat:(ch) dddddc + * Format:(ch) dddddc * @author -Wooden- */ public class RequestExMagicSkillUseGround implements IClientIncomingPacket diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java index ec60042793..6054868de7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java @@ -39,7 +39,6 @@ public class AbnormalStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ABNORMAL_STATUS_UPDATE.writeId(packet); - packet.writeH(_effects.size()); for (BuffInfo info : _effects) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 1b8ddb2042..bec794bef3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -44,7 +44,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; } @@ -60,7 +59,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; setHtml(html); } @@ -77,13 +75,11 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } - if (!html.contains(""; return; } - _html = html; } @@ -96,7 +92,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } - setHtml(content); return true; } @@ -138,12 +133,10 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { player.clearHtmlActions(getScope()); } - if (_disabledValidation) { return; } - if (player != null) { Util.buildHtmlActionCache(player, getScope(), _npcObjId, _html); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 049207d876..8f4218dbc8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -73,7 +73,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket= 0) || (item.getAttributeDefence(AttributeType.FIRE) > 0) || (item.getAttributeDefence(AttributeType.WATER) > 0) || (item.getAttributeDefence(AttributeType.WIND) > 0) || (item.getAttributeDefence(AttributeType.EARTH) > 0) || (item.getAttributeDefence(AttributeType.HOLY) > 0) || (item.getAttributeDefence(AttributeType.DARK) > 0)) { mask |= ItemListType.ELEMENTAL_ATTRIBUTE.getMask(); } - if (item.getEnchantOptions() != null) { for (int id : item.getEnchantOptions()) @@ -144,17 +142,14 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket 0) { mask |= ItemListType.VISUAL_ID.getMask(); } - if (((item.getSoulCrystalOptions() != null) && !item.getSoulCrystalOptions().isEmpty()) || ((item.getSoulCrystalSpecialOptions() != null) && !item.getSoulCrystalSpecialOptions().isEmpty())) { mask |= ItemListType.SOUL_CRYSTAL.getMask(); } - return mask; } @@ -222,7 +217,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); packet.writeC(removeSkills.size()); for (Skill removed : removeSkills) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java index 8fa6259f64..6451dffd02 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ActionFailed implements IClientOutgoingPacket { public static final ActionFailed STATIC_PACKET = new ActionFailed(); - private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); + private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); static { for (SkillCastingType castingType : SkillCastingType.values()) @@ -57,7 +57,6 @@ public class ActionFailed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ACTION_FAIL.writeId(packet); - packet.writeD(_castingType); // MagicSkillUse castingType return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java index 6e868368c9..30ce58da60 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java @@ -44,9 +44,8 @@ public class AgitDecoInfo implements IClientOutgoingPacket { continue; } - packet.writeC(_residense.hasFunction(type) ? 0x01 : 0x00); + packet.writeC(_residense.hasFunction(type) ? 1 : 0); } - // Unknown packet.writeD(0); // TODO: Find me! packet.writeD(0); // TODO: Find me! diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java index 6cb71fc985..4683fb30f0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java @@ -44,7 +44,6 @@ public class AllianceInfo implements IClientOutgoingPacket _name = leader.getAllyName(); _leaderC = leader.getName(); _leaderP = leader.getLeaderName(); - final Collection allies = ClanTable.getInstance().getClanAllies(allianceId); _allies = new ClanInfo[allies.size()]; int idx = 0; @@ -57,7 +56,6 @@ public class AllianceInfo implements IClientOutgoingPacket total += ci.getTotal(); online += ci.getOnline(); } - _total = total; _online = online; } @@ -66,18 +64,16 @@ public class AllianceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_INFO.writeId(packet); - packet.writeS(_name); packet.writeD(_total); packet.writeD(_online); packet.writeS(_leaderC); packet.writeS(_leaderP); - packet.writeD(_allies.length); for (ClanInfo aci : _allies) { packet.writeS(aci.getClan().getName()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(aci.getClan().getLevel()); packet.writeS(aci.getClan().getLeaderName()); packet.writeD(aci.getTotal()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java index f9d08f6600..186fd12e81 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java @@ -44,7 +44,6 @@ public class AllyCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java index 6218f1717f..1ae4653f91 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java @@ -38,7 +38,6 @@ public class AskJoinAlly implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_ALLIANCE.writeId(packet); - packet.writeD(_requestorObjId); packet.writeS(null); // Ally Name ? packet.writeS(null); // TODO: Find me! diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java index a66bb3cd33..b9cfbe81b9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java @@ -39,7 +39,6 @@ public class AskJoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_PARTY.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 05c420ff59..227ab571be 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -45,7 +45,6 @@ public class Attack implements IClientOutgoingPacket _attackerObjId = attacker.getObjectId(); _attackerLoc = new Location(attacker); _targetLoc = new Location(target); - final Player player = attacker.getActingPlayer(); if (player == null) { @@ -111,7 +110,6 @@ public class Attack implements IClientOutgoingPacket final Iterator it = _hits.iterator(); final Hit firstHit = it.next(); OutgoingPackets.ATTACK.writeId(packet); - packet.writeD(_attackerObjId); packet.writeD(firstHit.getTargetId()); packet.writeD(_soulshotVisualSubstitute); // Ertheia @@ -121,13 +119,11 @@ public class Attack implements IClientOutgoingPacket packet.writeD(_attackerLoc.getX()); packet.writeD(_attackerLoc.getY()); packet.writeD(_attackerLoc.getZ()); - packet.writeH(_hits.size() - 1); while (it.hasNext()) { writeHit(packet, it.next()); } - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java index bd6878eb42..8b85fe85e3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java @@ -35,7 +35,6 @@ public class AutoAttackStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_START.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java index e767d1877a..a294b1e212 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java @@ -35,7 +35,6 @@ public class AutoAttackStop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_STOP.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java index 3f329415df..0c79677eae 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java @@ -38,7 +38,6 @@ public class BlockListPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BLOCK_LIST.writeId(packet); - packet.writeD(_playersId.size()); for (int playerId : _playersId) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index f610cdc6aa..d95f0543b9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -45,8 +45,7 @@ public class BuyList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x00); // Type BUY + packet.writeD(0); // Type BUY packet.writeQ(_money); // current money packet.writeD(_listId); packet.writeD(_inventorySlots); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index cd25af908d..7cb2bf4425 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -50,36 +50,34 @@ public class BuyListSeed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BUY_LIST_SEED.writeId(packet); - packet.writeQ(_money); // current money - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeD(_manorId); // manor id - if (!_list.isEmpty()) { packet.writeH(_list.size()); // list length for (SeedProduction s : _list) { - packet.writeC(0x00); // mask item 0 to print minimal item information + packet.writeC(0); // mask item 0 to print minimal item information packet.writeD(s.getId()); // ObjectId packet.writeD(s.getId()); // ItemId packet.writeC(0xFF); // T1 packet.writeQ(s.getAmount()); // Quantity - packet.writeC(0x05); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item - packet.writeC(0x00); // Filler (always 0) - packet.writeH(0x00); // Equipped : 00-No, 01-yes - packet.writeQ(0x00); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand - packet.writeH(0x00); // Enchant level (pet level shown in control item) + packet.writeC(5); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item + packet.writeC(0); // Filler (always 0) + packet.writeH(0); // Equipped : 00-No, 01-yes + packet.writeQ(0); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand + packet.writeH(0); // Enchant level (pet level shown in control item) packet.writeD(-1); packet.writeD(-9999); - packet.writeC(0x01); // GOD Item enabled = 1 disabled (red) = 0 + packet.writeC(1); // GOD Item enabled = 1 disabled (red) = 0 packet.writeQ(s.getPrice()); // price } _list.clear(); } else { - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java index 3a7b67af23..f3dc872dca 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java @@ -32,8 +32,7 @@ public class CSShowComBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - - packet.writeC(0x01); // c4 1 to show community 00 to hide + packet.writeC(1); // c4 1 to show community 00 to hide packet.writeB(_html); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java index eacc27aa07..b18dac4cc3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java @@ -36,7 +36,6 @@ public class CameraMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CAMERA_MODE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java index 1682f5bc62..adea754676 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java @@ -39,7 +39,6 @@ public class ChairSit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAIR_SIT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_staticObjectId); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java index 2bc31a285a..de141fa067 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java @@ -38,7 +38,6 @@ public class ChangeMoveType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_MOVE_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_running ? RUN : WALK); packet.writeD(0); // c2 diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index 73277d923d..fbe5e39e2e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -22,17 +22,17 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ChangeWaitType implements IClientOutgoingPacket { + public static final int WT_SITTING = 0; + public static final int WT_STANDING = 1; + public static final int WT_START_FAKEDEATH = 2; + public static final int WT_STOP_FAKEDEATH = 3; + private final int _objectId; private final int _moveType; private final int _x; private final int _y; private final int _z; - public static final int WT_SITTING = 0; - public static final int WT_STANDING = 1; - public static final int WT_START_FAKEDEATH = 2; - public static final int WT_STOP_FAKEDEATH = 3; - public ChangeWaitType(Creature creature, int newMoveType) { _objectId = creature.getObjectId(); @@ -46,7 +46,6 @@ public class ChangeWaitType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_WAIT_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_moveType); packet.writeD(_x); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index 41180bac50..aa2e7b2eaa 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -30,7 +30,6 @@ public class CharCreateFail implements IClientOutgoingPacket public static final int REASON_CREATE_NOT_ALLOWED = 0x05; // "Characters cannot be created from this server." public static final int REASON_CHOOSE_ANOTHER_SVR = 0x06; // "Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please // choose another server." - private final int _error; public CharCreateFail(int errorCode) @@ -42,7 +41,6 @@ public class CharCreateFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index f0e99885ad..768617e558 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -31,8 +31,7 @@ public class CharCreateOk implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_SUCCESS.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index bed289ca0a..1674eef343 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -33,7 +33,6 @@ public class CharDeleteFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_DELETE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 778ffbd3c3..29bb97c681 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -33,6 +33,22 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { + private static final int[] PAPERDOLL_ORDER = new int[] + { + Inventory.PAPERDOLL_UNDER, + Inventory.PAPERDOLL_HEAD, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_LHAND, + Inventory.PAPERDOLL_GLOVES, + Inventory.PAPERDOLL_CHEST, + Inventory.PAPERDOLL_LEGS, + Inventory.PAPERDOLL_FEET, + Inventory.PAPERDOLL_CLOAK, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_HAIR, + Inventory.PAPERDOLL_HAIR2 + }; + private final Player _player; private final Clan _clan; private int _objId; @@ -55,22 +71,6 @@ public class CharInfo implements IClientOutgoingPacket private int _vehicleId = 0; private final boolean _gmSeeInvis; - private static final int[] PAPERDOLL_ORDER = new int[] - { - Inventory.PAPERDOLL_UNDER, - Inventory.PAPERDOLL_HEAD, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_LHAND, - Inventory.PAPERDOLL_GLOVES, - Inventory.PAPERDOLL_CHEST, - Inventory.PAPERDOLL_LEGS, - Inventory.PAPERDOLL_FEET, - Inventory.PAPERDOLL_CLOAK, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_HAIR, - Inventory.PAPERDOLL_HAIR2 - }; - public CharInfo(Player player, boolean gmSeeInvis) { _player = player; @@ -125,9 +125,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_vehicleId); // Confirmed packet.writeD(_objId); // Confirmed packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed - packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) @@ -151,10 +150,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.getPvpFlag()); packet.writeD(_player.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -165,53 +162,40 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); - packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeS(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle()); - packet.writeD(_player.getAppearance().getVisibleClanId()); packet.writeD(_player.getAppearance().getVisibleClanCrestId()); packet.writeD(_player.getAppearance().getVisibleAllyId()); packet.writeD(_player.getAppearance().getVisibleAllyCrestId()); - - packet.writeC(_player.isSitting() ? 0x00 : 0x01); // Confirmed - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // Confirmed - packet.writeC(_player.isInCombat() ? 0x01 : 0x00); // Confirmed - - packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 0x01 : 0x00); // Confirmed - - packet.writeC(_player.isInvisible() ? 0x01 : 0x00); - + packet.writeC(_player.isSitting() ? 0 : 1); // Confirmed + packet.writeC(_player.isRunning() ? 1 : 0); // Confirmed + packet.writeC(_player.isInCombat() ? 1 : 0); // Confirmed + packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 1 : 0); // Confirmed + packet.writeC(_player.isInvisible() ? 1 : 0); packet.writeC(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount packet.writeC(_player.getPrivateStoreType().getId()); // Confirmed packet.writeH(_player.getCubics().size()); // Confirmed _player.getCubics().keySet().forEach(packet::writeH); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); // Confirmed packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); packet.writeH(_player.getRecomHave()); // Confirmed packet.writeD(_player.getMountNpcId() == 0 ? 0 : _player.getMountNpcId() + 1000000); - packet.writeD(_player.getClassId().getId()); // Confirmed - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeC(_player.isMounted() ? 0 : _enchantLevel); // Confirmed - packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeD(_player.getClanCrestLargeId()); packet.writeC(_player.getNobleLevel()); // Confirmed packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed - final ILocational baitLocation = _player.getFishing().getBaitLocation(); if (baitLocation != null) { @@ -227,29 +211,21 @@ public class CharInfo implements IClientOutgoingPacket } packet.writeD(_player.getAppearance().getNameColor()); // Confirmed - packet.writeD(_heading); // Confirmed - packet.writeC(_player.getPledgeClass()); packet.writeH(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); // Confirmed - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - - packet.writeC(0x00); // nPvPRestrainStatus - + packet.writeC(0); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentHp())); // Confirmed packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - - packet.writeC(0x00); // cBRLectureMark + packet.writeC(0); // cBRLectureMark final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed @@ -261,8 +237,9 @@ public class CharInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } + packet.writeC(_player.isTrueHero() ? 100 : 0); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); // Hair accessory + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); // Hair accessory packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 7187b73184..11f5f4df52 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -40,17 +40,16 @@ public class CharSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTED.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getTitle()); packet.writeD(_sessionId); packet.writeD(_player.getClanId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x01); // active ?? + packet.writeD(1); // active ?? packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -62,25 +61,20 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_player.getReputation()); packet.writeD(_player.getPkKills()); packet.writeD(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_player.getClassId().getId()); - packet.writeB(new byte[16]); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeB(new byte[28]); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index ef1a9088a3..ea750c697c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -44,10 +44,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { private static final Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); - private final String _loginName; - private final int _sessionId; - private int _activeId; - private final List _characterPackages; private static final int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { @@ -62,6 +58,11 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_HAIR2, }; + private final String _loginName; + private final int _sessionId; + private int _activeId; + private final List _characterPackages; + /** * Constructor for CharSelectionInfo. * @param loginName @@ -92,16 +93,13 @@ public class CharSelectionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.size(); packet.writeD(size); // Created character count - packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) - packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 0x01 : 0x00); // if 1 can't create new char - packet.writeC(0x01); // 0=can't play, 1=can play free until level 85, 2=100% free play - packet.writeD(0x02); // if 1, Korean client - packet.writeC(0x00); // If 1 suggests premium account - + packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 1 : 0); // if 1 can't create new char + packet.writeC(1); // 0=can't play, 1=can play free until level 85, 2=100% free play + packet.writeD(2); // if 1, Korean client + packet.writeC(0); // If 1 suggests premium account long lastAccess = 0; if (_activeId == -1) { @@ -114,7 +112,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - for (int i = 0; i < size; i++) { final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); @@ -122,90 +119,73 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name packet.writeD(_sessionId); // Account ID - packet.writeD(0x00); // Clan ID - packet.writeD(0x00); // Builder level - + packet.writeD(0); // Clan ID + packet.writeD(0); // Builder level packet.writeD(charInfoPackage.getSex()); // Sex packet.writeD(charInfoPackage.getRace()); // Race packet.writeD(charInfoPackage.getBaseClassId()); - - packet.writeD(0x01); // GameServerName - + packet.writeD(1); // GameServerName packet.writeD(charInfoPackage.getX()); packet.writeD(charInfoPackage.getY()); packet.writeD(charInfoPackage.getZ()); packet.writeF(charInfoPackage.getCurrentHp()); packet.writeF(charInfoPackage.getCurrentMp()); - packet.writeQ(charInfoPackage.getSp()); packet.writeQ(charInfoPackage.getExp()); packet.writeF((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel()))); // High // Five packet.writeD(charInfoPackage.getLevel()); - packet.writeD(charInfoPackage.getReputation()); packet.writeD(charInfoPackage.getPkKills()); packet.writeD(charInfoPackage.getPvPKills()); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); // Ertheia - packet.writeD(0x00); // Ertheia - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); // Ertheia + packet.writeD(0); // Ertheia for (int slot : getPaperdollOrder()) { packet.writeD(charInfoPackage.getPaperdollItemId(slot)); } - for (int slot : getPaperdollOrderVisualId()) { packet.writeD(charInfoPackage.getPaperdollItemVisualId(slot)); } - packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_CHEST)); // Upper Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_LEGS)); // Lower Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_HEAD)); // Headgear enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_GLOVES)); // Gloves enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_FEET)); // Boots enchant level - packet.writeD(charInfoPackage.getHairStyle()); packet.writeD(charInfoPackage.getHairColor()); packet.writeD(charInfoPackage.getFace()); - packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); - packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption1Id() : 0); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption2Id() : 0); - // packet.writeD(charInfoPackage.getTransformId()); // Used to display Transformations - packet.writeD(0x00); // Currently on retail when you are on character select you don't see your transformation. - - packet.writeD(0x00); // Pet NpcId - packet.writeD(0x00); // Pet level - packet.writeD(0x00); // Pet Food - packet.writeD(0x00); // Pet Food Level - packet.writeF(0x00); // Current pet HP - packet.writeF(0x00); // Current pet MP - + packet.writeD(0); // Currently on retail when you are on character select you don't see your transformation. + packet.writeD(0); // Pet NpcId + packet.writeD(0); // Pet level + packet.writeD(0); // Pet Food + packet.writeD(0); // Pet Food Level + packet.writeF(0); // Current pet HP + packet.writeF(0); // Current pet MP packet.writeD(charInfoPackage.getVitalityPoints()); // Vitality packet.writeD((int) Config.RATE_VITALITY_EXP_MULTIPLIER * 100); // Vitality Percent packet.writeD(charInfoPackage.getVitalityItemsUsed()); // Remaining vitality item uses - packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0x00 : 0x01); // Char is active or not - packet.writeC(charInfoPackage.isNoble() ? 0x01 : 0x00); - packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 0x01 : 0x00); // Hero glow - packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 0x01 : 0x00); // Show hair accessory if enabled + packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0 : 1); // Char is active or not + packet.writeC(charInfoPackage.isNoble() ? 1 : 0); + packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 1 : 0); // Hero glow + packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 1 : 0); // Show hair accessory if enabled } return true; } @@ -214,7 +194,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); - try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate")) { @@ -227,7 +206,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (charInfopackage != null) { characterList.add(charInfopackage); - final Player player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { @@ -241,7 +219,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return characterList; } @@ -283,7 +260,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { clan.removeClanMember(objectId, 0); } - GameClient.deleteCharByObjId(objectId); return null; } @@ -302,20 +278,16 @@ public class CharSelectionInfo implements IClientOutgoingPacket charInfopackage.setHairStyle(chardata.getInt("hairstyle")); charInfopackage.setHairColor(chardata.getInt("haircolor")); charInfopackage.setSex(chardata.getInt("sex")); - charInfopackage.setExp(chardata.getLong("exp")); charInfopackage.setSp(chardata.getLong("sp")); charInfopackage.setVitalityPoints(chardata.getInt("vitality_points")); charInfopackage.setClanId(chardata.getInt("clanid")); - charInfopackage.setRace(chardata.getInt("race")); - final int baseClassId = chardata.getInt("base_class"); final int activeClassId = chardata.getInt("classid"); charInfopackage.setX(chardata.getInt("x")); charInfopackage.setY(chardata.getInt("y")); charInfopackage.setZ(chardata.getInt("z")); - final int faction = chardata.getInt("faction"); if (faction == 1) { @@ -325,7 +297,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setEvil(); } - if (Config.MULTILANG_ENABLE) { String lang = chardata.getString("language"); @@ -335,22 +306,18 @@ public class CharSelectionInfo implements IClientOutgoingPacket } charInfopackage.setHtmlPrefix("data/lang/" + lang + "/"); } - // if is in subclass, load subclass exp, sp, level info if (baseClassId != activeClassId) { loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId); } - charInfopackage.setClassId(activeClassId); - // Get the augmentation id for equipped weapon int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); if (weaponObjId < 1) { weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); } - if (weaponObjId > 0) { try (Connection con = DatabaseFactory.getConnection(); @@ -376,7 +343,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } - // Check if the base class is set to zero and also doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly. if ((baseClassId == 0) && (activeClassId > 0)) { @@ -386,7 +352,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setBaseClassId(baseClassId); } - charInfopackage.setDeleteTimer(deletetime); charInfopackage.setLastAccess(chardata.getLong("lastAccess")); charInfopackage.setNoble(chardata.getInt("nobless") == 1); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java index 847e24db87..d59df7911a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java @@ -32,7 +32,6 @@ public class ChooseInventoryItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHOOSE_INVENTORY_ITEM.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java index 12a3940521..ac66c2fa0f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java @@ -32,7 +32,6 @@ public class ClientSetTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CLIENT_SET_TIME.writeId(packet); - packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // time in client minutes packet.writeD(6); // constant to match the server time( this determines the speed of the client clock) return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java index f1f37874c8..c748581e7c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java @@ -68,7 +68,6 @@ public class ConfirmDlg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CONFIRM_DLG.writeId(packet); - final SMParam[] params = _systemMessage.getParams(); packet.writeD(_systemMessage.getId()); packet.writeD(params.length); @@ -129,7 +128,6 @@ public class ConfirmDlg implements IClientOutgoingPacket } } } - packet.writeD(_time); packet.writeD(_requesterId); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 2a98428740..85d5630327 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -71,7 +71,6 @@ public class CreatureSay implements IClientOutgoingPacket _mask |= 0x08; } } - // Does not shows level if (sender.isGM()) { @@ -123,7 +122,6 @@ public class CreatureSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_sender == null ? 0 : _sender.getObjectId()); packet.writeD(_chatType.getClientId()); if (_senderName != null) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index dfc40d995f..a307b06e4b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -38,9 +38,8 @@ public class DeleteObject implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DELETE_OBJECT.writeId(packet); - packet.writeD(_objectId); - packet.writeC(0x00); // c2 + packet.writeC(0); // c2 return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java index 982c8f3311..3b5917e55b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java @@ -50,7 +50,6 @@ public class Dice implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DICE.writeId(packet); - packet.writeD(_objectId); // object id of player packet.writeD(_itemId); // item id of dice (spade) 4625,4626,4627,4628 packet.writeD(_number); // number rolled diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 3d741a86a6..ebc93d0fc4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -68,7 +68,6 @@ public class Die implements IClientOutgoingPacket siegeClan = fort.getSiege().getAttackerClan(clan); isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan); } - _toVillage = creature.canRevive() && !creature.isPendingRevive(); _toClanHall = (clan != null) && (clan.getHideoutId() > 0); _toCastle = ((clan != null) && (clan.getCastleId() > 0)) || isInCastleDefense; @@ -76,7 +75,6 @@ public class Die implements IClientOutgoingPacket _useFeather = creature.getAccessLevel().allowFixedRes() || creature.getInventory().haveItemForSelfResurrection(); _toFortress = ((clan != null) && (clan.getFortId() > 0)) || isInFortDefense; } - _isSweepable = creature.isAttackable() && creature.isSweepActive(); } @@ -91,7 +89,6 @@ public class Die implements IClientOutgoingPacket { _items = new ArrayList<>(8); } - if (_items.size() < 8) { _items.add(itemId); @@ -116,20 +113,18 @@ public class Die implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DIE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_toVillage ? 0x01 : 0x00); - packet.writeD(_toClanHall ? 0x01 : 0x00); - packet.writeD(_toCastle ? 0x01 : 0x00); - packet.writeD(_toOutpost ? 0x01 : 0x00); - packet.writeD(_isSweepable ? 0x01 : 0x00); - packet.writeD(_useFeather ? 0x01 : 0x00); - packet.writeD(_toFortress ? 0x01 : 0x00); - packet.writeD(0x00); // Disables use Feather button for X seconds - packet.writeD(0x00); // Adventure's Song - packet.writeC(_hideAnimation ? 0x01 : 0x00); - - packet.writeD(_itemsEnabled ? 0x01 : 0x00); + packet.writeD(_toVillage ? 1 : 0); + packet.writeD(_toClanHall ? 1 : 0); + packet.writeD(_toCastle ? 1 : 0); + packet.writeD(_toOutpost ? 1 : 0); + packet.writeD(_isSweepable ? 1 : 0); + packet.writeD(_useFeather ? 1 : 0); + packet.writeD(_toFortress ? 1 : 0); + packet.writeD(0); // Disables use Feather button for X seconds + packet.writeD(0); // Adventure's Song + packet.writeC(_hideAnimation ? 1 : 0); + packet.writeD(_itemsEnabled ? 1 : 0); packet.writeD(getItems().size()); getItems().forEach(packet::writeD); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java index 15404f9dee..5837faec19 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java @@ -33,7 +33,6 @@ public class DoorInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_INFO.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.getId()); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java index 54f8742a73..14d41afee7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java @@ -33,7 +33,6 @@ public class DoorStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_STATUS_UPDATE.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.isOpen() ? 0 : 1); packet.writeD(_door.getDamage()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index cfa4f6759d..52e04af09c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -40,20 +40,17 @@ public class DropItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DROP_ITEM.writeId(packet); - packet.writeD(_objectId); packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeC(_item.isStackable() ? 0x01 : 0x00); + packet.writeC(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - - packet.writeC(0x00); - // packet.writeD(0x01); if above C == true (1) then packet.readD() + packet.writeC(0); + // packet.writeD(1); if above C == true (1) then packet.readD() return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java index 631c43ba0c..99bd80d97e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java @@ -62,13 +62,12 @@ public class Earthquake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EARTHQUAKE.writeId(packet); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_intensity); packet.writeD(_duration); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index db168592f1..335ea9dced 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -58,7 +58,6 @@ public class EnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_crystal); packet.writeQ(_count); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java index 837be1f5e3..169410245b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java @@ -41,7 +41,6 @@ public class EtcStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ETC_STATUS_UPDATE.writeId(packet); - packet.writeC(_player.getCharges()); // 1-7 increase force, level packet.writeD(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%) packet.writeC(_player.getExpertiseWeaponPenalty()); // Weapon Grade Penalty [1-4] diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java index 5dca90f960..9f8d576148 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java @@ -24,13 +24,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class Ex2ndPasswordAck implements IClientOutgoingPacket { + // TODO: Enum + public static final int SUCCESS = 0; + public static final int WRONG_PATTERN = 1; + private final int _status; private final int _response; - // TODO: Enum - public static final int SUCCESS = 0x00; - public static final int WRONG_PATTERN = 0x01; - public Ex2ndPasswordAck(int status, int response) { _status = status; @@ -41,10 +41,9 @@ public class Ex2ndPasswordAck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_ACK.writeId(packet); - packet.writeC(_status); - packet.writeD(_response == WRONG_PATTERN ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(_response == WRONG_PATTERN ? 1 : 0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java index 48bde5161d..c86b5185d0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordCheck implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_NEW = 0x00; - public static final int PASSWORD_PROMPT = 0x01; - public static final int PASSWORD_OK = 0x02; + public static final int PASSWORD_NEW = 0; + public static final int PASSWORD_PROMPT = 1; + public static final int PASSWORD_OK = 2; private final int _windowType; @@ -40,9 +40,8 @@ public class Ex2ndPasswordCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_CHECK.writeId(packet); - packet.writeD(_windowType); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java index 1abf50ab01..f6731bf18f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordVerify implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_OK = 0x00; - public static final int PASSWORD_WRONG = 0x01; - public static final int PASSWORD_BAN = 0x02; + public static final int PASSWORD_OK = 0; + public static final int PASSWORD_WRONG = 1; + public static final int PASSWORD_BAN = 2; private final int _wrongTentatives; private final int _mode; @@ -42,7 +42,6 @@ public class Ex2ndPasswordVerify implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_VERIFY.writeId(packet); - packet.writeD(_mode); packet.writeD(_wrongTentatives); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java index 8f3d5ec764..528988ab5f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java @@ -45,10 +45,8 @@ public class ExAbnormalStatusUpdateFromTarget implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ABNORMAL_STATUS_UPDATE_FROM_TARGET.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeH(_effects.size()); - for (BuffInfo info : _effects) { packet.writeD(info.getSkill().getDisplayId()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java index c4b9cd8356..f3abd6ec5c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java @@ -41,7 +41,6 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRABLE_SKILL_LIST_BY_CLASS.writeId(packet); - packet.writeH(_type.getId()); packet.writeH(_learnable.size()); for (SkillLearn skill : _learnable) @@ -54,7 +53,7 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket packet.writeC(skill.getRequiredItems().size()); if (_type == AcquireSkillType.SUBPLEDGE) { - packet.writeH(0x00); + packet.writeH(0); } } return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java index fd0e2fc97c..8555bb6e86 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java @@ -61,7 +61,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_SKILL_INFO.writeId(packet); - packet.writeD(_id); packet.writeD(_level); packet.writeQ(_spCost); @@ -73,7 +72,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket packet.writeD(holder.getId()); packet.writeQ(holder.getCount()); } - packet.writeD(_skillRem.size()); for (Skill skill : _skillRem) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java index 29793f4d6c..ff8c526ec4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java @@ -36,7 +36,6 @@ public class ExAdenaInvenCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ADENA_INVEN_COUNT.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeH(_player.getInventory().getSize()); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java index 2aa2d85bc5..5ef11e0f1e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java @@ -50,13 +50,11 @@ public class ExAirShipInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_INFO.writeId(packet); - packet.writeD(_ship.getObjectId()); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(_captain); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); @@ -73,14 +71,13 @@ public class ExAirShipInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - packet.writeD(_ship.getFuel()); packet.writeD(_ship.getMaxFuel()); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java index 4cfc76bfba..8b37f4fc0a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java @@ -42,7 +42,6 @@ public class ExAirShipStopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_airShipId); packet.writeD(_playerId); packet.writeD(_x); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java index 33c57712da..52958f931b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java @@ -37,12 +37,10 @@ public class ExAirShipTeleportList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_TELEPORT_LIST.writeId(packet); - packet.writeD(_dockId); if (_teleports != null) { packet.writeD(_teleports.length); - for (int i = 0; i < _teleports.length; i++) { packet.writeD(i - 1); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java index 392b228f0d..7918022c72 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java @@ -50,13 +50,12 @@ public class ExAlchemySkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_SKILL_LIST.writeId(packet); - packet.writeD(_skills.size()); for (Skill skill : _skills) { packet.writeD(skill.getId()); packet.writeD(skill.getLevel()); - packet.writeQ(0x00); // Always 0 on Naia, SP i guess? + packet.writeQ(0); // Always 0 on Naia, SP i guess? packet.writeC(skill.getId() == CommonSkill.ALCHEMY_CUBE.getId() ? 0 : 1); // This is type in flash, visible or not } return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java index 3bfadd2650..ed7f8d4255 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java @@ -47,12 +47,10 @@ public class ExAlterSkillRequest implements IClientOutgoingPacket { return true; } - OutgoingPackets.EX_ALTER_SKILL_REQUEST.writeId(packet); packet.writeD(_nextSkillId); packet.writeD(_currentSkillId); packet.writeD(_alterTime); - if (_alterTime > 0) { _player.setAlterSkillActive(true); @@ -62,7 +60,6 @@ public class ExAlterSkillRequest implements IClientOutgoingPacket _player.setAlterSkillActive(false); }, _alterTime * 1000); } - return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java index 3d7ee12a81..1990e1e701 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java @@ -37,7 +37,6 @@ public class ExAskCoupleAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_COUPLE_ACTION.writeId(packet); - packet.writeD(_actionId); packet.writeD(_objectId); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java index 61cabedd98..45615daf5a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java @@ -39,9 +39,8 @@ public class ExAskJoinMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_MPCC.writeId(packet); - packet.writeS(_requestorName); // name of CCLeader - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java index 17fa9d028f..908022ff7e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java @@ -38,7 +38,6 @@ public class ExAskJoinPartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_PARTY_ROOM.writeId(packet); - packet.writeS(_charName); packet.writeS(_roomName); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java index 2a6b958dc9..1551840013 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java @@ -38,7 +38,6 @@ public class ExAskModifyPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_MODIFY_PARTY_LOOTING.writeId(packet); - packet.writeS(_requestor); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java index 958e7c3d06..fa62c8a207 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java @@ -45,7 +45,6 @@ public class ExAttributeEnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ATTRIBUTE_ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeC(_isWeapon); packet.writeH(_type); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java index 58fb542315..82ecba9bcb 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java @@ -41,9 +41,8 @@ public class ExAutoSoulShot implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AUTO_SOUL_SHOT.writeId(packet); - packet.writeD(_itemId); - packet.writeD(_enable ? 0x01 : 0x00); // Underground + packet.writeD(_enable ? 1 : 0); // Underground packet.writeD(_type); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java index 8680c6bd7a..a8137347ec 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java @@ -37,8 +37,7 @@ public class ExBaseAttributeCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASE_ATTRIBUTE_CANCEL_RESULT.writeId(packet); - - packet.writeD(0x01); // result + packet.writeD(1); // result packet.writeD(_objId); packet.writeD(_attribute); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java index acbad69599..27f7fb5a63 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java @@ -75,7 +75,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 1149, 1150, 1151, 1152, 1153, 1154, 1155 }; - public static final int[] DEFAULT_ACTION_LIST = { 0, 1, 2, 3, @@ -145,7 +144,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 5012, 5013, 5014, 5015 }; //@formatter:on - public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST); private final int[] _actionIds; @@ -159,7 +157,6 @@ public class ExBasicActionList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASIC_ACTION_LIST.writeId(packet); - packet.writeD(_actionIds.length); for (int _actionId : _actionIds) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java index 4c4fac8c91..d32dca4d21 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java @@ -34,13 +34,14 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBeautyItemList implements IClientOutgoingPacket { - private int _colorCount; - private final BeautyData _beautyData; - private final Map> _colorData = new HashMap<>(); private static final int HAIR_TYPE = 0; private static final int FACE_TYPE = 1; private static final int COLOR_TYPE = 2; + private int _colorCount; + private final BeautyData _beautyData; + private final Map> _colorData = new HashMap<>(); + public ExBeautyItemList(Player player) { _beautyData = BeautyShopData.getInstance().getBeautyData(player.getRace(), player.getAppearance().getSexType()); @@ -60,7 +61,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BEAUTY_ITEM_LIST.writeId(packet); - packet.writeD(HAIR_TYPE); packet.writeD(_beautyData.getHairList().size()); for (BeautyItem hair : _beautyData.getHairList().values()) @@ -72,7 +72,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(hair.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(FACE_TYPE); packet.writeD(_beautyData.getFaceList().size()); for (BeautyItem face : _beautyData.getFaceList().values()) @@ -84,7 +83,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(face.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(COLOR_TYPE); packet.writeD(_colorCount); for (Entry> entry : _colorData.entrySet()) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java index 1825236886..6d4c45cb2b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java @@ -34,7 +34,6 @@ public class ExBirthdayPopup implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_BIRTH_DAY.writeId(packet); - return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java index 7d2f17e697..43e525f05f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java @@ -26,6 +26,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBrBroadcastEventState implements IClientOutgoingPacket { + public static final int APRIL_FOOLS = 20090401; + public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) + public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) + public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) + public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) + private final int _eventId; private final int _eventState; private int _param0; @@ -36,12 +42,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket private String _param5; private String _param6; - public static final int APRIL_FOOLS = 20090401; - public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) - public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) - public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) - public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) - public ExBrBroadcastEventState(int eventId, int eventState) { _eventId = eventId; @@ -65,7 +65,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BROADCAST_EVENT_STATE.writeId(packet); - packet.writeD(_eventId); packet.writeD(_eventState); packet.writeD(_param0); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java index 1fd7ec663a..c0683c8797 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java @@ -44,7 +44,6 @@ public class ExBrBuffEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUFF_EVENT_STATE.writeId(packet); - packet.writeD(_type); packet.writeD(_value); packet.writeD(_state); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java index 943aae8a62..8e009d7b09 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java @@ -43,7 +43,6 @@ public class ExBrLoadEventTopRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_LOAD_EVENT_TOP_RANKERS.writeId(packet); - packet.writeD(_eventId); packet.writeD(_day); packet.writeD(_count); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java index 6a98c01654..9105e39efe 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java @@ -36,9 +36,8 @@ public class ExBrPremiumState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PREMIUM_STATE.writeId(packet); - packet.writeD(_player.getObjectId()); - packet.writeC(_player.hasPremiumStatus() ? 0x01 : 0x00); + packet.writeC(_player.hasPremiumStatus() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 381dd859ad..567cfc70f9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -59,10 +59,8 @@ public class ExBuySellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x01); // Type SELL + packet.writeD(1); // Type SELL packet.writeD(_inventorySlots); - if ((_sellList != null)) { packet.writeH(_sellList.size()); @@ -74,9 +72,8 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - if ((_refundList != null) && !_refundList.isEmpty()) { packet.writeH(_refundList.size()); @@ -90,10 +87,9 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - - packet.writeC(_done ? 0x01 : 0x00); + packet.writeC(_done ? 1 : 0); return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java index 2b43c0ce4b..e0ec81e0e7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java @@ -39,7 +39,6 @@ public class ExCastleState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CASTLE_STATE.writeId(packet); - packet.writeD(_castleId); packet.writeD(_castleSide.ordinal()); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java index b7f90d261b..a8196c7a83 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java @@ -52,7 +52,6 @@ public class ExChangeClientEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_CLIENT_EFFECT_INFO.writeId(packet); - packet.writeD(_type); packet.writeD(_key); packet.writeD(_value); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java index 472abc88df..eea59162ee 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java @@ -37,7 +37,6 @@ public class ExChangeNpcState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NPC_STATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java index 8cdcb4460d..45f2805517 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java @@ -49,7 +49,6 @@ public class ExChangePostState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_POST_STATE.writeId(packet); - packet.writeD(_receivedBoard ? 1 : 0); packet.writeD(_changedMsgIds.length); for (int postId : _changedMsgIds) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java index fc58ec9a2e..d765ab54e0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java @@ -35,7 +35,6 @@ public class ExChangeToAwakenedClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_TO_AWAKENED_CLASS.writeId(packet); - packet.writeD(_classId); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index f51a3eb3ae..1e9b8e9dc8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -47,7 +47,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket throw new IllegalArgumentException("Undefined Atribute item: " + stone); } _level = ElementalAttributeData.getInstance().getMaxElementLevel(_itemId); - // Register only items that can be put an attribute stone/crystal for (Item item : player.getInventory().getItems()) { @@ -62,7 +61,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_INVENTORY_ATTRIBUTE_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeQ(_count); packet.writeD(_atribute == AttributeType.FIRE ? 1 : 0); // Fire diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java index a272d85469..238882cd11 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java @@ -35,7 +35,6 @@ public class ExCloseMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java index d2ecd70952..877bca760a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java @@ -34,7 +34,6 @@ public class ExClosePartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_PARTY_ROOM.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java index 27c112776b..1d02c972b5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java @@ -54,7 +54,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLOSSEUM_FENCE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_clientState); packet.writeD(_x); @@ -62,7 +61,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_width); packet.writeD(_length); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java index 766d3619ad..b72bef93e8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java @@ -37,9 +37,8 @@ public class ExConfirmAddingContact implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AGIT_AUCTION_CMD.writeId(packet); - packet.writeS(_charName); - packet.writeD(_added ? 0x01 : 0x00); + packet.writeD(_added ? 1 : 0); return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java index beded32254..c832d507ed 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameAddPlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x01); - + packet.writeD(1); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java index 5f36f730d0..847ea93e6a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java @@ -45,9 +45,7 @@ public class ExCubeGameChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java index 66abbf4b75..a2f2e61ded 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java @@ -43,12 +43,10 @@ public class ExCubeGameChangeTeam implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x05); - + packet.writeD(5); packet.writeD(_player.getObjectId()); - packet.writeD(_fromRedTeam ? 0x01 : 0x00); - packet.writeD(_fromRedTeam ? 0x00 : 0x01); + packet.writeD(_fromRedTeam ? 1 : 0); + packet.writeD(_fromRedTeam ? 0 : 1); return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java index 5273b2099a..136b439283 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java @@ -39,9 +39,7 @@ public class ExCubeGameChangeTimeToStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x03); - + packet.writeD(3); packet.writeD(_seconds); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java index f81a302941..9bdba49029 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java @@ -35,7 +35,6 @@ public class ExCubeGameCloseUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0xffffffff); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java index 259a0e9407..3177e7a488 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java @@ -40,11 +40,9 @@ public class ExCubeGameEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x01); - - packet.writeD(_isRedTeamWin ? 0x01 : 0x00); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(1); + packet.writeD(_isRedTeamWin ? 1 : 0); + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java index 4d89e621ce..8b96bb545f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java @@ -55,14 +55,11 @@ public class ExCubeGameExtendedChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeD(_playerPoints); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java index e5a00f1ab7..c084789f13 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameRemovePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java index 00be884d2f..35a3f289d1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java @@ -35,8 +35,7 @@ public class ExCubeGameRequestReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x04); + packet.writeD(4); return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java index 1bc89e0c32..8b755dd3cc 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java @@ -30,7 +30,6 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket // Players Lists private final List _bluePlayers; private final List _redPlayers; - // Common Values private final int _roomNumber; @@ -51,12 +50,9 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_roomNumber); packet.writeD(0xffffffff); - packet.writeD(_bluePlayers.size()); for (Player player : _bluePlayers) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java index 2f2c092c08..d000112787 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java @@ -31,7 +31,6 @@ public class ExCursedWeaponList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet); - final Set ids = CursedWeaponsManager.getInstance().getCursedWeaponsIds(); packet.writeD(ids.size()); ids.forEach(packet::writeD); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java index 2f60a1b80c..5bc7ff3238 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java @@ -39,7 +39,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet); - if (!_cursedWeaponInfo.isEmpty()) { packet.writeD(_cursedWeaponInfo.size()); @@ -47,7 +46,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { packet.writeD(w.id); packet.writeD(w.activated); - packet.writeD(w.pos.getX()); packet.writeD(w.pos.getY()); packet.writeD(w.pos.getZ()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java index f475a02b28..0456fb9dae 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java @@ -34,7 +34,6 @@ public class ExDissmissMPCCRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DISSMISS_MPCC_ROOM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java index 258010f717..c731b7c7a9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java @@ -37,7 +37,6 @@ public class ExDuelAskStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_ASK_START.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDuel); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java index 043c82c0db..e9a31bee57 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java @@ -38,7 +38,6 @@ public class ExDuelEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_END.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java index 264409b3d6..e1fa1cea88 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java @@ -38,7 +38,6 @@ public class ExDuelReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_READY.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java index 488aafcb7d..ecdd528a16 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java @@ -38,7 +38,6 @@ public class ExDuelStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_START.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java index 7df040c5e7..5ed0c09675 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java @@ -36,7 +36,6 @@ public class ExDuelUpdateUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_UPDATE_USER_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeD(_player.getClassId().getId()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 7ab055a3d8..f58c0573a8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExEnchantSkillInfo implements IClientOutgoingPacket { private final Set _routes; - private final int _skillId; private final int _skillLevel; private final int _skillSubLevel; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 41368a8efb..e4ee350e64 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -50,7 +50,6 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_INFO_DETAIL.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java index 5cedcd6284..1d32f0d725 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java @@ -43,7 +43,6 @@ public class ExEnchantSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_LIST.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skills.size()); for (Skill skill : _skills) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java index 6ab5e869f2..853d74039f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java @@ -38,7 +38,6 @@ public class ExEnchantSkillResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_RESULT.writeId(packet); - packet.writeD(_enchanted ? 1 : 0); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java index 7b7d2d008d..410bf16510 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java @@ -42,7 +42,6 @@ public class ExEventMatchMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_EVENT_MATCH_MESSAGE.writeId(packet); - packet.writeC(_type); packet.writeS(_message); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java index 7264e90233..1946758bf5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java @@ -37,11 +37,9 @@ public class ExGetBookMarkInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOOK_MARK_INFO.writeId(packet); - - packet.writeD(0x00); // Dummy + packet.writeD(0); // Dummy packet.writeD(_player.getBookMarkSlot()); packet.writeD(_player.getTeleportBookmarks().size()); - for (TeleportBookmark tpbm : _player.getTeleportBookmarks()) { packet.writeD(tpbm.getId()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java index 36e7bb81af..201e8eb49b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java @@ -42,15 +42,14 @@ public class ExGetBossRecord implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOSS_RECORD.writeId(packet); - packet.writeD(_ranking); packet.writeD(_totalPoints); if (_bossRecordInfo == null) { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } else { @@ -59,7 +58,7 @@ public class ExGetBossRecord implements IClientOutgoingPacket { packet.writeD(entry.getKey()); packet.writeD(entry.getValue()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? } } return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java index ea0a5f8b18..85ccad0758 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java @@ -41,7 +41,6 @@ public class ExGetOffAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_OFF_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_x); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java index f8e16a4191..9a02e49223 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java @@ -39,7 +39,6 @@ public class ExGetOnAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_ON_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java index 51197344a5..704b3212a1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExGetPremiumItemList implements IClientOutgoingPacket { private final Player _player; - private final Map _map; public ExGetPremiumItemList(Player player) @@ -43,7 +42,6 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_PREMIUM_ITEM_LIST.writeId(packet); - packet.writeD(_map.size()); for (Entry entry : _map.entrySet()) { @@ -51,7 +49,7 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket packet.writeQ(entry.getKey()); packet.writeD(item.getItemId()); packet.writeQ(item.getCount()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeS(item.getSender()); } return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index 71754ea3ca..0dd410ca2b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -40,7 +40,6 @@ public class ExHeroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HERO_LIST.writeId(packet); - packet.writeD(_heroList.size()); for (StatSet hero : _heroList.values()) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index f7ab7c4fa3..c424b903be 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -46,7 +46,6 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); - packet.writeD(_currentTemplateId); packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java index 81db66b88f..323c0cdf1e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java @@ -35,7 +35,6 @@ public class ExIsCharNameCreatable implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_IS_CHAR_NAME_CREATABLE.writeId(packet); - packet.writeD(_allowed); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java index ecc751eab3..45def9e0be 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java @@ -38,7 +38,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { throw new NullPointerException(); } - if (currentAuction.getAuctionState() != ItemAuctionState.STARTED) { _timeRemaining = 0; @@ -47,7 +46,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { _timeRemaining = (int) (currentAuction.getFinishingTimeRemaining() / 1000); // in seconds } - _refresh = refresh; _currentAuction = currentAuction; _nextAuction = nextAuction; @@ -57,16 +55,12 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_AUCTION_INFO.writeId(packet); - - packet.writeC(_refresh ? 0x00 : 0x01); + packet.writeC(_refresh ? 0 : 1); packet.writeD(_currentAuction.getInstanceId()); - final ItemAuctionBid highestBid = _currentAuction.getHighestBid(); packet.writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid()); - packet.writeD(_timeRemaining); writeItem(packet, _currentAuction.getItemInfo()); - if (_nextAuction != null) { packet.writeQ(_nextAuction.getAuctionInitBid()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java index 53ad8abd58..1c5e38cbab 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListMpccWaiting implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _rooms = new LinkedList<>(); @@ -53,7 +54,6 @@ public class ExListMpccWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_MPCC_WAITING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 78f2fec636..eafea24fa6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _players = new LinkedList<>(); @@ -60,7 +61,6 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(packet); - packet.writeD(_size); packet.writeD(_players.size()); for (Player player : _players) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java index 786c616875..c8723a9fc0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java @@ -46,7 +46,6 @@ public class ExMPCCPartyInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCPARTY_INFO_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_LeaderOID); packet.writeD(_memberCount); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java index 4bf07f0133..08259e4e6c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java @@ -37,7 +37,6 @@ public class ExMPCCPartymasterList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_PARTYMASTER_LIST.writeId(packet); - packet.writeD(_leadersName.size()); _leadersName.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java index abbdc8fe76..f021ef5f1f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java @@ -36,7 +36,6 @@ public class ExMPCCRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java index 154e156270..2eec590cb4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java @@ -41,7 +41,6 @@ public class ExMPCCRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java index 06e3027bfc..a0e9d0a4b0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java @@ -37,7 +37,6 @@ public class ExMPCCShowPartyMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCSHOW_PARTY_MEMBER_INFO.writeId(packet); - packet.writeD(_party.getMemberCount()); for (Player pc : _party.getMembers()) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java index e454a746f3..771b2f22cb 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java @@ -49,7 +49,6 @@ public class ExMagicAttackInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAGIC_ATTACK_INFO.writeId(packet); - packet.writeD(_caster); packet.writeD(_target); packet.writeD(_type); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java index 9cfbeb5aee..1aaa5b6520 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java @@ -35,7 +35,6 @@ public class ExMailArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAIL_ARRIVED.writeId(packet); - return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java index 983ff22b92..48156c0600 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java @@ -44,7 +44,6 @@ public class ExManageMpccRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MANAGE_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java index f710c006e8..9d7d14211e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java @@ -45,7 +45,6 @@ public class ExMoveToLocationAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_objId); packet.writeD(_tx); packet.writeD(_ty); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java index 3e3bdc9fed..87e44b51cd 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java @@ -43,7 +43,6 @@ public class ExMoveToLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java index 7ab0d1c7da..3c1902892a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java @@ -40,11 +40,9 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet); - packet.writeS(_channel.getLeader().getName()); - packet.writeD(0x00); // Channel loot 0 or 1 + packet.writeD(0); // Channel loot 0 or 1 packet.writeD(_channel.getMemberCount()); - packet.writeD(_channel.getParties().size()); for (Party p : _channel.getParties()) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java index 1536bd5f9b..f2a32bb6e8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java @@ -43,7 +43,6 @@ public class ExNeedToChangeName implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEED_TO_CHANGE_NAME.writeId(packet); - packet.writeD(_type); packet.writeD(_subType); packet.writeS(_name); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java index be9bec8559..d18b4606b3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java @@ -35,7 +35,6 @@ public class ExNevitAdventEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CHANNELING_EFFECT.writeId(packet); - packet.writeD(_timeLeft); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java index 3a0367c178..09f6250f51 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java @@ -35,7 +35,6 @@ public class ExNevitAdventPointInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_AGATHION_ENERGY_INFO.writeId(packet); - packet.writeD(_points); // 72 = 1%, max 7200 = 100% return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java index 88fdaae499..ef220d86de 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java @@ -37,9 +37,8 @@ public class ExNevitAdventTimeChange implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - // state 0 - pause 1 - started - packet.writeC(_paused ? 0x00 : 0x01); + packet.writeC(_paused ? 0 : 1); // left time in ms max is 16000 its 4m and state is automatically changed to quit packet.writeD(_time); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java index fccdf510cc..4025bf78fa 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java @@ -34,7 +34,6 @@ public class ExNewSkillToLearnByLevelUp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEW_SKILL_TO_LEARN_BY_LEVEL_UP.writeId(packet); - return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java index 324c18a517..f2ce8614dc 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java @@ -43,8 +43,7 @@ public class ExNoticePostArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTICE_POST_ARRIVED.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java index afe3719d9b..050c7ccea5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java @@ -43,8 +43,7 @@ public class ExNoticePostSent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_WRITE_POST.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java index 5d98c20b09..e0bd08d39a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java @@ -30,7 +30,6 @@ public class ExNotifyPremiumItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_PREMIUM_ITEM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java index 6cb3724448..ba3c0cfeaa 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java @@ -34,7 +34,6 @@ public class ExOlympiadMatchEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MATCH_END.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java index 264d5aa484..7ffd5ed3bd 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java @@ -55,19 +55,15 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x00); // Type 0 = Match List, 1 = Match Result - + packet.writeD(0); // Type 0 = Match List, 1 = Match Result packet.writeD(_games.size()); - packet.writeD(0x00); - + packet.writeD(0); for (OlympiadGameTask curGame : _games) { final AbstractOlympiadGame game = curGame.getGame(); if (game != null) { packet.writeD(game.getStadiumId()); // Stadium Id (Arena 1 = 0) - if (game instanceof OlympiadGameNonClassed) { packet.writeD(1); @@ -80,8 +76,7 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket { packet.writeD(0); } - - packet.writeD(curGame.isRunning() ? 0x02 : 0x01); // (1 = Standby, 2 = Playing) + packet.writeD(curGame.isRunning() ? 2 : 1); // (1 = Standby, 2 = Playing) packet.writeS(game.getPlayerNames()[0]); // Player 1 Name packet.writeS(game.getPlayerNames()[1]); // Player 2 Name } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java index e828c2123e..fecab74e40 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java @@ -53,9 +53,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x01); // Type 0 = Match List, 1 = Match Result - + packet.writeD(1); // Type 0 = Match List, 1 = Match Result packet.writeD(_tie ? 1 : 0); // 0 - win, 1 - tie packet.writeS(_winnerList.get(0).getName()); packet.writeD(_winTeam); @@ -70,7 +68,6 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); } - packet.writeD(_loseTeam); packet.writeD(_loserList.size()); for (OlympiadInfo info : _loserList) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java index 34d81d1f53..712b9e06c6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java @@ -38,7 +38,6 @@ public class ExOlympiadMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MODE.writeId(packet); - packet.writeC(_mode); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java index ebea6c56f3..5b4f2c2523 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java @@ -53,7 +53,6 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_SPELLED_INFO.writeId(packet); - packet.writeD(_playerId); packet.writeD(_effects.size() + _effects2.size()); for (BuffInfo info : _effects) @@ -62,7 +61,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(info.getSkill().getDisplayId()); packet.writeH(info.getSkill().getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(info.getSkill().getAbnormalType().getClientId()); writeOptionalD(packet, info.getSkill().isAura() ? -1 : info.getTime()); } @@ -73,7 +72,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(skill.getDisplayId()); packet.writeH(skill.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(skill.getAbnormalType().getClientId()); packet.writeH(-1); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java index 18c34fe9de..ca473edfcf 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java @@ -76,7 +76,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_USER_INFO.writeId(packet); - if (_player != null) { packet.writeC(_player.getOlympiadSide()); @@ -91,7 +90,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket packet.writeS(_par.getName()); packet.writeD(_par.getBaseClass()); } - packet.writeD(_curHp); packet.writeD(_maxHp); packet.writeD(_curCp); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java index e84d0251bd..7ec64cc8c3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java @@ -35,7 +35,6 @@ public class ExOpenMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OPEN_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java index 90349cc1a2..5661dc9f57 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java @@ -56,7 +56,6 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PCCAFE_POINT_INFO.writeId(packet); - packet.writeD(_points); // num points packet.writeD(_mAddPoint); // points inc display packet.writeC(_mPeriodType); // period(0=don't show window,1=acquisition,2=use points) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java index f7e8b4a99a..248a2f7d98 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_ADD.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java index 832bee0012..1f452f4bae 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_DELETE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_summon.getSummonType()); packet.writeD(_summon.getOwner().getObjectId()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java index 0646a67001..703694fa2f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_UPDATE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 0e3edb3ea7..e4c6b79ae0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -47,7 +47,6 @@ public class ExPartyRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2bffdec368..2ebf1dc7f0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -43,10 +43,8 @@ public class ExPetInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class ExPetInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class ExPetInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,9 +154,8 @@ public class ExPetInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -227,28 +205,24 @@ public class ExPetInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PET_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -267,7 +241,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -283,19 +257,19 @@ public class ExPetInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -307,20 +281,20 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -344,12 +318,12 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -379,12 +353,10 @@ public class ExPetInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java index 082f4c7662..0f72c05a3a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java @@ -34,7 +34,6 @@ public class ExPlayScene implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLAY_SCENE.writeId(packet); - return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java index e98d317e14..7e3803bdaa 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java @@ -36,7 +36,6 @@ public class ExPledgeCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_COUNT.writeId(packet); - packet.writeD(_count); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java index 838029e284..4084de3481 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java @@ -38,7 +38,6 @@ public class ExPledgeDraftListSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_DRAFT_LIST_SEARCH.writeId(packet); - packet.writeD(_pledgeRecruitList.size()); for (PledgeWaitingInfo prl : _pledgeRecruitList) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java index fb956e9996..44e34004ea 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java @@ -25,11 +25,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExPledgeEmblem implements IClientOutgoingPacket { + private static final int TOTAL_SIZE = 65664; + private final int _crestId; private final int _clanId; private final byte[] _data; private final int _chunkId; - private static final int TOTAL_SIZE = 65664; public ExPledgeEmblem(int crestId, byte[] chunkedData, int clanId, int chunkId) { @@ -43,7 +44,6 @@ public class ExPledgeEmblem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clanId); packet.writeD(_crestId); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java index ed19bf976b..b32f8c0645 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitApplyInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_APPLY_INFO.writeId(packet); - packet.writeD(_status.ordinal()); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java index fc98b7b6f7..af4af9c9c1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitBoardDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_DETAIL.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClanId()); packet.writeD(_pledgeRecruitInfo.getKarma()); packet.writeS(_pledgeRecruitInfo.getInformation()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index d2c9c088d1..457d60b2d5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -34,7 +34,6 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket private final int _clanOnCurrentPage; private final int _startIndex; private final int _endIndex; - static final int CLAN_PER_PAGE = 12; public ExPledgeRecruitBoardSearch(List clanList, int currentPage) @@ -51,11 +50,9 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_SEARCH.writeId(packet); - packet.writeD(_currentPage); packet.writeD(_totalNumberOfPage); packet.writeD(_clanOnCurrentPage); - for (int i = _startIndex; i < _endIndex; i++) { packet.writeD(_clanList.get(i).getClanId()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 4ae5ffe316..b1f139226d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -40,7 +40,6 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java index 77080a3820..5844f220ec 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java @@ -39,7 +39,6 @@ public class ExPledgeWaitingList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST.writeId(packet); - packet.writeD(pledgePlayerRecruitInfos.size()); for (PledgeApplicantInfo recruitInfo : pledgePlayerRecruitInfos.values()) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java index a9245c1309..6b88572057 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java @@ -30,7 +30,6 @@ public class ExPledgeWaitingListAlarm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_ALARM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java index 60997b3da0..28c3967119 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java @@ -40,7 +40,6 @@ public class ExPledgeWaitingListApplied implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_APPLIED.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClan().getId()); packet.writeS(_pledgeRecruitInfo.getClan().getName()); packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java index 66a06892c2..1f53d1bb38 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java @@ -36,7 +36,6 @@ public class ExPledgeWaitingUser implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_USER.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getPlayerId()); packet.writeS(_pledgeRecruitInfo.getMessage()); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java index 49bc9b0995..5f404779f5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java @@ -43,7 +43,6 @@ public class ExPrivateStoreSetWholeMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_objectId); packet.writeS(_msg); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java index cb5e8fbce9..ff996b5d0c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutCommissionResultForVariationMake implements IClientOutgoingPac public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_COMMISSION_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_gemstoneObjId); packet.writeD(_itemId); packet.writeQ(_gemstoneCount); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java index 81721e921f..098472b7ae 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantScrollItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SCROLL_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java index 871f377db2..ffea182a49 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java index c47a4bcff4..8016e128f4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java index c8b46be499..95c0c0e4e1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_INTENSIVE_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_refinerItemObjId); packet.writeD(_lifestoneItemId); packet.writeD(_gemstoneItemId); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 2128b2b19f..2970ca00a2 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -41,13 +41,12 @@ public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_CANCEL.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); packet.writeD(_itemAug1); packet.writeD(_itemAug2); packet.writeQ(_price); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java index 80541e65cd..c25dd16b01 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java @@ -34,10 +34,9 @@ public class ExPutItemResultForVariationMake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index b739a94c55..c4d27d1728 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -48,7 +48,6 @@ public class ExQuestItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java index fe5eb74eb0..bc8896164d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java @@ -56,13 +56,12 @@ public class ExQuestNpcLogList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_NPC_LOG_LIST.writeId(packet); - packet.writeD(_questId); packet.writeC(_npcLogList.size()); for (NpcLogListHolder holder : _npcLogList) { packet.writeD(holder.isNpcString() ? holder.getId() : holder.getId() + 1000000); - packet.writeC(holder.isNpcString() ? 0x01 : 0x00); + packet.writeC(holder.isNpcString() ? 1 : 0); packet.writeD(holder.getCount()); } return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java index 62d622caff..60616b256d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java @@ -35,7 +35,6 @@ public class ExRedSky implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RED_SKY.writeId(packet); - packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java index ce40b1a792..163faff855 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java @@ -36,7 +36,6 @@ public class ExRegenMax implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REGEN_MAX.writeId(packet); - packet.writeD(1); packet.writeD(_time); packet.writeD(_tickInterval); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java index d864795cd6..a17525576b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java @@ -34,7 +34,6 @@ public class ExRemoveEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REMOVE_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 29d5eafeef..77458fd485 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -41,7 +41,6 @@ public class ExReplyPostItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_POST_ITEM_LIST.writeId(packet); - packet.writeD(_itemList.size()); for (Item item : _itemList) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 57ed88ac29..4e479e75a6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -56,7 +56,6 @@ public class ExReplyReceivedPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_RECEIVED_POST.writeId(packet); - packet.writeD(_msg.getMailType().ordinal()); // GOD if (_msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED) { @@ -76,11 +75,10 @@ public class ExReplyReceivedPost extends AbstractItemPacket } packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown packet.writeS(_msg.getSenderName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -92,9 +90,8 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeQ(_msg.getReqAdena()); packet.writeD(_msg.hasAttachments() ? 1 : 0); packet.writeD(_msg.isReturned() ? 1 : 0); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 75f6596194..ed490eae91 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -54,14 +54,12 @@ public class ExReplySentPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_SENT_POST.writeId(packet); - - packet.writeD(0x00); // GOD + packet.writeD(0); // GOD packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); packet.writeS(_msg.getReceiverName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -73,11 +71,11 @@ public class ExReplySentPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeQ(_msg.getReqAdena()); - packet.writeD(_msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(_msg.isReturned() ? 0x01 : 00); + packet.writeD(_msg.hasAttachments() ? 1 : 0); + packet.writeD(_msg.isReturned() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index cc4f7ce1d8..e6a3f9bca2 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -35,7 +35,6 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java index 2634aa1cdd..60201b177f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java @@ -35,7 +35,6 @@ public class ExRequestHackShield implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REQUEST_HACK_SHIELD.writeId(packet); - return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java index c51ff31d0b..75e3b3a945 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java @@ -29,13 +29,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyList implements IClientOutgoingPacket { + public static final int SHOW_FACESHAPE = 1; + public static final int SHOW_HAIRSTYLE = 0; + private final Player _player; private final int _type; private final Map _beautyItem; - public static final int SHOW_FACESHAPE = 1; - public static final int SHOW_HAIRSTYLE = 0; - public ExResponseBeautyList(Player player, int type) { _player = player; @@ -54,7 +54,6 @@ public class ExResponseBeautyList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java index ca2ed360ab..4b19201833 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java @@ -25,16 +25,15 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket { + public static final int FAILURE = 0; + public static final int SUCCESS = 1; + public static final int CHANGE = 0; + public static final int RESTORE = 1; + private final Player _player; private final int _type; private final int _result; - public static final int FAILURE = 0; - public static final int SUCCESS = 1; - - public static final int CHANGE = 0; - public static final int RESTORE = 1; - public ExResponseBeautyRegistReset(Player player, int type, int result) { _player = player; @@ -46,7 +45,6 @@ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_REGIST_RESET.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java index 0e313ef3b7..c0922cfb04 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java @@ -36,10 +36,8 @@ public class ExResponseResetList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_RESET_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); - packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java index 01fe1945ef..a230033d67 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java @@ -37,7 +37,6 @@ public class ExRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ROTATION.writeId(packet); - packet.writeD(_charId); packet.writeD(_heading); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index c58ccfc233..2646a71e77 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -36,7 +36,6 @@ public class ExRpItemLink extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RP_ITEM_LINK.writeId(packet); - writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java index 04556bbed2..f0c6eba8e9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java @@ -34,7 +34,6 @@ public class ExSearchOrc implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEARCH_ORC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index 1e06cc2a3f..7a4dced122 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -38,7 +38,6 @@ public class ExSendManorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_MANOR_LIST.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java index b63c69f37e..2c25cc8bfc 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java @@ -124,7 +124,6 @@ public class ExSendUIEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_UIEVENT.writeId(packet); - packet.writeD(_objectId); packet.writeD(_type); // 0 = show, 1 = hide (there is 2 = pause and 3 = resume also but they don't work well you can only pause count down and you cannot resume it because resume hides the counter). packet.writeD(0); // unknown diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java index 4378479707..716a3e8623 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java @@ -385,16 +385,13 @@ public class ExServerPrimitive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SERVER_PRIMITIVE.writeId(packet); - packet.writeS(_name); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(65535); // has to do something with display range and angle packet.writeD(65535); // has to do something with display range and angle - packet.writeD(_points.size() + _lines.size()); - for (Point point : _points) { packet.writeC(1); // Its the type in this case Point @@ -408,7 +405,6 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(point.getY()); packet.writeD(point.getZ()); } - for (Line line : _lines) { packet.writeC(2); // Its the type in this case Line diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java index fb32e199b2..51fb91b643 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java @@ -46,7 +46,6 @@ public class ExSetCompassZoneCode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_COMPASS_ZONE_CODE.writeId(packet); - packet.writeD(_zoneType); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java index 1d0fbae3a4..34dee8bda0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java @@ -38,7 +38,6 @@ public class ExSetPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_PARTY_LOOTING.writeId(packet); - packet.writeD(_result); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java index 7b14ec8412..4e491af9d1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java @@ -34,7 +34,6 @@ public class ExShowAdventurerGuideBook implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_ADVENTURER_GUIDE_BOOK.writeId(packet); - return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index 82554fdc5f..1f8df76083 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -39,7 +39,6 @@ public class ExShowAgitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AGIT_INFO.writeId(packet); - final Collection clanHalls = ClanHallData.getInstance().getClanHalls(); packet.writeD(clanHalls.size()); clanHalls.forEach(clanHall -> diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index dd11ee0150..51e6646ff5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -44,7 +44,6 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BASE_ATTRIBUTE_CANCEL_WINDOW.writeId(packet); - packet.writeD(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java index 14e55d39f3..e22345c4fd 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java @@ -25,13 +25,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExShowBeautyMenu implements IClientOutgoingPacket { - private final Player _player; - private final int _type; - // TODO: Enum public static final int MODIFY_APPEARANCE = 0; public static final int RESTORE_APPEARANCE = 1; + private final Player _player; + private final int _type; + public ExShowBeautyMenu(Player player, int type) { _player = player; @@ -42,7 +42,6 @@ public class ExShowBeautyMenu implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BEAUTY_MENU.writeId(packet); - packet.writeD(_type); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 6ca5edc29b..c0cd4bc02a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -41,7 +41,6 @@ public class ExShowCastleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CASTLE_INFO.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java index aeb4079f3a..f9a6ebe0e7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java @@ -38,7 +38,6 @@ public class ExShowContactList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_SHOW_POST_FRIEND.writeId(packet); - packet.writeD(_contacts.size()); _contacts.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index a079ea3129..94b989b583 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -37,7 +37,6 @@ public class ExShowCropInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _crops = (nextPeriod && !manor.isManorApproved()) ? null : manor.getCropProcure(manorId, nextPeriod); } @@ -46,10 +45,9 @@ public class ExShowCropInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Crop Sales" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Crop Sales" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); + packet.writeD(0); if (_crops != null) { packet.writeD(_crops.size()); @@ -64,17 +62,17 @@ public class ExShowCropInfo implements IClientOutgoingPacket if (seed == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(seed.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(seed.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(seed.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index ebffd775d8..1f01ee7b87 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -62,10 +62,8 @@ public class ExShowCropSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getCropId()); // crop id diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index ee9fa9fd37..b625a1e4e7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -39,7 +39,6 @@ public class ExShowFortressInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_INFO.writeId(packet); - final Collection forts = FortManager.getInstance().getForts(); packet.writeD(forts.size()); for (Fort fort : forts) @@ -47,7 +46,7 @@ public class ExShowFortressInfo implements IClientOutgoingPacket final Clan clan = fort.getOwnerClan(); packet.writeD(fort.getResidenceId()); packet.writeS(clan != null ? clan.getName() : ""); - packet.writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00); + packet.writeD(fort.getSiege().isInProgress() ? 1 : 0); // Time of possession packet.writeD(fort.getOwnedTime()); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index f389b26ed5..678ab43e96 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -42,11 +42,9 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_MAP_INFO.writeId(packet); - packet.writeD(_fortress.getResidenceId()); packet.writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status packet.writeD(_fortress.getFortSize()); // barracks count - final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId()); if ((commanders != null) && !commanders.isEmpty() && _fortress.getSiege().isInProgress()) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 27da99cf41..da186103ae 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -51,7 +51,6 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_SIEGE_INFO.writeId(packet); - packet.writeD(_fortId); // Fortress Id packet.writeD(_size); // Total Barracks Count if (_csize > 0) @@ -64,22 +63,22 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { case 0: { - packet.writeD(0x03); + packet.writeD(3); break; } case 1: { - packet.writeD(0x02); + packet.writeD(2); break; } case 2: { - packet.writeD(0x01); + packet.writeD(1); break; } case 3: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -92,27 +91,27 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket // TODO: once control room supported, update packet.writeD(0x0x) to support 5th room case 0: { - packet.writeD(0x05); + packet.writeD(5); break; } case 1: { - packet.writeD(0x04); + packet.writeD(4); break; } case 2: { - packet.writeD(0x03); + packet.writeD(3); break; } case 3: { - packet.writeD(0x02); + packet.writeD(2); break; } case 4: { - packet.writeD(0x01); + packet.writeD(1); break; } } @@ -124,7 +123,7 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { for (int i = 0; i < _size; i++) { - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java index f7aca7dffd..912839e242 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java @@ -41,8 +41,7 @@ public class ExShowManorDefaultInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_MANOR_DEFAULT_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" and "Crop Sales" buttons + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" and "Crop Sales" buttons packet.writeD(_crops.size()); for (Seed crop : _crops) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 1d3312d668..d03ce2a5fd 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -52,10 +52,8 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet); - packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java index cf38d18c1c..f41999329f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java @@ -34,7 +34,6 @@ public class ExShowQuestInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_INFO.writeId(packet); - return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java index 70f31e318f..0fa64c401d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java @@ -37,7 +37,6 @@ public class ExShowQuestMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_MARK.writeId(packet); - packet.writeD(_questId); packet.writeD(_questState); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index ab85228caf..1a6ee00a10 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ExShowReceivedPostList implements IClientOutgoingPacket { - private final List _inbox; - private static final int MESSAGE_FEE = 100; private static final int MESSAGE_FEE_PER_SLOT = 1000; + private final List _inbox; + public ExShowReceivedPostList(int objectId) { _inbox = MailManager.getInstance().getInbox(objectId); @@ -45,7 +45,6 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { @@ -64,18 +63,18 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getSenderName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); + packet.writeD(msg.isUnread() ? 1 : 0); packet.writeD(((msg.getMailType() == MailType.COMMISSION_ITEM_SOLD) || (msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED)) ? 0 : 1); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(msg.isReturned() ? 0x01 : 0x00); - packet.writeD(0x00); // SysString in some case it seems + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(msg.isReturned() ? 1 : 0); + packet.writeD(0); // SysString in some case it seems } } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(MESSAGE_FEE); packet.writeD(MESSAGE_FEE_PER_SLOT); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java index 9679468789..deebb99c8f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java @@ -33,6 +33,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; */ public class ExShowScreenMessage implements IClientOutgoingPacket { + // Positions + public static final byte TOP_LEFT = 1; + public static final byte TOP_CENTER = 2; + public static final byte TOP_RIGHT = 3; + public static final byte MIDDLE_LEFT = 4; + public static final byte MIDDLE_CENTER = 5; + public static final byte MIDDLE_RIGHT = 6; + public static final byte BOTTOM_CENTER = 7; + public static final byte BOTTOM_RIGHT = 8; + private final int _type; private final int _sysMessageId; private final int _unk1; @@ -48,15 +58,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket private List _parameters; // Localisation related. private String _lang; - // Positions - public static final byte TOP_LEFT = 0x01; - public static final byte TOP_CENTER = 0x02; - public static final byte TOP_RIGHT = 0x03; - public static final byte MIDDLE_LEFT = 0x04; - public static final byte MIDDLE_CENTER = 0x05; - public static final byte MIDDLE_RIGHT = 0x06; - public static final byte BOTTOM_CENTER = 0x07; - public static final byte BOTTOM_RIGHT = 0x08; public void setLang(String lang) { @@ -265,7 +266,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SCREEN_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -284,9 +284,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(sml.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -308,9 +308,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -318,7 +318,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket } } } - packet.writeD(_type); packet.writeD(_sysMessageId); packet.writeD(_position); @@ -326,9 +325,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java index 29ab5d355f..6123b08991 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java @@ -37,7 +37,6 @@ public class ExShowSeedInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _seeds = (nextPeriod && !manor.isManorApproved()) ? null : manor.getSeedProduction(manorId, nextPeriod); } @@ -46,16 +45,14 @@ public class ExShowSeedInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown if (_seeds == null) { packet.writeD(0); return true; } - packet.writeD(_seeds.size()); for (SeedProduction seed : _seeds) { @@ -67,17 +64,17 @@ public class ExShowSeedInfo implements IClientOutgoingPacket if (s == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(s.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(s.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(s.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java index 009dce459b..7c757f08a9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java @@ -32,15 +32,12 @@ public class ExShowSeedMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_MAP_INFO.writeId(packet); - packet.writeD(2); // seed count - // Seed of Destruction packet.writeD(-246857); // x coord packet.writeD(251960); // y coord packet.writeD(4331); // z coord packet.writeD(2770 + GraciaSeedsManager.getInstance().getSoDState()); // sys msg id - // Seed of Infinity packet.writeD(-213770); // x coord packet.writeD(210760); // y coord diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index 4fd891a466..373c314eba 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -62,10 +62,8 @@ public class ExShowSeedSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getSeedId()); // seed id diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 1994402da2..269bec5b97 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -47,7 +47,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _cropsItems.put(cropId, item); } } - for (CropProcure crop : CastleManorManager.getInstance().getCropProcure(_manorId, false)) { if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) @@ -61,7 +60,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_cropsItems.size()); // size for (Item item : _cropsItems.values()) @@ -70,9 +68,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket packet.writeD(item.getObjectId()); // Object id packet.writeD(item.getId()); // crop id packet.writeD(seed.getLevel()); // seed level - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(1)); // reward 1 id - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(2)); // reward 2 id if (_castleCrops.containsKey(item.getId())) { @@ -85,9 +83,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket else { packet.writeD(0xFFFFFFFF); // manor - packet.writeQ(0x00); // buy residual - packet.writeQ(0x00); // buy price - packet.writeC(0x00); // reward + packet.writeQ(0); // buy residual + packet.writeQ(0); // buy price + packet.writeC(0); // reward } packet.writeQ(item.getCount()); // my crops } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index db4bccc928..b61d5b2301 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -40,7 +40,6 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { @@ -50,17 +49,17 @@ public class ExShowSentPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getReceiverName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); - packet.writeD(0x01); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(msg.isUnread() ? 1 : 0); + packet.writeD(1); + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(0); } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java index 0e4e9fd2ef..0dca57f2f8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java @@ -48,7 +48,6 @@ public class ExShowTerritory implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TERRITORY.writeId(packet); - packet.writeD(_vertices.size()); packet.writeD(_minZ); packet.writeD(_maxZ); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java index 4e284f82c5..86e1009bbf 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java @@ -46,7 +46,6 @@ public class ExShowTrace implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TRACE.writeId(packet); - packet.writeH(0); // type broken in H5 packet.writeD(0); // time broken in H5 packet.writeH(_locations.size()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java index 3245767ed7..836a5c9624 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java @@ -44,7 +44,6 @@ public class ExShowUsm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_USM.writeId(packet); - packet.writeD(_videoId); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java index 4acdffa842..1f1a14c31b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java @@ -34,7 +34,6 @@ public class ExShowVariationCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_CANCEL_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java index 3a2298019e..9870424e26 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java @@ -35,7 +35,6 @@ public class ExShowVariationMakeWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_MAKE_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java index 169827bab3..86211c8d97 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java @@ -44,10 +44,9 @@ public class ExSpawnEmitter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SPAWN_EMITTER.writeId(packet); - packet.writeD(_npcObjectId); packet.writeD(_playerObjectId); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java index 620800c1c4..534549b4fe 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java @@ -36,7 +36,6 @@ public class ExStartScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_START_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java index 0bd990cf34..babac59129 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java index 0e2689d598..d3e67afe99 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipObjId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java index 44b064113f..f5b3e1340f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java @@ -36,7 +36,6 @@ public class ExStopScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index 0b1e077353..7c8def3864 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -66,7 +66,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket } OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet); - packet.writeD(_inventory); packet.writeD(_warehouse); packet.writeD(_freight); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java index 3293a5b557..57563ca2f9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java @@ -39,7 +39,6 @@ public class ExSubPledgeSkillAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUB_PLEDGET_SKILL_ADD.writeId(packet); - packet.writeD(_type); packet.writeD(_skillId); packet.writeD(_skillLevel); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java index d61dfa20ab..816d6f16a6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java @@ -97,7 +97,6 @@ public class ExSubjobInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUBJOB_INFO.writeId(packet); - packet.writeC(_type); packet.writeD(_currClassId); packet.writeD(_currRace); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java index 85616016c7..b7a152629d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java @@ -38,7 +38,6 @@ public class ExTacticalSign implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TACTICAL_SIGN.writeId(packet); - packet.writeD(_target.getObjectId()); packet.writeD(_tokenId); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java index 3486e6281d..9e03a8bd0a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java @@ -39,7 +39,6 @@ public class ExTeleportToLocationActivate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_TO_LOCATION_ACTIVATE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java index a214c53a0f..7bcddd964d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java @@ -27,6 +27,7 @@ public class ExUISetting implements IClientOutgoingPacket { public static final String UI_KEY_MAPPING_VAR = "UI_KEY_MAPPING"; public static final String SPLIT_VAR = " "; + private final byte[] _uiKeyMapping; public ExUISetting(Player player) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java index 187770cfc8..eff4285a8b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java @@ -37,7 +37,6 @@ public class ExUnReadMailCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_UN_READ_MAIL_COUNT.writeId(packet); - packet.writeD(_mailUnreadCount); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java index f992b3c937..e59c651371 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java @@ -41,7 +41,6 @@ public class ExUseSharedGroupItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USE_SHARED_GROUP_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeD(_grpId); packet.writeD(_remainingTime); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java index 474fcc5208..f49d451587 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class ExUserInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getTransformationId()); - final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); final boolean isInvisible = _player.isInvisible(); packet.writeD(abnormalVisualEffects.size() + (isInvisible ? 1 : 0)); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java index b841449ab3..1069a64e3e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java @@ -36,12 +36,9 @@ public class ExUserInfoCubic implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_CUBIC.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(_player.getCubics().size()); - _player.getCubics().keySet().forEach(packet::writeH); - packet.writeD(_player.getAgathionId()); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java index 048986d108..7a0d1bfd74 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java @@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExUserInfoEquipSlot extends AbstractMaskPacket { private final Player _player; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -63,11 +62,9 @@ public class ExUserInfoEquipSlot extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_EQUIP_SLOT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(InventorySlot.values().length); packet.writeB(_masks); - final PlayerInventory inventory = _player.getInventory(); for (InventorySlot slot : InventorySlot.values()) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java index 3eb1cf9578..d655e48843 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java @@ -36,7 +36,6 @@ public class ExUserInfoInvenWeight implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_INVEN_WEIGHT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java index 91e0e92338..16aa81e9c0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java @@ -44,7 +44,6 @@ public class ExValidateLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java index 727267c9d5..50cb4025e4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java @@ -35,7 +35,6 @@ public class ExVariationCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_CANCEL_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java index 5cdc1b8d0e..4fde190ae2 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java @@ -32,14 +32,13 @@ public class ExVariationResult implements IClientOutgoingPacket { _option1 = option1; _option2 = option2; - _success = success ? 0x01 : 0x00; + _success = success ? 1 : 0; } @Override public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_RESULT.writeId(packet); - packet.writeD(_option1); packet.writeD(_option2); packet.writeD(_success); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java index db0acfd5ff..60fb57c0b3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java @@ -41,10 +41,9 @@ public class ExVitalityEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_EFFECT_INFO.writeId(packet); - packet.writeD(_points); packet.writeD(_vitalityBonus); // Vitality Bonus - packet.writeH(0x00); // Vitality additional bonus in % + packet.writeH(0); // Vitality additional bonus in % packet.writeH(_vitalityItemsRemaining); // How much vitality items remaining for use packet.writeH(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java index 3cd9d26602..9a401c2321 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java @@ -35,7 +35,6 @@ public class ExVitalityPointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_POINT_INFO.writeId(packet); - packet.writeD(_vitalityPoints); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java index 71baff96ea..c4c5539ca4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java @@ -45,7 +45,6 @@ public class ExVoteSystemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VOTE_SYSTEM_INFO.writeId(packet); - packet.writeD(_recomLeft); packet.writeD(_recomHave); packet.writeD(_bonusTime); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java index 21411f5abc..452b0dc43a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java @@ -37,7 +37,6 @@ public class ExWorldChatCnt implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_WORLD_CHAT_CNT.writeId(packet); - packet.writeD(_points); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java index 7e252afb21..2760599847 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java @@ -82,15 +82,13 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // vehicleId + packet.writeD(0); // vehicleId packet.writeD(_objId); packet.writeS(_npc.getName()); - packet.writeH(_npc.getRace().ordinal()); - packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 0x01 : 0x00); + packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 1 : 0); packet.writeD(_fpcHolder.getClassId()); - - packet.writeD(0x00); // Inventory.PAPERDOLL_UNDER + packet.writeD(0); // Inventory.PAPERDOLL_UNDER packet.writeD(_fpcHolder.getEquipHead()); packet.writeD(_fpcHolder.getEquipRHand()); packet.writeD(_fpcHolder.getEquipLHand()); @@ -102,28 +100,22 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_fpcHolder.getEquipRHand()); // dual hand packet.writeD(_fpcHolder.getEquipHair()); packet.writeD(_fpcHolder.getEquipHair2()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderAugument()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } - packet.writeC(_fpcHolder.getArmorEnchantLevel()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderVisualId()) { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeC(_npc.getScriptValue()); // getPvpFlag() packet.writeD(_npc.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -134,16 +126,12 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_npc.getCollisionRadius()); packet.writeF(_npc.getCollisionHeight()); - packet.writeD(_fpcHolder.getHair()); packet.writeD(_fpcHolder.getHairColor()); packet.writeD(_fpcHolder.getFace()); - packet.writeS(_npc.getTemplate().getTitle()); - if (_clan != null) { packet.writeD(_clan.getId()); @@ -153,71 +141,51 @@ public class FakePlayerInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - - packet.writeC(0x01); // isSitting() ? 0x00 : 0x01 (at some initial tests it worked) - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); - packet.writeC(_npc.isInCombat() ? 0x01 : 0x00); - - packet.writeC(_npc.isAlikeDead() ? 0x01 : 0x00); - - packet.writeC(_npc.isInvisible() ? 0x01 : 0x00); - - packet.writeC(0x00); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount - packet.writeC(0x00); // getPrivateStoreType().getId() - - packet.writeH(0x00); // getCubics().size() + packet.writeC(1); // isSitting() ? 0 : 1 (at some initial tests it worked) + packet.writeC(_npc.isRunning() ? 1 : 0); + packet.writeC(_npc.isInCombat() ? 1 : 0); + packet.writeC(_npc.isAlikeDead() ? 1 : 0); + packet.writeC(_npc.isInvisible() ? 1 : 0); + packet.writeC(0); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount + packet.writeC(0); // getPrivateStoreType().getId() + packet.writeH(0); // getCubics().size() // getCubics().keySet().forEach(packet::writeH); - packet.writeC(0x00); - + packet.writeC(0); packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : 0); packet.writeH(_fpcHolder.getRecommends()); - packet.writeD(0x00); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 - + packet.writeD(0); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 packet.writeD(_fpcHolder.getClassId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(_fpcHolder.getWeaponEnchantLevel()); // isMounted() ? 0 : _enchantLevel - packet.writeC(_npc.getTeam().getId()); - - packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0x00); + packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0); packet.writeC(_fpcHolder.getNobleLevel()); - packet.writeC(_fpcHolder.isHero() ? 0x01 : 0x00); - - packet.writeC(_fpcHolder.isFishing() ? 0x01 : 0x00); - + packet.writeC(_fpcHolder.isHero() ? 1 : 0); + packet.writeC(_fpcHolder.isFishing() ? 1 : 0); packet.writeD(_fpcHolder.getBaitLocationX()); packet.writeD(_fpcHolder.getBaitLocationY()); packet.writeD(_fpcHolder.getBaitLocationZ()); - packet.writeD(_fpcHolder.getNameColor()); - packet.writeD(_heading); - packet.writeC(_fpcHolder.getPledgeStatus()); - packet.writeH(0x00); // getPledgeType() - + packet.writeH(0); // getPledgeType() packet.writeD(_fpcHolder.getTitleColor()); - - packet.writeC(0x00); // isCursedWeaponEquipped - - packet.writeD(0x00); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 - packet.writeD(0x00); // getTransformationDisplayId() + packet.writeC(0); // isCursedWeaponEquipped + packet.writeD(0); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 + packet.writeD(0); // getTransformationDisplayId() packet.writeD(_fpcHolder.getAgathionId()); - - packet.writeC(0x00); - - packet.writeD(0x00); // getCurrentCp() + packet.writeC(0); + packet.writeD(0); // getCurrentCp() packet.writeD(_npc.getMaxHp()); packet.writeD((int) Math.round(_npc.getCurrentHp())); packet.writeD(_npc.getMaxMp()); packet.writeD((int) Math.round(_npc.getCurrentMp())); - - packet.writeC(0x00); + packet.writeC(0); final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) @@ -228,9 +196,9 @@ public class FakePlayerInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(0x00); // cocPlayer.getPosition() - packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 0x01 : 0x00); - packet.writeC(0x00); // Used Ability Points + packet.writeC(0); // cocPlayer.getPosition() + packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 1 : 0); + packet.writeC(0); // Used Ability Points return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java index ae088538da..03223c8a3e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java @@ -62,7 +62,6 @@ public class FlyToLocation implements IClientOutgoingPacket _destY = destY; _destZ = destZ; _type = type; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -82,7 +81,6 @@ public class FlyToLocation implements IClientOutgoingPacket _flySpeed = flySpeed; _flyDelay = flyDelay; _animationSpeed = animationSpeed; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -103,7 +101,6 @@ public class FlyToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FLY_TO_LOCATION.writeId(packet); - packet.writeD(_chaObjId); packet.writeD(_destX); packet.writeD(_destY); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java index 1e52b0ef72..471d70f791 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java @@ -35,8 +35,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x01); + packet.writeC(1); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 602a9260ce..fc58bddabd 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -50,7 +50,6 @@ public class GMHennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GMHENNA_INFO.writeId(packet); - packet.writeD(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeD(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeD(_player.getHennaValue(BaseStat.CON)); // equip CON @@ -64,19 +63,19 @@ public class GMHennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(0x01); + packet.writeD(1); } if (_player.getHenna(4) != null) { packet.writeD(_player.getHenna(4).getDyeId()); - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 1 : 0); } else { - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid } return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java index 38ca4c7be0..59bf0d9d93 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java @@ -38,7 +38,6 @@ public class GMHide implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_HIDE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index c9bdff3ca6..577bf7c2c2 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -50,7 +50,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -79,28 +78,24 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); packet.writeD(_player.getPkKills()); - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollObjectId(slot)); } - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); } - for (int slot : getPaperdollOrder()) { final VariationInstance augment = _player.getInventory().getPaperdollAugmentation(slot); packet.writeD(augment != null ? augment.getOption1Id() : 0); // Confirmed packet.writeD(augment != null ? augment.getOption2Id() : 0); // Confirmed } - packet.writeC(_player.getInventory().getTalismanSlots()); // CT2.3 packet.writeC(_player.getInventory().canEquipCloak() ? 1 : 0); // CT2.3 - packet.writeD(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeH(0); packet.writeD(_player.getPAtk()); packet.writeD(_player.getPAtkSpd()); packet.writeD(_player.getPDef()); @@ -108,18 +103,14 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAccuracy()); packet.writeD(_player.getCriticalHit()); packet.writeD(_player.getMAtk()); - packet.writeD(_player.getMAtkSpd()); packet.writeD(_player.getPAtkSpd()); - packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicEvasionRate()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name packet.writeD(_player.getReputation()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -135,8 +126,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeD(_player.isGM() ? 0x01 : 0x00); // builder level - + packet.writeD(_player.isGM() ? 1 : 0); // builder level packet.writeS(_player.getTitle()); packet.writeD(_player.getClanId()); // pledge id packet.writeD(_player.getClanCrestId()); // pledge crest id @@ -146,26 +136,19 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeC(_player.hasDwarvenCraft() ? 1 : 0); packet.writeD(_player.getPkKills()); packet.writeD(_player.getPvpKills()); - packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); - - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeC(321); - packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window - packet.writeC(_player.getNobleLevel()); - packet.writeC(_player.isHero() ? 0x01 : 0x00); - + packet.writeC(_player.isHero() ? 1 : 0); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); - final AttributeType attackAttribute = _player.getAttackElement(); packet.writeH(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); @@ -175,8 +158,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket } packet.writeD(_player.getFame()); packet.writeD(_player.getVitalityPoints()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index f212539af7..41f151be6f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -55,10 +55,9 @@ public class GMViewItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_ITEM_LIST.writeId(packet); - packet.writeS(_playerName); packet.writeD(_limit); // inventory limit - packet.writeH(0x01); // show window ?? + packet.writeH(1); // show window ?? packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index 1d88596096..552b6e6168 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -37,14 +37,12 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_player.getName()); packet.writeD(_clan.getId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); @@ -52,15 +50,14 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 packet.writeD(_clan.getAllyCrestId()); // c2 packet.writeD(_clan.isAtWar() ? 1 : 0); // c3 - packet.writeD(0x00); // T3 Unknown - + packet.writeD(0); // T3 Unknown packet.writeD(_clan.getMembers().size()); for (ClanMember member : _clan.getMembers()) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java index 93af10e254..3c155ff816 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -38,10 +38,8 @@ public class GMViewSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_SKILL_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_skills.size()); - final boolean isDisabled = (_player.getClan() != null) && (_player.getClan().getReputationScore() < 0); for (Skill skill : _skills) { @@ -49,7 +47,7 @@ public class GMViewSkillInfo implements IClientOutgoingPacket packet.writeH(skill.getDisplayLevel()); packet.writeH(skill.getSubLevel()); packet.writeD(skill.getDisplayId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(isDisabled && skill.isClanSkill() ? 1 : 0); packet.writeC(skill.isEnchantable() ? 1 : 0); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java index d8c273f914..449271993b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java @@ -35,7 +35,6 @@ public class GameGuardQuery implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GAME_GUARD_QUERY.writeId(packet); - packet.writeD(0x27533DD9); packet.writeD(0x2E72A51D); packet.writeD(0x2017038B); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index b0c011b696..037b2e6b6b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -35,10 +35,8 @@ public class GetItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ITEM.writeId(packet); - packet.writeD(_playerId); packet.writeD(_item.getObjectId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java index f8c6126c87..5f4d7bf3ca 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java @@ -50,7 +50,6 @@ public class GetOffVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_OFF_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_x); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java index ffa8d5f310..77d1e6ba28 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java @@ -45,7 +45,6 @@ public class GetOnVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ON_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java index e5dcb9ded6..b1f5b588f9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java @@ -44,14 +44,13 @@ public class GmViewQuestInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_QUEST_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeH(_questList.size()); // quest count - for (Quest quest : _questList) { final QuestState qs = _player.getQuestState(quest.getName()); packet.writeD(quest.getId()); packet.writeD(qs == null ? 0 : qs.getCond()); } - packet.writeH(0x00); // some size + packet.writeH(0); // some size // for size; ddQQ return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 395487097c..4309e2d74f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -51,7 +51,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeQ(_player.getAdena()); // activeChar current amount of Adena packet.writeD(3); // available equip slot packet.writeD(_hennaEquipList.size()); - for (Henna henna : _hennaEquipList) { // Player must have at least one dye in inventory @@ -62,8 +61,8 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); // item Id of the dye packet.writeQ(henna.getWearCount()); // amount of dyes required packet.writeQ(henna.getWearFee()); // amount of Adena required - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not - packet.writeD(0x00); // TODO: Find me! + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // meet the requirement or not + packet.writeD(0); // TODO: Find me! } } return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 191537b4e7..9cfbd781a6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -51,7 +51,6 @@ public class HennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_INFO.writeId(packet); - packet.writeD(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeD(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeD(_player.getHennaValue(BaseStat.CON)); // equip CON @@ -65,9 +64,8 @@ public class HennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); } - final Henna premium = _player.getHenna(4); if (premium != null) { @@ -77,16 +75,15 @@ public class HennaInfo implements IClientOutgoingPacket final long currentTime = Chronos.currentTimeMillis(); duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000; } - packet.writeD(premium.getDyeId()); packet.writeD(duration); // Premium Slot Dye Time Left - packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 1 : 0); } else { - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid } return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 13b7decd2c..3dae152163 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -40,12 +40,11 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_ITEM_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getWearCount()); // total amount of dye require packet.writeQ(_henna.getWearFee()); // total amount of Adena require to draw symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to draw or not 0 is false and 1 is true + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to draw or not 0 is false and 1 is true packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeD(_player.getINT() + _player.getHennaValue(BaseStat.INT)); // equip INT @@ -63,7 +62,7 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket packet.writeD(_player.getLUC() + _player.getHennaValue(BaseStat.LUC)); // equip LUC packet.writeD(_player.getCHA()); // current CHA packet.writeD(_player.getCHA() + _player.getHennaValue(BaseStat.CHA)); // equip CHA - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index def8687969..beb630c820 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -40,12 +40,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getCancelCount()); // total amount of dye require packet.writeQ(_henna.getCancelFee()); // total amount of Adena require to remove symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to remove or not + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to remove or not packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeD(_player.getINT() - _player.getHennaValue(BaseStat.INT)); // equip INT @@ -63,7 +62,7 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket packet.writeD(_player.getLUC() - _player.getHennaValue(BaseStat.LUC)); // equip LUC packet.writeD(_player.getCHA()); // current CHA packet.writeD(_player.getCHA() - _player.getHennaValue(BaseStat.CHA)); // equip CHA - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 844fad86c7..452d354ac4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -39,7 +39,7 @@ public class HennaRemoveList implements IClientOutgoingPacket OutgoingPackets.HENNA_UNEQUIP_LIST.writeId(packet); packet.writeQ(_player.getAdena()); final boolean premiumSlotEnabled = _player.getHenna(4) != null; - packet.writeD(premiumSlotEnabled ? 0x04 : 0x03); // seems to be max size + packet.writeD(premiumSlotEnabled ? 4 : 3); // seems to be max size packet.writeD((premiumSlotEnabled ? 4 : 3) - _player.getHennaEmptySlots()); // slots used for (Henna henna : _player.getHennaList()) { @@ -49,8 +49,8 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); packet.writeQ(henna.getCancelCount()); packet.writeQ(henna.getCancelFee()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index 650261e010..9399a1626e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -62,14 +62,12 @@ public interface IClientOutgoingPacket extends IOutgoingPacket Inventory.PAPERDOLL_BROOCH_JEWEL5, Inventory.PAPERDOLL_BROOCH_JEWEL6 }; - int[] PAPERDOLL_ORDER_AUGMENT = new int[] { Inventory.PAPERDOLL_RHAND, Inventory.PAPERDOLL_LHAND, Inventory.PAPERDOLL_RHAND }; - int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 0c54e810f0..3378827f34 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -46,7 +46,6 @@ public class InventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index 8735b315b6..7912558f00 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -47,8 +47,7 @@ public class ItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.ITEM_LIST.writeId(packet); - - packet.writeH(_showWindow ? 0x01 : 0x00); + packet.writeH(_showWindow ? 1 : 0); packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java index b32b4df4a3..c3b9918230 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java @@ -32,9 +32,8 @@ public class JoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PARTY.writeId(packet); - packet.writeD(_response); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java index 65e06efeb7..f347f7efcd 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java @@ -32,7 +32,6 @@ public class JoinPledge implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PLEDGE.writeId(packet); - packet.writeD(_pledgeId); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index 96f6d7c34d..996622b9e9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -35,17 +35,16 @@ public class KeyPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VERSION_CHECK.writeId(packet); - packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok for (int i = 0; i < 8; i++) { packet.writeC(_key[i]); // key } - packet.writeD(0x01); + packet.writeD(1); packet.writeD(Config.SERVER_ID); // server id - packet.writeC(0x01); - packet.writeD(0x00); // obfuscation key - packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 0x01 : 0x00); // isClassic + packet.writeC(1); + packet.writeD(0); // obfuscation key + packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 1 : 0); // isClassic return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java index 484c10f0c4..62424fd03a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java @@ -40,7 +40,6 @@ public class L2FriendSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_SAY.writeId(packet); - packet.writeD(0); // ?? packet.writeS(_receiver); packet.writeS(_sender); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java index c7c3243833..a6703a1e9d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ListPartyWaiting implements IClientOutgoingPacket { + private static final int NUM_PER_PAGE = 64; + private final List _rooms = new LinkedList<>(); private final int _size; - private static final int NUM_PER_PAGE = 64; - public ListPartyWaiting(PartyMatchingRoomLevelType type, int location, int page, int requestorLevel) { final List rooms = MatchingRoomManager.getInstance().getPartyMathchingRooms(location, type, requestorLevel); @@ -56,7 +56,6 @@ public class ListPartyWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_PARTY_WATING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java index b647ba2e8f..f1e3158eb9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java @@ -48,7 +48,6 @@ public class LoginFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LOGIN_FAIL.writeId(packet); - packet.writeD(_reason); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java index 18a522c315..6743e3e66f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java @@ -32,7 +32,6 @@ public class MagicSkillCanceld implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_CANCELED.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java index d56de10079..7ab29cc1a8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java @@ -66,7 +66,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // MagicSkillUse castingType packet.writeD(_objectId); packet.writeD(_skillId); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java index 3df8463279..a86626cfa6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java @@ -84,7 +84,6 @@ public class MagicSkillUse implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_USE.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // Casting bar type: 0 - default, 1 - default up, 2 - blue, 3 - green, 4 - red. packet.writeD(_creature.getObjectId()); packet.writeD(_target.getObjectId()); @@ -111,7 +110,7 @@ public class MagicSkillUse implements IClientOutgoingPacket packet.writeD(_target.getX()); packet.writeD(_target.getY()); packet.writeD(_target.getZ()); - packet.writeD(_actionId >= 0 ? 0x01 : 0x00); // 1 when ID from RequestActionUse is used + packet.writeD(_actionId >= 0 ? 1 : 0); // 1 when ID from RequestActionUse is used packet.writeD(_actionId >= 0 ? _actionId : 0); // ID from RequestActionUse. Used to set cooldown on summon skills. return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java index 6b710c692e..12e2488f24 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java @@ -37,11 +37,9 @@ public class ManagePledgePower implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet); - packet.writeD(_rank); packet.writeD(_action); packet.writeD(_clan.getRankPrivs(_rank).getBitmask()); - return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 95f4b6f201..4e2ab3f00b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -42,11 +42,9 @@ public class MonRaceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MON_RACE_INFO.writeId(packet); - packet.writeD(_unknown1); packet.writeD(_unknown2); - packet.writeD(0x08); - + packet.writeD(8); for (int i = 0; i < 8; i++) { packet.writeD(_monsters[i].getObjectId()); // npcObjectID @@ -68,7 +66,7 @@ public class MonRaceInfo implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java index 0093b3edc9..e6386921ff 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java @@ -45,13 +45,10 @@ public class MoveToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_xDst); packet.writeD(_yDst); packet.writeD(_zDst); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java index b1fb3ea003..59103c6c4c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java @@ -48,7 +48,6 @@ public class MoveToLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java index 30ff3c96af..aa261f924f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java @@ -50,11 +50,9 @@ public class MoveToPawn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_PAWN.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetId); packet.writeD(_distance); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index 21d0020372..a700df8524 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -58,15 +58,13 @@ public class MultiSellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.MULTI_SELL_LIST.writeId(packet); - packet.writeD(_list.getId()); // list id - packet.writeC(0x00); // GOD Unknown + packet.writeC(0); // GOD Unknown packet.writeD(1 + (_index / PAGE_SIZE)); // page started from 1 - packet.writeD(_finished ? 0x01 : 0x00); // finished + packet.writeD(_finished ? 1 : 0); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window - + packet.writeC(_list.isChanceMultisell() ? 1 : 0); // new multisell window while (_size-- > 0) { ItemInfo itemEnchantment = _list.getItemEnchantment(_index); @@ -83,19 +81,15 @@ public class MultiSellList extends AbstractItemPacket } } } - packet.writeD(_index); // Entry ID. Start from 1. packet.writeC(entry.isStackable() ? 1 : 0); - // Those values will be passed down to MultiSellChoose packet. packet.writeH(itemEnchantment != null ? itemEnchantment.getEnchantLevel() : 0); // enchant level writeItemAugment(packet, itemEnchantment); writeItemElemental(packet, itemEnchantment); writeItemEnsoulOptions(packet, itemEnchantment); - packet.writeH(entry.getProducts().size()); packet.writeH(entry.getIngredients().size()); - for (ItemChanceHolder product : entry.getProducts()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(product.getId()); @@ -119,7 +113,6 @@ public class MultiSellList extends AbstractItemPacket writeItemElemental(packet, displayItemEnchantment); writeItemEnsoulOptions(packet, displayItemEnchantment); } - for (ItemChanceHolder ingredient : entry.getIngredients()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(ingredient.getId()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java index 5482659004..29265f5734 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java @@ -45,10 +45,9 @@ public class MyTargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MY_TARGET_SELECTED.writeId(packet); - packet.writeD(_objectId); packet.writeH(_color); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java index 1901ad1297..166c5c1e00 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java @@ -36,7 +36,6 @@ public class NewCharacterSuccess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NEW_CHARACTER_SUCCESS.writeId(packet); - packet.writeD(_chars.size()); for (PlayerTemplate chr : _chars) { @@ -44,31 +43,24 @@ public class NewCharacterSuccess implements IClientOutgoingPacket { continue; } - // TODO: Unhardcode these packet.writeD(chr.getRace().ordinal()); packet.writeD(chr.getClassId().getId()); - packet.writeD(99); packet.writeD(chr.getBaseSTR()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseDEX()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseCON()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseINT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseWIT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseMEN()); packet.writeD(1); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java index be1605f679..6061ea26ef 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java @@ -38,7 +38,6 @@ public class NicknameChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NICK_NAME_CHANGED.writeId(packet); - packet.writeD(_objectId); packet.writeS(_title); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index f9cd107e2c..3e4837b4a4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -54,24 +54,20 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public NpcHtmlMessage(int npcObjId, int itemId) { super(npcObjId); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } public NpcHtmlMessage(int npcObjId, int itemId, String html) { super(npcObjId, html); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } @@ -79,11 +75,10 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java index 61f195e35d..05489103cb 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java @@ -47,10 +47,8 @@ public class NpcInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -58,7 +56,6 @@ public class NpcInfo extends AbstractMaskPacket private int _clanId = 0; private int _statusMask = 0; private final Set _abnormalVisualEffects; - private String[] _localisation; public void setLang(String lang) @@ -101,112 +98,90 @@ public class NpcInfo extends AbstractMaskPacket { addComponentType(NpcInfoType.HEADING); } - if ((npc.getStat().getPAtkSpd() > 0) || (npc.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (npc.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((npc.getLeftHandItem() > 0) || (npc.getRightHandItem() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (npc.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (npc.getDisplayEffect() > 0) { addComponentType(NpcInfoType.DISPLAY_EFFECT); } - if (npc.isInsideZone(ZoneId.WATER) || npc.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (npc.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (npc.getCloneObjId() > 0) { addComponentType(NpcInfoType.CLONE); } - if (npc.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (npc.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (npc.getCurrentHp() <= npc.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (npc.getCurrentMp() <= npc.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (npc.getTemplate().isUsingServerSideName()) { addComponentType(NpcInfoType.NAME); } - if (npc.getTemplate().isUsingServerSideTitle() || (npc.isMonster() && (Config.SHOW_NPC_LEVEL || Config.SHOW_NPC_AGGRESSION)) || npc.isChampion() || npc.isTrap()) { addComponentType(NpcInfoType.TITLE); } - if (npc.getNameString() != null) { addComponentType(NpcInfoType.NAME_NPCSTRINGID); } - if (npc.getTitleString() != null) { addComponentType(NpcInfoType.TITLE_NPCSTRINGID); } - if (_npc.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (!_abnormalVisualEffects.isEmpty() || npc.isInvisible()) { addComponentType(NpcInfoType.ABNORMALS); } - if (npc.getEnchantEffect() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (npc.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (npc.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (npc.getClanId() > 0) { final Clan clan = ClanTable.getInstance().getClan(npc.getClanId()); @@ -220,14 +195,11 @@ public class NpcInfo extends AbstractMaskPacket addComponentType(NpcInfoType.CLAN); } } - addComponentType(NpcInfoType.COLOR_EFFECT); - if (npc.getPvpFlag() > 0) { addComponentType(NpcInfoType.PVP_FLAG); } - // TODO: Confirm me if (npc.isInCombat()) { @@ -245,8 +217,7 @@ public class NpcInfo extends AbstractMaskPacket { _statusMask |= 0x08; } - - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -296,27 +267,23 @@ public class NpcInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO.writeId(packet); - packet.writeD(_npc.getObjectId()); - packet.writeC(_npc.isShowSummonAnimation() ? 0x02 : 0x00); // // 0=teleported 1=default 2=summoned + packet.writeC(_npc.isShowSummonAnimation() ? 2 : 0); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 0x01 : 0x00); + packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { String title = _npc.getTitle(); - // Localisation related. if ((_localisation != null) && !_localisation[1].equals("")) { @@ -329,10 +296,8 @@ public class NpcInfo extends AbstractMaskPacket title = title.replace(NpcData.getInstance().getTemplate(_npc.getId()).getTitle(), _localisation[1]); } } - packet.writeS(title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -351,7 +316,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -366,20 +331,20 @@ public class NpcInfo extends AbstractMaskPacket if (containsMask(NpcInfoType.EQUIPPED)) { packet.writeD(_npc.getRightHandItem()); - packet.writeD(0x00); // Armor id? + packet.writeD(0); // Armor id? packet.writeD(_npc.getLeftHandItem()); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_npc.isDead() ? 0x00 : 0x01); + packet.writeC(_npc.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); + packet.writeC(_npc.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 0x01 : _npc.isFlying() ? 0x02 : 0x00); + packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -391,7 +356,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_npc.isFlying() ? 0x01 : 0x00); + packet.writeD(_npc.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { @@ -427,12 +392,12 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(0x00); // 2 - do some animation on spawn + packet.writeC(0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -464,12 +429,10 @@ public class NpcInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java index c95a8e5274..923e9cebad 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class NpcInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_npc.getObjectId()); packet.writeD(_npc.getTransformationDisplayId()); - final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size()); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java index a294edc57a..2a0ba41eeb 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java @@ -38,7 +38,6 @@ public class NpcQuestHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NPC_QUEST_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_questId); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java index d3328ade97..fc6d0d4a3a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java @@ -106,7 +106,6 @@ public class NpcSay implements IClientOutgoingPacket { _parameters = new ArrayList<>(); } - for (String item : params) { if ((item != null) && (item.length() > 0)) @@ -127,11 +126,9 @@ public class NpcSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_SAY.writeId(packet); - packet.writeD(_objectId); packet.writeD(_textType.getClientId()); packet.writeD(_npcId); - // Localisation related. if (_lang != null) { @@ -147,7 +144,6 @@ public class NpcSay implements IClientOutgoingPacket } } } - packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java index 356e3f48a9..ac61f9d247 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java @@ -33,11 +33,10 @@ public class ObservationMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_START.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me packet.writeD(0xc0); // TODO: Find me return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java index 5c0a0766b3..896ccea02b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java @@ -33,7 +33,6 @@ public class ObservationReturn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_END.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java index c2f7ab404f..173772c870 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java @@ -37,7 +37,6 @@ public class OnEventTrigger implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EVENT_TRIGGER.writeId(packet); - packet.writeD(_emitterId); packet.writeC(_enabled); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index d499719f31..70a51b2b0d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -44,7 +44,6 @@ public class PackageSendableList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet); - packet.writeD(_objectId); packet.writeQ(_adena); packet.writeD(_items.size()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java index a53f589386..e24d63f717 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java @@ -39,7 +39,6 @@ public class PackageToList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_TO_LIST.writeId(packet); - packet.writeD(_players.size()); for (Entry entry : _players.entrySet()) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 655c7abcd1..44b23b37f4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -55,7 +55,6 @@ public class PartyMemberPosition implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); - packet.writeD(locations.size()); for (Entry entry : locations.entrySet()) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java index 9e275ec246..c9d3595037 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java @@ -36,7 +36,6 @@ public class PartyRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java index b9c7d06769..8c97cac6b5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java @@ -36,12 +36,10 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ADD.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); // c3 packet.writeD(_party.getDistributionType().getId()); // c3 packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); - packet.writeD((int) _member.getCurrentCp()); // c4 packet.writeD(_member.getMaxCp()); // c4 packet.writeD((int) _member.getCurrentHp()); @@ -51,7 +49,7 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket packet.writeD(_member.getVitalityPoints()); packet.writeC(_member.getLevel()); packet.writeH(_member.getClassId().getId()); - packet.writeC(0x00); + packet.writeC(0); packet.writeH(_member.getRace().ordinal()); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java index 65d0c60c2e..5ad91f5463 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java @@ -37,21 +37,17 @@ public class PartySmallWindowAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ALL.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); packet.writeC(_party.getDistributionType().getId()); packet.writeC(_party.getMemberCount() - 1); - for (Player member : _party.getMembers()) { if ((member != null) && (member != _exclude)) { packet.writeD(member.getObjectId()); packet.writeS(member.getName()); - packet.writeD((int) member.getCurrentCp()); // c4 packet.writeD(member.getMaxCp()); // c4 - packet.writeD((int) member.getCurrentHp()); packet.writeD(member.getMaxHp()); packet.writeD((int) member.getCurrentMp()); @@ -59,7 +55,7 @@ public class PartySmallWindowAll implements IClientOutgoingPacket packet.writeD(member.getVitalityPoints()); packet.writeC(member.getLevel()); packet.writeH(member.getClassId().getId()); - packet.writeC(0x01); // Unk + packet.writeC(1); // Unk packet.writeH(member.getRace().ordinal()); final Summon pet = member.getPet(); packet.writeD(member.getServitors().size() + (pet != null ? 1 : 0)); // Summon size, one only atm diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java index 94a8a5a2ce..09ce132af4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java @@ -33,7 +33,6 @@ public class PartySmallWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_DELETE.writeId(packet); - packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java index c53c6c7779..e9ea2efbbe 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java @@ -42,7 +42,6 @@ public class PartySmallWindowUpdate extends AbstractMaskPacket _summon.getStat().getExp()) { packet.writeQ(_summon.getStat().getExp()); // 0% absolute value @@ -160,9 +148,7 @@ public class PetInfo implements IClientOutgoingPacket { packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value } - packet.writeQ(_summon.getExpForNextLevel()); // 100% absoulte value - packet.writeD(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight packet.writeD(_summon.getMaxLoad()); // max weight it can carry packet.writeD(_summon.getPAtk()); // patk @@ -178,25 +164,20 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD((int) _summon.getStat().getMoveSpeed()); // speed packet.writeD(_summon.getPAtkSpd()); // atkspeed packet.writeD(_summon.getMAtkSpd()); // casting speed - packet.writeC(0); // TODO: Check me, might be ride status packet.writeC(_summon.getTeam().getId()); // Confirmed packet.writeC(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed packet.writeC(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed - - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. - + packet.writeD(0); // TODO: Find me + packet.writeD(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. packet.writeC(_summon.getOwner().getSummonPoints()); // Used Summon Points packet.writeC(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points - final Set aves = _summon.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeH(aves.size()); // Confirmed for (AbnormalVisualEffect ave : aves) { packet.writeH(ave.getClientId()); // Confirmed } - packet.writeC(_statusMask); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 5b43daa74b..1f60ec39d1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -46,7 +46,6 @@ public class PetInventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.PET_INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index e4cf35779f..16dc83b7ed 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -35,7 +35,6 @@ public class PetItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java index fdb00ddbb1..913f65d470 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java @@ -38,7 +38,6 @@ public class PetStatusShow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_SHOW.writeId(packet); - packet.writeD(_summonType); packet.writeD(_summonObjectId); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 25c2c74292..823a8c405a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -52,7 +52,6 @@ public class PetStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_UPDATE.writeId(packet); - packet.writeD(_summon.getSummonType()); packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getX()); @@ -69,7 +68,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket packet.writeQ(_summon.getStat().getExp()); packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value packet.writeQ(_summon.getExpForNextLevel()); // 100% absolute value - packet.writeD(0x01); // TODO: Find me! + packet.writeD(1); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java index 4bc3570779..0898b01f67 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java @@ -63,7 +63,6 @@ public class PlaySound implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLAY_SOUND.writeId(packet); - packet.writeD(_unknown1); // unknown 0 for quest and ship; packet.writeS(_soundFile); packet.writeD(_unknown3); // unknown 0 for quest; 1 for ship; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java index fbe57d4aaf..5108fe7e1b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java @@ -44,7 +44,6 @@ public class PledgeCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java index aa11b1213e..6805f64d7c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java @@ -34,7 +34,6 @@ public class PledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_INFO.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getId()); packet.writeS(_clan.getName()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java index 72f2c71838..193ee17589 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java @@ -36,12 +36,10 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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 - // clan or subpledge name if (_member.getPledgeType() != 0) { @@ -51,7 +49,6 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket { packet.writeS(_member.getClan().getName()); } - packet.writeS(_member.getApprenticeOrSponsorName()); // name of this member's apprentice/sponsor return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java index eefd482979..6aa5067c8f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java @@ -36,7 +36,6 @@ public class PledgeReceivePowerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_POWER_INFO.writeId(packet); - packet.writeD(_member.getPowerGrade()); // power grade packet.writeS(_member.getName()); packet.writeD(_member.getClan().getRankPrivs(_member.getPowerGrade()).getBitmask()); // privileges diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 818c38a076..01f71eea17 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -40,8 +40,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_SUB_PLEDGE_CREATED.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); packet.writeD(_subPledge.getId()); packet.writeS(_subPledge.getName()); packet.writeS(getLeaderName()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java index 4d0efeb82a..7649947064 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java @@ -43,7 +43,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(packet); - packet.writeD(_tab); // page packet.writeD(_clanList.size()); for (ClanWar clanWar : _clanList) @@ -53,7 +52,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket { continue; } - packet.writeS(clan.getName()); packet.writeD(clanWar.getState().ordinal()); // type: 0 = Declaration, 1 = Blood Declaration, 2 = In War, 3 = Victory, 4 = Defeat, 5 = Tie, 6 = Error packet.writeD(clanWar.getRemainingTime()); // Time if friends to start remaining diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java index 2cbbdbf046..80d10fcb66 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java @@ -34,26 +34,25 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_INFO_UPDATE.writeId(packet); - // sending empty data so client will ask all the info in response ;) packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getLevel()); // clan level packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); // castle state ? + packet.writeD(0); // castle state ? packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); // clan reputation score - packet.writeD(0x00); // ? - packet.writeD(0x00); // ? + packet.writeD(0); // ? + packet.writeD(0); // ? packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); // c5 packet.writeD(_clan.getAllyCrestId()); // c5 packet.writeD(_clan.isAtWar() ? 1 : 0); // c5 - packet.writeD(0x00); // TODO: Find me! - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java index ae26e50dbb..2fa9f26d4a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java @@ -51,12 +51,11 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ADD.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); - packet.writeD(0x00); - packet.writeD(0x01); + packet.writeD(0); + packet.writeD(1); packet.writeD(_isOnline); // 1 = online 0 = offline packet.writeD(_pledgeType); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index c5ea7b284b..a1be315cf4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -41,7 +41,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket { _clan = clan; _pledge = pledge; - _pledgeId = _pledge == null ? 0x00 : _pledge.getId(); + _pledgeId = _pledge == null ? 0 : _pledge.getId(); _leaderName = pledge == null ? clan.getLeaderName() : CharNameTable.getInstance().getNameById(pledge.getLeaderId()); _name = pledge == null ? clan.getName() : pledge.getName(); _members = _clan.getMembers(); @@ -65,31 +65,28 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(packet); - - packet.writeD(_isSubPledge ? 0x00 : 0x01); + packet.writeD(_isSubPledge ? 0 : 1); packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_pledgeId); packet.writeS(_name); packet.writeS(_leaderName); - packet.writeD(_clan.getCrestId()); // crest id .. is used again packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); // 0 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(0); // 0 packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.isAtWar() ? 1 : 0); // new c3 - packet.writeD(0x00); // Territory castle ID + packet.writeD(0); // Territory castle ID packet.writeD(_clan.getSubPledgeMembersCount(_pledgeId)); - for (ClanMember m : _members) { if (m.getPledgeType() != _pledgeId) @@ -107,8 +104,8 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket } else { - packet.writeD(0x01); // no visible effect - packet.writeD(0x01); // packet.writeD(1); + packet.writeD(1); // no visible effect + packet.writeD(1); // packet.writeD(1); } packet.writeD(m.isOnline() ? m.getObjectId() : 0); // objectId = online 0 = offline packet.writeD(m.getSponsor() != 0 ? 1 : 0); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java index 0fd387e419..154bcc610d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java @@ -32,7 +32,6 @@ public class PledgeShowMemberListDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_DELETE.writeId(packet); - packet.writeS(_player); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java index c61f412ed0..7b8c7c516b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java @@ -66,7 +66,6 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index 4e89797e45..09f70ea024 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -62,14 +62,14 @@ public class PledgeSkillList implements IClientOutgoingPacket { packet.writeD(sk.getDisplayId()); packet.writeH(sk.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } for (SubPledgeSkill sk : _subSkills) { packet.writeD(sk._subType); // Clan Sub-unit types packet.writeD(sk._skillId); packet.writeH(sk._skillLevel); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java index f3b8d4c26c..a94601294f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java @@ -37,7 +37,6 @@ public class PledgeSkillListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST_ADD.writeId(packet); - packet.writeD(_id); packet.writeD(_level); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java index 9e1b4843ac..5f32f2bf54 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java @@ -33,15 +33,14 @@ public class PledgeStatusChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_STATUS_CHANGED.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getLeaderId()); packet.writeD(_clan.getId()); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getAllyId()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.getCrestLargeId()); - packet.writeD(0x00); // pledge type ? + packet.writeD(0); // pledge type ? return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java index 5b56d0b28d..41d0f9f7d8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java @@ -44,12 +44,10 @@ public class PrivateStoreListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_LIST.writeId(packet); - packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); // Viewer's item count? + packet.writeD(0); // Viewer's item count? packet.writeD(_items.size()); - int slotNumber = 0; for (TradeItem item : _items) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 67b6ba8d94..d72050283e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -43,11 +43,10 @@ public class PrivateStoreListSell extends AbstractItemPacket else { OutgoingPackets.PRIVATE_STORE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index bb462b6cd2..5e95f8b9b8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -43,17 +43,14 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MANAGE_LIST.writeId(packet); - packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(_itemList.size()); // inventory items for potential buy for (Item item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(_buyList.size()); // count for all items already added for buy for (TradeItem item : _buyList) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index 400307eb79..94ff06a790 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -45,18 +45,15 @@ public class PrivateStoreManageListSell extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MANAGE_LIST.writeId(packet); - packet.writeD(_objId); packet.writeD(_packageSale ? 1 : 0); // Package sell packet.writeQ(_playerAdena); - packet.writeD(_itemList.size()); // for potential sells for (TradeItem item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(_sellList.size()); // count for any items already added for sell for (TradeItem item : _sellList) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java index 8a5b9eef92..0d7bcbea16 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgBuy implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java index b00bd2add2..8fdb5701b8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgSell implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java index c3958367e8..5ddaa46ba0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java @@ -40,7 +40,6 @@ public class RadarControl implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RADAR_CONTROL.writeId(packet); - packet.writeD(_showRadar); packet.writeD(_type); // maybe type packet.writeD(_x); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java index 3918894601..5d67413b6f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java @@ -43,10 +43,8 @@ public class RecipeBookItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_BOOK_ITEM_LIST.writeId(packet); - - packet.writeD(_isDwarvenCraft ? 0x00 : 0x01); // 0 = Dwarven - 1 = Common + packet.writeD(_isDwarvenCraft ? 0 : 1); // 0 = Dwarven - 1 = Common packet.writeD(_maxMp); - if (_recipes == null) { packet.writeD(0); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 59ec218c84..9f460fe896 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -55,11 +55,10 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeD((int) _player.getCurrentMp()); packet.writeD(_player.getMaxMp()); packet.writeD(_success ? 1 : 0); // item creation success/failed - packet.writeC(0x00); - packet.writeQ(0x00); + packet.writeC(0); + packet.writeQ(0); return true; } - PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java index 4474a37c03..f4db5be9df 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java @@ -35,15 +35,14 @@ public class RecipeShopItemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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); - packet.writeQ(0x00); - packet.writeC(0x00); // Trigger offering window if 1 - packet.writeQ(0x00); + packet.writeQ(0); + packet.writeC(0); // Trigger offering window if 1 + packet.writeQ(0); return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java index 75e45f5877..38b0b8ea4e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java @@ -43,7 +43,6 @@ public class RecipeShopManageList implements IClientOutgoingPacket { _recipes = _seller.getCommonRecipeBook(); } - if (_seller.hasManufactureShop()) { final Iterator it = _seller.getManufactureItems().values().iterator(); @@ -63,11 +62,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MANAGE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD((int) _seller.getAdena()); - packet.writeD(_isDwarven ? 0x00 : 0x01); - + packet.writeD(_isDwarven ? 0 : 1); if (_recipes == null) { packet.writeD(0); @@ -83,10 +80,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket packet.writeD(count); } } - if (!_seller.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -94,7 +90,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket for (ManufactureItem item : _seller.getManufactureItems().values()) { packet.writeD(item.getRecipeId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeQ(item.getCost()); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java index c025b5e4ed..2b9bc5b6e7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java @@ -33,7 +33,6 @@ public class RecipeShopMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MSG.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeS(_player.getStoreName()); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java index be8ae1181e..8b3cb42f47 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java @@ -36,14 +36,13 @@ public class RecipeShopSellList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_SELL_LIST.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD((int) _manufacturer.getCurrentMp()); // Creator's MP packet.writeD(_manufacturer.getMaxMp()); // Creator's MP packet.writeQ(_buyer.getAdena()); // Buyer Adena if (!_manufacturer.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -51,7 +50,7 @@ public class RecipeShopSellList implements IClientOutgoingPacket for (ManufactureItem temp : _manufacturer.getManufactureItems().values()) { packet.writeD(temp.getRecipeId()); - packet.writeD(0x00); // unknown + packet.writeD(0); // unknown packet.writeQ(temp.getCost()); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 74700e29b0..269e14d50b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -88,7 +88,6 @@ public class RelationChanged implements IClientOutgoingPacket { return; } - final Relation r = new Relation(); r._objId = activeChar.getObjectId(); r._relation = relation; @@ -102,7 +101,6 @@ public class RelationChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RELATION_CHANGED.writeId(packet); - packet.writeC(_mask); if (_multi == null) { @@ -122,7 +120,6 @@ public class RelationChanged implements IClientOutgoingPacket private void writeRelation(PacketWriter packet, Relation relation) { packet.writeD(relation._objId); - if ((_mask & SEND_DEFAULT) != SEND_DEFAULT) { packet.writeD(relation._relation); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java index b4e9dc25c5..4477cfb705 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java @@ -35,7 +35,6 @@ public class RequestEnchant implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java index 4ef15fb74c..7a0a6cbe58 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java @@ -33,7 +33,6 @@ public class Revive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.REVIVE.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java index 9c409601e3..b9ddf7733f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java @@ -42,7 +42,6 @@ public class Ride implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RIDE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_mounted); packet.writeD(_rideType); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 813ce03f4d..13ef62f55f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -49,11 +49,9 @@ public class SellListProcure implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SELL_LIST_PROCURE.writeId(packet); - packet.writeQ(_money); // money - packet.writeD(0x00); // lease ? + packet.writeD(0); // lease ? packet.writeH(_sellList.size()); // list size - for (Entry entry : _sellList.entrySet()) { final Item item = entry.getKey(); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java index 7ea6e2c8ca..26f88961e8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java @@ -39,12 +39,10 @@ public class SendMacroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MACRO_LIST.writeId(packet); - packet.writeC(_updateType.getId()); - packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0x00); // modified, created or deleted macro's id + packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0); // modified, created or deleted macro's id packet.writeC(_count); // count of Macros packet.writeC(_macro != null ? 1 : 0); // unknown - if ((_macro != null) && (_updateType != MacroUpdateType.DELETE)) { packet.writeD(_macro.getId()); // Macro ID @@ -52,9 +50,7 @@ public class SendMacroList implements IClientOutgoingPacket packet.writeS(_macro.getDescr()); // Desc packet.writeS(_macro.getAcronym()); // acronym packet.writeC(_macro.getIcon()); // icon - packet.writeC(_macro.getCommands().size()); // count - int i = 1; for (MacroCmd cmd : _macro.getCommands()) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java index 47fada25be..21622b5f19 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java @@ -32,7 +32,6 @@ public class SendTradeRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_REQUEST.writeId(packet); - packet.writeD(_senderId); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java index 69aa749406..1513a0e3d1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java @@ -55,7 +55,6 @@ public class ServerObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SERVER_OBJECT_INFO.writeId(packet); - packet.writeD(_activeChar.getObjectId()); packet.writeD(_displayId + 1000000); packet.writeS(_name); // name @@ -70,8 +69,8 @@ public class ServerObjectInfo implements IClientOutgoingPacket packet.writeF(_collisionHeight); packet.writeD((int) (_isAttackable ? _activeChar.getCurrentHp() : 0)); packet.writeD(_isAttackable ? _activeChar.getMaxHp() : 0); - packet.writeD(0x01); // object type - packet.writeD(0x00); // special effects + packet.writeD(1); // object type + packet.writeD(0); // special effects return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java index 88b370ad8b..0164e5c4a2 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java @@ -34,7 +34,6 @@ public class SetSummonRemainTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SET_SUMMON_REMAIN_TIME.writeId(packet); - packet.writeD(_maxTime); packet.writeD(_remainingTime); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java index db28b72acf..016f5a0c9a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java @@ -38,7 +38,6 @@ public class ShopPreviewInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_INFO.writeId(packet); - packet.writeD(Inventory.PAPERDOLL_TOTALSLOTS); // Slots packet.writeD(getFromList(Inventory.PAPERDOLL_UNDER)); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index df50db952f..a55186f551 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -51,11 +51,9 @@ public class ShopPreviewList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_LIST.writeId(packet); - packet.writeD(5056); packet.writeQ(_money); // current money packet.writeD(_listId); - int newlength = 0; for (Product product : _list) { @@ -65,23 +63,20 @@ public class ShopPreviewList implements IClientOutgoingPacket } } packet.writeH(newlength); - for (Product product : _list) { if ((product.getItem().getCrystalType().getLevel() <= _expertise) && product.getItem().isEquipable()) { packet.writeD(product.getItemId()); packet.writeH(product.getItem().getType2()); // item type2 - if (product.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { packet.writeQ(product.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } else { - packet.writeQ(0x00); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand + packet.writeQ(0); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } - packet.writeQ(Config.WEAR_PRICE); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 298301ed0d..b13080ff28 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -40,7 +40,6 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_BUFF_STATUS_UPDATE.writeId(packet); - packet.writeD(_skillId); packet.writeH(_skillLevel); packet.writeH(_skillSubLevel); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index c6a67fb97c..b8624ce4cd 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -33,7 +33,6 @@ public class ShortCutInit implements IClientOutgoingPacket { return; } - _shortCuts = player.getAllShortCuts(); } @@ -41,24 +40,22 @@ public class ShortCutInit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); packet.writeD(sc.getSlot() + (sc.getPage() * 12)); - switch (sc.getType()) { case ITEM: { packet.writeD(sc.getId()); - packet.writeD(0x01); // Enabled or not + packet.writeD(1); // Enabled or not packet.writeD(sc.getSharedReuseGroup()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeQ(0x00); // Augment id - packet.writeD(0x00); // Visual id + packet.writeD(0); + packet.writeD(0); + packet.writeQ(0); // Augment id + packet.writeD(0); // Visual id break; } case SKILL: @@ -67,8 +64,8 @@ public class ShortCutInit implements IClientOutgoingPacket packet.writeH(sc.getLevel()); packet.writeH(sc.getSubLevel()); packet.writeD(sc.getSharedReuseGroup()); - packet.writeC(0x00); // C5 - packet.writeD(0x01); // C6 + packet.writeC(0); // C5 + packet.writeD(1); // C6 break; } case ACTION: @@ -77,7 +74,7 @@ public class ShortCutInit implements IClientOutgoingPacket case BOOKMARK: { packet.writeD(sc.getId()); - packet.writeD(0x01); // C6 + packet.writeD(1); // C6 } } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java index 43d61af661..f099eab47e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java @@ -37,7 +37,6 @@ public class ShortCutRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_REGISTER.writeId(packet); - packet.writeD(_shortcut.getType().ordinal()); packet.writeD(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client switch (_shortcut.getType()) @@ -47,10 +46,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeD(_shortcut.getId()); packet.writeD(_shortcut.getCharacterType()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeD(0x00); // unknown - packet.writeD(0x00); // unknown - packet.writeD(0x00); // item augment id - packet.writeD(0x00); // TODO: Find me, item visual id ? + packet.writeD(0); // unknown + packet.writeD(0); // unknown + packet.writeD(0); // item augment id + packet.writeD(0); // TODO: Find me, item visual id ? break; } case SKILL: @@ -59,10 +58,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeH(_shortcut.getLevel()); packet.writeH(_shortcut.getSubLevel()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeC(0x00); // C5 + packet.writeC(0); // C5 packet.writeD(_shortcut.getCharacterType()); - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me + packet.writeD(0); // TODO: Find me break; } case ACTION: diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java index d6f71b5f70..cfae3b3fad 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java @@ -54,7 +54,6 @@ public class ShowBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - packet.writeC(_showBoard); // c4 1 to show community 00 to hide packet.writeS("bypass _bbshome"); // top packet.writeS("bypass _bbsgetfav"); // favorite diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java index 4b62a7001b..4d62e99d7a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java @@ -32,7 +32,6 @@ public class ShowCalculator implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_CALC.writeId(packet); - packet.writeD(_calculatorId); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java index 55f58d5375..4574762467 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java @@ -32,9 +32,8 @@ public class ShowMiniMap implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_MINIMAP.writeId(packet); - packet.writeD(_mapId); - packet.writeC(0x00); // Seven Signs state + packet.writeC(0); // Seven Signs state return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java index 303eab4e8a..97100d09d2 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java @@ -34,7 +34,6 @@ public class ShowPCCafeCouponShowUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_PCCAFE_COUPON_SHOW_UI.writeId(packet); - return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java index d86958e586..0a0f3ae861 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java @@ -35,7 +35,6 @@ public class ShowXMasSeal implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_XMAS_SEAL.writeId(packet); - packet.writeD(_item); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java index 66eccc7fbf..1baa030c4d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java @@ -28,9 +28,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = ca
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Attackers Clans?
* d = Number of Attackers Clans
* { //repeats
@@ -58,11 +58,10 @@ public class SiegeAttackerList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _castle.getSiege().getAttackerClans().size(); if (size > 0) { @@ -76,12 +75,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -90,8 +88,8 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index 5d5c831f14..8afd1f38ce 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -29,9 +29,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = 0xcb
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Defending Clans?
* d = Number of Defending Clans
* { //repeats
@@ -60,16 +60,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // Unknown - packet.writeD(0x01); // Unknown - packet.writeD(0x00); // Unknown - + packet.writeD(0); // Unknown + packet.writeD(1); // Unknown + packet.writeD(0); // Unknown final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0); packet.writeD(size); packet.writeD(size); - // Add owners final Clan ownerClan = _castle.getOwner(); if (ownerClan != null) @@ -78,14 +75,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket packet.writeS(ownerClan.getName()); packet.writeS(ownerClan.getLeaderName()); packet.writeD(ownerClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.OWNER.ordinal()); packet.writeD(ownerClan.getAllyId()); packet.writeS(ownerClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(ownerClan.getAllyCrestId()); } - // List of confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans()) { @@ -94,19 +90,17 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(defendingClan.getAllyCrestId()); } - // List of not confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans()) { @@ -115,12 +109,11 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER_PENDING.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 0a3fe46cb7..dfeefdaecf 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -59,13 +59,11 @@ public class SiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_INFO.writeId(packet); - if (_castle != null) { packet.writeD(_castle.getResidenceId()); - final int ownerId = _castle.getOwnerId(); - packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 0x01 : 0x00); + packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0); packet.writeD(ownerId); if (ownerId > 0) { @@ -89,7 +87,6 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { @@ -97,7 +94,7 @@ public class SiegeInfo implements IClientOutgoingPacket cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis()); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(Config.SIEGE_HOUR_LIST.size()); for (int hour : Config.SIEGE_HOUR_LIST) { @@ -108,7 +105,7 @@ public class SiegeInfo implements IClientOutgoingPacket else { packet.writeD((int) (_castle.getSiegeDate().getTimeInMillis() / 1000)); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index d11b3817c0..3c4c475339 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -51,12 +51,11 @@ public class SkillCoolTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SKILL_COOL_TIME.writeId(packet); - packet.writeD(_skillReuseTimeStamps.size()); for (TimeStamp ts : _skillReuseTimeStamps) { packet.writeD(ts.getSkillId()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD((int) ts.getReuse() / 1000); packet.writeD((int) Math.max(ts.getStamp() - _currentTime, 0) / 1000); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index de54232b51..ed4615c403 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -41,10 +41,9 @@ public class Snoop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SNOOP.writeId(packet); - packet.writeD(_convoId); packet.writeS(_name); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_type.getClientId()); packet.writeS(_speaker); packet.writeS(_msg); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java index 37827bdf6c..52f15519a5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java @@ -37,10 +37,9 @@ public class SocialAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SOCIAL_ACTION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_actionId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index c2fedd99c0..f2b0fadabd 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -33,16 +33,15 @@ public class SpawnItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPAWN_ITEM.writeId(packet); - packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeD(_item.isStackable() ? 0x01 : 0x00); + packet.writeD(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java index ccae75b850..04f3ad716c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java @@ -110,7 +110,6 @@ public class SpecialCamera implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPECIAL_CAMERA.writeId(packet); - packet.writeD(_id); packet.writeD(_force); packet.writeD(_angle1); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java index cdd3821740..281756e793 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java @@ -34,7 +34,6 @@ public class StartPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_PLEDGE_WAR.writeId(packet); - packet.writeS(_playerName); packet.writeS(_pledgeName); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java index 48b4238eea..27fb4f606b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java @@ -38,7 +38,6 @@ public class StartRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_side); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java index b4f421df36..067bdeb082 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java @@ -72,7 +72,6 @@ public class StaticObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATIC_OBJECT.writeId(packet); - packet.writeD(_staticObjectId); packet.writeD(_objectId); packet.writeD(_type); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index 928b54aa48..40836e4af8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -46,7 +46,6 @@ public class StatusUpdate implements IClientOutgoingPacket public void addUpdate(StatusUpdateType type, int level) { _updates.put(type, level); - if (_isPlayable) { switch (type) @@ -75,10 +74,9 @@ public class StatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATUS_UPDATE.writeId(packet); - packet.writeD(_objectId); // casterId - packet.writeD(_isVisible ? _casterObjectId : 0x00); - packet.writeC(_isVisible ? 0x01 : 0x00); + packet.writeD(_isVisible ? _casterObjectId : 0); + packet.writeC(_isVisible ? 1 : 0); packet.writeC(_updates.size()); for (Entry entry : _updates.entrySet()) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java index 9919307366..cf2b71df5a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java @@ -53,7 +53,6 @@ public class StopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java index 50fdc3fe4c..78fdb5d70c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java @@ -43,7 +43,6 @@ public class StopMoveInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java index 9c828c3962..b254cad8b1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java @@ -34,7 +34,6 @@ public class StopPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java index b0392de226..ca69cd5346 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java @@ -36,7 +36,6 @@ public class StopRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FINISH_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_speed); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index c1feb37b2f..2d92796c75 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -43,10 +43,8 @@ public class SummonInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class SummonInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class SummonInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,11 +154,9 @@ public class SummonInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - // Show red aura? - // if (_statusMask != 0) + // if (_statusMask != 0x00) // { // addComponentType(NpcInfoType.VISUAL_STATE); // } @@ -229,28 +206,24 @@ public class SummonInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.SUMMON_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -269,7 +242,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -285,19 +258,19 @@ public class SummonInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -309,20 +282,20 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -346,12 +319,12 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -381,12 +354,10 @@ public class SummonInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java index 864462f76f..6f88551204 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java @@ -34,7 +34,6 @@ public class SurrenderPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SURRENDER_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index f058ddf030..dd4d2884da 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -160,7 +160,6 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } - _params[_paramIndex++] = param; } @@ -266,7 +265,6 @@ public class SystemMessage implements IClientOutgoingPacket { return addString(item.getName()); } - append(new SMParam(TYPE_ITEM_NAME, id)); return this; } @@ -382,7 +380,6 @@ public class SystemMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SYSTEM_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -395,13 +392,12 @@ public class SystemMessage implements IClientOutgoingPacket params[i] = _params[i].getValue(); } packet.writeH(SystemMessageId.S1_2.getId()); - packet.writeC(0x01); + packet.writeC(1); packet.writeC(TYPE_TEXT); packet.writeS(sml.getLocalisation(params)); return true; } } - packet.writeH(getId()); packet.writeC(_params.length); for (SMParam param : _params) @@ -411,9 +407,7 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } - packet.writeC(param.getType()); - switch (param.getType()) { case TYPE_ELEMENT_NAME: diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java index a91da07e77..d357efbb0e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java @@ -47,13 +47,12 @@ public class TargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_SELECTED.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java index 3dadd249f6..3d7208c06f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java @@ -42,12 +42,11 @@ public class TargetUnselected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_UNSELECTED.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index 943b5078b6..13f9b9565a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -41,14 +41,13 @@ public class TeleportToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TELEPORT_TO_LOCATION.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // Fade 0, Instant 1. + packet.writeD(0); // Fade 0, Instant 1. packet.writeD(_heading); - packet.writeD(0x00); // Unknown. + packet.writeD(0); // Unknown. return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java index cb82f2da59..8d09576d9d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java @@ -32,7 +32,6 @@ public class TradeDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_DONE.writeId(packet); - packet.writeD(_num); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index 470ce757db..0635e50548 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -56,7 +56,6 @@ public class TradeStart extends AbstractItemPacket { _mask |= 0x08; } - // Does not shows level if (_partner.isGM()) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java index 998f07a8c3..735cd8ce84 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java @@ -39,7 +39,6 @@ public class TradeUpdate extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_UPDATE.writeId(packet); - packet.writeH(1); packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2); writeTradeItem(packet, _item); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java index c7102ca385..728020c0b1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java @@ -32,7 +32,6 @@ public class TutorialEnableClientEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_ENABLE_CLIENT_EVENT.writeId(packet); - packet.writeD(_eventId); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java index 92ac75afcf..7cc33a0f80 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java @@ -48,7 +48,6 @@ public class TutorialShowHtml extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_HTML.writeId(packet); - packet.writeD(_type); packet.writeS(getHtml()); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java index ef609a94ad..2a550c8dfc 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java @@ -32,7 +32,6 @@ public class TutorialShowQuestionMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_QUESTION_MARK.writeId(packet); - packet.writeD(_markId); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index c6f498d462..4f3ecb6b25 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -34,7 +34,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class UserInfo extends AbstractMaskPacket { private Player _player; - private int _relation; private int _runSpd; private int _walkSpd; @@ -48,14 +47,12 @@ public class UserInfo extends AbstractMaskPacket private int _enchantLevel; private int _armorEnchant; private String _title; - private final byte[] _masks = new byte[] { (byte) 0x00, (byte) 0x00, (byte) 0x00 }; - private int _initSize = 5; public UserInfo(Player player) @@ -79,6 +76,7 @@ public class UserInfo extends AbstractMaskPacket _enchantLevel = player.getInventory().getWeaponEnchant(); _armorEnchant = player.getInventory().getArmorMinEnchant(); _title = player.getTitle(); + if (player.isGM() && player.isInvisible()) { _title = "[Invisible]"; @@ -134,29 +132,25 @@ public class UserInfo extends AbstractMaskPacket } OutgoingPackets.USER_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_initSize); packet.writeH(23); packet.writeB(_masks); - if (containsMask(UserInfoType.RELATION)) { packet.writeD(_relation); } - if (containsMask(UserInfoType.BASIC_INFO)) { packet.writeH(16 + (_player.getAppearance().getVisibleName().length() * 2)); packet.writeString(_player.getName()); - packet.writeC(_player.isGM() ? 0x01 : 0x00); + packet.writeC(_player.isGM() ? 1 : 0); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } - if (containsMask(UserInfoType.BASE_STATS)) { packet.writeH(18); @@ -169,7 +163,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getLUC()); packet.writeH(_player.getCHA()); } - if (containsMask(UserInfoType.MAX_HPCPMP)) { packet.writeH(14); @@ -177,7 +170,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMaxMp()); packet.writeD(_player.getMaxCp()); } - if (containsMask(UserInfoType.CURRENT_HPMPCP_EXP_SP)) { packet.writeH(38); @@ -188,23 +180,20 @@ public class UserInfo extends AbstractMaskPacket packet.writeQ(_player.getExp()); packet.writeF((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel()))); } - if (containsMask(UserInfoType.ENCHANTLEVEL)) { packet.writeH(4); packet.writeC(_enchantLevel); packet.writeC(_armorEnchant); } - if (containsMask(UserInfoType.APPAREANCE)) { packet.writeH(15); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); } - if (containsMask(UserInfoType.STATUS)) { packet.writeH(6); @@ -213,7 +202,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.hasDwarvenCraft() || (_player.getSkillLevel(248) > 0) ? 1 : 0); packet.writeC(_player.getAbilityPointsUsed()); } - if (containsMask(UserInfoType.STATS)) { packet.writeH(56); @@ -232,7 +220,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); } - if (containsMask(UserInfoType.ELEMENTALS)) { packet.writeH(14); @@ -243,7 +230,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getDefenseElementValue(AttributeType.HOLY)); packet.writeH(_player.getDefenseElementValue(AttributeType.DARK)); } - if (containsMask(UserInfoType.POSITION)) { packet.writeH(18); @@ -252,7 +238,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getZ()); packet.writeD(_player.isInVehicle() ? _player.getVehicle().getObjectId() : 0); } - if (containsMask(UserInfoType.SPEED)) { packet.writeH(18); @@ -265,21 +250,18 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_flyRunSpd); packet.writeH(_flyWalkSpd); } - if (containsMask(UserInfoType.MULTIPLIER)) { packet.writeH(18); packet.writeF(_moveMultiplier); packet.writeF(_player.getAttackSpeedMultiplier()); } - if (containsMask(UserInfoType.COL_RADIUS_HEIGHT)) { packet.writeH(18); packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); } - if (containsMask(UserInfoType.ATK_ELEMENTAL)) { packet.writeH(5); @@ -287,7 +269,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); } - if (containsMask(UserInfoType.CLAN)) { packet.writeH(32 + (_title.length() * 2)); @@ -297,12 +278,11 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getClanCrestLargeId()); packet.writeD(_player.getClanCrestId()); packet.writeD(_player.getClanPrivileges().getBitmask()); - packet.writeC(_player.isClanLeader() ? 0x01 : 0x00); + packet.writeC(_player.isClanLeader() ? 1 : 0); packet.writeD(_player.getAllyId()); packet.writeD(_player.getAllyCrestId()); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); } - if (containsMask(UserInfoType.SOCIAL)) { packet.writeH(22); @@ -316,59 +296,52 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); } - if (containsMask(UserInfoType.VITA_FAME)) { packet.writeH(15); packet.writeD(_player.getVitalityPoints()); - packet.writeC(0x00); // Vita Bonus + packet.writeC(0); // Vita Bonus packet.writeD(_player.getFame()); packet.writeD(_player.getRaidbossPoints()); } - if (containsMask(UserInfoType.SLOTS)) { packet.writeH(9); packet.writeC(_player.getInventory().getTalismanSlots()); // Confirmed packet.writeC(_player.getInventory().getBroochJewelSlots()); // Confirmed packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeC(0x00); // (1 = Red, 2 = White, 3 = White Pink) dotted ring on the floor - packet.writeC(0x00); - packet.writeC(0x00); - packet.writeC(0x00); + packet.writeC(0); // (1 = Red, 2 = White, 3 = White Pink) dotted ring on the floor + packet.writeC(0); + packet.writeC(0); + packet.writeC(0); } - if (containsMask(UserInfoType.MOVEMENTS)) { packet.writeH(4); packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); - packet.writeC(_player.isRunning() ? 0x01 : 0x00); + packet.writeC(_player.isRunning() ? 1 : 0); } - if (containsMask(UserInfoType.COLOR)) { packet.writeH(10); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); } - if (containsMask(UserInfoType.INVENTORY_LIMIT)) { packet.writeH(9); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); packet.writeH(_player.getInventoryLimit()); packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); } - if (containsMask(UserInfoType.TRUE_HERO)) { packet.writeH(9); - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeC(_player.isTrueHero() ? 100 : 0x00); + packet.writeD(0); + packet.writeH(0); + packet.writeC(_player.isTrueHero() ? 100 : 0); } - return true; } @@ -385,7 +358,6 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x10; // Party leader } } - if (clan != null) { relation |= 0x20; // Clan member @@ -394,12 +366,10 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x40; // Clan leader } } - if (player.isInSiege()) { relation |= 0x80; // In siege } - return relation; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java index 283bcf1614..90c416726a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java @@ -36,7 +36,6 @@ public class ValidateLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java index 4d8f9683d0..83f72bf981 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java @@ -40,7 +40,6 @@ public class ValidateLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java index b684e70bdc..71367cd26d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java @@ -36,7 +36,6 @@ public class VehicleCheckLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_CHECK_LOCATION.writeId(packet); - packet.writeD(_boat.getObjectId()); packet.writeD(_boat.getX()); packet.writeD(_boat.getY()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java index a4a5780f30..5b565c08b7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java @@ -46,7 +46,6 @@ public class VehicleDeparture implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_DEPARTURE.writeId(packet); - packet.writeD(_objId); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java index ec611028bf..4a995a6352 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java @@ -44,7 +44,6 @@ public class VehicleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java index 207a6fd899..bf629dcbbc 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java @@ -42,7 +42,6 @@ public class VehicleStarted implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_START.writeId(packet); - packet.writeD(_objectId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 455305ce79..76b391afc6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -30,6 +30,7 @@ public class WareHouseDepositList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; public static final int FREIGHT = 1; + private final long _playerAdena; private final int _warehouseSize; private final List _items = new ArrayList<>(); @@ -49,7 +50,6 @@ public class WareHouseDepositList extends AbstractItemPacket _whType = type; _playerAdena = player.getAdena(); _warehouseSize = player.getActiveWarehouse() != null ? player.getActiveWarehouse().getSize() : 0; - final boolean isPrivate = _whType == PRIVATE; for (Item temp : player.getInventory().getAvailableItems(true, isPrivate, false)) { @@ -68,19 +68,15 @@ public class WareHouseDepositList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.WAREHOUSE_DEPOSIT_LIST.writeId(packet); - packet.writeH(_whType); packet.writeQ(_playerAdena); packet.writeD(_warehouseSize); packet.writeH(_itemsStackable.size()); - for (int itemId : _itemsStackable) { packet.writeD(itemId); } - packet.writeH(_items.size()); - for (Item item : _items) { writeItem(packet, item); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 6f57005e47..785f0a0849 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -32,6 +32,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private Player _player; private long _playerAdena; private final int _invSize; @@ -58,7 +59,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } - _items = _player.getActiveWarehouse().getItems(); for (Item item : _items) { @@ -73,7 +73,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.WAREHOUSE_WITHDRAW_LIST.writeId(packet); - packet.writeH(_whType); packet.writeQ(_playerAdena); packet.writeH(_items.size()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java index 6eda785411..dcb824c3f6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java @@ -62,7 +62,6 @@ public class ExAcquireAPSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_AP_SKILL_LIST.writeId(packet); - packet.writeD(_enable ? 1 : 0); packet.writeQ(Config.ABILITY_POINTS_RESET_ADENA); packet.writeQ(_price); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java index f9af89e4db..ff296bf632 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java @@ -35,7 +35,6 @@ public class ExCloseAPListWnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_AP_LIST_WND.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java index d72baf2a44..69c47ce99f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java @@ -35,7 +35,6 @@ public class ExShowAPListWnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AP_LIST_WND.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java index 5f2dd05f3b..aea1476fb2 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java @@ -35,8 +35,7 @@ public class ExDivideAdenaCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_CANCEL.writeId(packet); - - packet.writeC(0x00); // TODO: Find me + packet.writeC(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java index 6af912cebf..de4e955aba 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java @@ -46,9 +46,8 @@ public class ExDivideAdenaDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_DONE.writeId(packet); - - packet.writeC(_isPartyLeader ? 0x01 : 0x00); - packet.writeC(_isCCLeader ? 0x01 : 0x00); + packet.writeC(_isPartyLeader ? 1 : 0); + packet.writeC(_isCCLeader ? 1 : 0); packet.writeD(_memberCount); packet.writeQ(_distributedAdenaCount); packet.writeQ(_adenaCount); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java index ab8a7471d6..32f99abfdc 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java @@ -38,8 +38,7 @@ public class ExAlchemyConversion implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_CONVERSION.writeId(packet); - - packet.writeC((_successCount == 0) && (_failureCount == 0) ? 0x01 : 0x00); + packet.writeC((_successCount == 0) && (_failureCount == 0) ? 1 : 0); packet.writeD(_successCount); packet.writeD(_failureCount); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java index be4a2a57e6..cb3cf4b3e0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java @@ -47,7 +47,6 @@ public class ExTryMixCube implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TRY_MIX_CUBE.writeId(packet); - packet.writeC(_type.ordinal()); packet.writeD(_items.size()); for (AlchemyResult holder : _items) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index 549def456e..84b5fead76 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -43,7 +43,6 @@ public class ExChooseShapeShiftingItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_SHAPE_SHIFTING_ITEM.writeId(packet); - packet.writeD(_targetType != null ? _targetType.ordinal() : 0); packet.writeD(_type != null ? _type.ordinal() : 0); packet.writeD(_itemId); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java index 33fb439aa5..ba55887a1a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java @@ -45,7 +45,6 @@ public class ExCuriousHouseMemberUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_UPDATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_maxHp); packet.writeD(_maxCp); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java index 8ad3659725..be2d29d864 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPacket { - public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0x00); - public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(0x01); + public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0); + public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(1); private final int _result; @@ -39,7 +39,6 @@ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPa public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_EXTRACTION_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java index ec82cc14f3..e84d7a7255 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; public static final ExPutShapeShiftingTargetItemResult FAILED = new ExPutShapeShiftingTargetItemResult(RESULT_FAILED, 0); @@ -43,7 +43,6 @@ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_resultId); packet.writeQ(_price); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java index f4d3118cc4..038eae0042 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExShapeShiftingResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; - public static final int RESULT_CLOSE = 0x02; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; + public static final int RESULT_CLOSE = 2; public static final ExShapeShiftingResult FAILED = new ExShapeShiftingResult(RESULT_FAILED, 0, 0); public static final ExShapeShiftingResult CLOSE = new ExShapeShiftingResult(RESULT_CLOSE, 0, 0); @@ -47,7 +47,6 @@ public class ExShapeShiftingResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHAPE_SHIFTING_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_targetItemId); packet.writeD(_extractItemId); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java index eaf0d209fd..4b48b09002 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java @@ -38,7 +38,7 @@ public class ExConfirmVipAttendanceCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CONFIRM_VIP_ATTENDANCE_CHECK.writeId(packet); - packet.writeC(_available ? 0x01 : 0x00); // can receive reward today? 1 else 0 + packet.writeC(_available ? 1 : 0); // can receive reward today? 1 else 0 packet.writeC(_index); // active reward index packet.writeD(0); packet.writeD(0); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java index 9d61fe68d6..dd94df023f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java @@ -45,10 +45,10 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket OutgoingPackets.EX_VIP_ATTENDANCE_ITEM_LIST.writeId(packet); packet.writeC(_available ? _index + 1 : _index); // index to receive? packet.writeC(_index); // last received index? - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeC(0x01); - packet.writeC(_available ? 0x01 : 0x00); // player can receive reward today? + packet.writeD(0); + packet.writeD(0); + packet.writeC(1); + packet.writeC(_available ? 1 : 0); // player can receive reward today? packet.writeC(250); packet.writeC(AttendanceRewardData.getInstance().getRewardsCount()); // reward size int rewardCounter = 0; @@ -57,11 +57,11 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket rewardCounter++; packet.writeD(reward.getId()); packet.writeQ(reward.getCount()); - packet.writeC(0x01); // is unknown? - packet.writeC((rewardCounter % 7) == 0 ? 0x01 : 0x00); // is last in row? + packet.writeC(1); // is unknown? + packet.writeC((rewardCounter % 7) == 0 ? 1 : 0); // is last in row? } - packet.writeC(0x00); - packet.writeD(0x00); + packet.writeC(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java index 7f1d6d60d1..73f93335ef 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java @@ -43,7 +43,6 @@ public class ExCuriousHouseMemberList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_LIST.writeId(packet); - packet.writeD(_id); packet.writeD(_maxPlayers); packet.writeD(_players.size()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java index b71caa5f14..5d9b34db61 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java @@ -37,7 +37,6 @@ public class ExCuriousHouseRemainTime implements IClientOutgoingPacket { OutgoingPackets.EX_CURIOUS_HOUSE_REMAIN_TIME.writeId(packet); packet.writeD(_time); - return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java index 0a1edc0085..b98d6d260e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java @@ -39,7 +39,6 @@ public class ExResponseCommissionBuyInfo extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_INFO.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java index ddfa8b6db1..c1d29735b8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java @@ -40,7 +40,6 @@ public class ExResponseCommissionBuyItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_ITEM.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java index aa4bbbde24..01e4782408 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java @@ -39,7 +39,6 @@ public class ExResponseCommissionDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_DELETE.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java index e7e3c39816..b915574175 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java @@ -55,7 +55,6 @@ public class ExResponseCommissionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_INFO.writeId(packet); - packet.writeD(_result); packet.writeD(_itemId); packet.writeQ(_presetPricePerUnit); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 876a24c7ad..89000dd57f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -39,7 +39,6 @@ public class ExResponseCommissionItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_ITEM_LIST.writeId(packet); - packet.writeD(_items.size()); for (Item itemInstance : _items) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java index df72e96d20..c170b03d29 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java @@ -64,7 +64,6 @@ public class ExResponseCommissionList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_LIST.writeId(packet); - packet.writeD(_replyType.getClientId()); switch (_replyType) { @@ -73,13 +72,11 @@ public class ExResponseCommissionList extends AbstractItemPacket { packet.writeD((int) Instant.now().getEpochSecond()); packet.writeD(_chunkId); - int chunkSize = _items.size() - _listIndexStart; if (chunkSize > MAX_CHUNK_SIZE) { chunkSize = MAX_CHUNK_SIZE; } - packet.writeD(chunkSize); for (int i = _listIndexStart; i < (_listIndexStart + chunkSize); i++) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java index b1b0a97d7a..183547af06 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java @@ -39,7 +39,6 @@ public class ExResponseCommissionRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_REGISTER.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java index 74d8a95587..b68386e4ed 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java @@ -35,8 +35,7 @@ public class ExShowCommission implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_COMMISSION.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java index 0c267ecf34..11b1ff1e0a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExEnchantFail implements IClientOutgoingPacket { public static final ExEnchantFail STATIC_PACKET = new ExEnchantFail(0, 0); + private final int _itemOne; private final int _itemTwo; @@ -39,7 +40,6 @@ public class ExEnchantFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_FAIL.writeId(packet); - packet.writeD(_itemOne); packet.writeD(_itemTwo); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java index 71ba811ed5..87d29a8e7c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java @@ -36,7 +36,6 @@ public class ExEnchantSucess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SUCESS.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java index eb4eb8b26c..ec67d50fb6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java @@ -39,7 +39,6 @@ public class ExGetCrystalizingEstimation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - packet.writeD(_items.size()); for (ItemChanceHolder holder : _items) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java index 33554a7050..96b250046c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java @@ -39,7 +39,7 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket OutgoingPackets.EX_CONNECTED_TIME_AND_GETTABLE_REWARD.writeId(packet); for (int i = 0; i < 16; i++) // TODO : Find what the hell it is { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index e324025c53..baa9b1f677 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -49,7 +49,6 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket } OutgoingPackets.EX_ONE_DAY_RECEIVE_REWARD_LIST.writeId(packet); - packet.writeD(_player.getClassId().getId()); packet.writeD(LocalDate.now().getDayOfWeek().ordinal()); // Day of week packet.writeD(_rewards.size()); @@ -57,7 +56,7 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket { packet.writeH(reward.getId()); packet.writeC(reward.getStatus(_player)); - packet.writeC(reward.getRequiredCompletions() > 0 ? 0x01 : 0x00); + packet.writeC(reward.getRequiredCompletions() > 0 ? 1 : 0); packet.writeD(reward.getProgress(_player)); packet.writeD(reward.getRequiredCompletions()); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java index fa605b548a..a99ad7f4e3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java @@ -52,7 +52,7 @@ public class ExFishingStart implements IClientOutgoingPacket packet.writeD(_baitLocation.getX()); packet.writeD(_baitLocation.getY()); packet.writeD(_baitLocation.getZ()); - packet.writeC(0x01); // 0 = newbie, 1 = normal, 2 = night + packet.writeC(1); // 0 = newbie, 1 = normal, 2 = night return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java index 046ad04cb6..74501fe7ff 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java @@ -49,7 +49,6 @@ public class ExUserInfoFishing implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_FISHING.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_isFishing ? 1 : 0); if (_baitLocation == null) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index dc0e3e05bc..336a384bcc 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -47,9 +47,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FRIEND_DETAIL_INFO.writeId(packet); - packet.writeD(_objectId); - if (_friend == null) { packet.writeS(_name); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java index 0d4bb47ff0..a90b7b6083 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java @@ -33,8 +33,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x00); + packet.writeC(0); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java index 9add9c9caa..d24139644c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java @@ -49,7 +49,6 @@ public class FriendAddRequestResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_charId); packet.writeS(_charName); @@ -57,7 +56,7 @@ public class FriendAddRequestResult implements IClientOutgoingPacket packet.writeD(_charObjectId); packet.writeD(_charLevel); packet.writeD(_charClassId); - packet.writeH(0x00); // Always 0 on retail + packet.writeH(0); // Always 0 on retail return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java index a135944662..13a7d01967 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java @@ -86,12 +86,10 @@ public class FriendList implements IClientOutgoingPacket } continue; } - if (player1.isOnline()) { online = true; } - classid = player1.getClassId().getId(); level = player1.getLevel(); _info.add(new FriendInfo(objId, name, online, classid, level)); @@ -102,14 +100,13 @@ public class FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._classid); packet.writeD(info._level); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java index 07c23f9fd2..1bb4142e34 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java @@ -38,7 +38,6 @@ public class FriendRemove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_REMOVE.writeId(packet); - packet.writeD(_responce); packet.writeS(_charName); return true; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java index e8dbddcd63..a3990c0879 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java @@ -52,7 +52,6 @@ public class FriendStatus implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_STATUS.writeId(packet); - packet.writeD(_type); packet.writeS(_name); switch (_type) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java index 8752104e06..78da5850b8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java @@ -50,7 +50,6 @@ public class L2Friend implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND.writeId(packet); - packet.writeD(_action ? 1 : 3); // 1-add 3-remove packet.writeD(_objid); packet.writeS(_name); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java index b69a253635..e50693cb11 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java @@ -81,17 +81,16 @@ public class L2FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._level); packet.writeD(info._classId); - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java index 677c09091f..706c179a9c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java @@ -37,7 +37,6 @@ public class ExMentorAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_ADD.writeId(packet); - packet.writeS(_mentor.getName()); packet.writeD(_mentor.getActiveClass()); packet.writeD(_mentor.getLevel()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java index 4722a9cab3..18c1cdeedf 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java @@ -64,9 +64,8 @@ public class ExMentorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_LIST.writeId(packet); - packet.writeD(_type); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mentees.size()); for (Mentee mentee : _mentees) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java index d739dd94b7..2283920b98 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ListMenteeWaiting implements IClientOutgoingPacket { private static final int PLAYERS_PER_PAGE = 64; + private final List _possibleCandiates = new ArrayList<>(); private final int _page; @@ -51,18 +52,15 @@ public class ListMenteeWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_MENTEE_WAITING.writeId(packet); - - packet.writeD(0x01); // always 1 in retail + packet.writeD(1); // always 1 in retail if (_possibleCandiates.isEmpty()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } - packet.writeD(_possibleCandiates.size()); packet.writeD(_possibleCandiates.size() % PLAYERS_PER_PAGE); - for (Player player : _possibleCandiates) { if ((1 <= (PLAYERS_PER_PAGE * _page)) && (1 > (PLAYERS_PER_PAGE * (_page - 1)))) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java index ead46c2174..eaf44d3181 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java @@ -51,7 +51,6 @@ public class ExPledgeBonusList implements IClientOutgoingPacket packet.writeD(0); return; } - packet.writeD(bonus.getSkillReward().getSkillId()); break; } @@ -63,7 +62,6 @@ public class ExPledgeBonusList implements IClientOutgoingPacket packet.writeD(0); return; } - packet.writeD(bonus.getItemReward().getId()); break; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java index af3c790bc6..cfedfaa438 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java @@ -50,7 +50,6 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Player: " + _player + " attempting to write to a null clan!"); return false; } - final ClanRewardBonus highestMembersOnlineBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.MEMBERS_ONLINE); final ClanRewardBonus highestHuntingBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.HUNTING_MONSTERS); final ClanRewardBonus membersOnlineBonus = ClanRewardType.MEMBERS_ONLINE.getAvailableBonus(clan); @@ -75,23 +74,20 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Couldn't find item reward for highest available hunting bonus!!"); return false; } - // General OP Code OutgoingPackets.EX_PLEDGE_BONUS_OPEN.writeId(packet); - // Members online bonus packet.writeD(highestMembersOnlineBonus.getRequiredAmount()); packet.writeD(clan.getMaxOnlineMembers()); - packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0x00); - packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 0x01 : 0x00); - + packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0); + packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 1 : 0); // Hunting bonus packet.writeD(highestHuntingBonus.getRequiredAmount()); packet.writeD(clan.getHuntingPoints()); - packet.writeD(huntingBonus != null ? highestHuntingBonus.getItemReward().getId() : 0x00); - packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 0x01 : 0x00); + packet.writeD(huntingBonus != null ? highestHuntingBonus.getItemReward().getId() : 0); + packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 1 : 0); return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index fb735b8925..e75426e598 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -69,7 +69,6 @@ public class ExBRBuyProduct implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUY_PRODUCT.writeId(packet); - packet.writeD(_reply); return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java index 742b3eba9d..91a186b81d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java @@ -39,10 +39,9 @@ public class ExBRGamePoint implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_GAME_POINT.writeId(packet); - packet.writeD(_charId); packet.writeQ(_charPoints); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java index 50f21df46a..e36f2ff502 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java @@ -45,7 +45,6 @@ public class ExBRProductInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_INFO.writeId(packet); - packet.writeD(_item.getBrId()); packet.writeD(_item.getPrice()); packet.writeD(_item.getItems().size()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java index dc851ffd43..0f042ba043 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java @@ -45,9 +45,8 @@ public class ExBRProductList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); // Adena - packet.writeQ(0x00); // Hero coins + packet.writeQ(0); // Hero coins packet.writeC(_type); // Type 0 - Home, 1 - History, 2 - Favorites packet.writeD(_primeList.size()); for (PrimeShopGroup brItem : _primeList) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java index 2463589c81..c09b3e899d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java @@ -47,18 +47,15 @@ public class ExFlyMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_mapId); - packet.writeD(_locations.size()); for (SayuneEntry loc : _locations) { packet.writeD(loc.getId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(loc.getX()); packet.writeD(loc.getY()); packet.writeD(loc.getZ()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java index 03fc6b580d..70b3fb25d2 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java @@ -47,16 +47,13 @@ public class ExFlyMoveBroadcast implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE_BROADCAST.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); packet.writeD(_mapId); - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD(_currentLoc.getX()); packet.writeD(_currentLoc.getY()); packet.writeD(_currentLoc.getZ()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java index cfe11a27e0..49e5d86910 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java @@ -35,7 +35,6 @@ public class ExNotifyFlyMoveStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_FLY_MOVE_START.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java index d5640a47ef..0efa37ae8c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java @@ -51,7 +51,6 @@ public class ExMoveToLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_SUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_targetX); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java index 0cbe2c3e02..a0314c39aa 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java @@ -46,7 +46,6 @@ public class ExShuttleGetOff implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_OFF.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_x); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java index 5211bef5ba..061bcafed9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java @@ -43,7 +43,6 @@ public class ExShuttleGetOn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_ON.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java index 97d54a9019..c8aee1fde7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java @@ -43,7 +43,6 @@ public class ExShuttleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHUTTLE_INFO.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD(_shuttle.getX()); packet.writeD(_shuttle.getY()); @@ -60,8 +59,8 @@ public class ExShuttleInfo implements IClientOutgoingPacket packet.writeD(loc.getY()); packet.writeD(loc.getZ()); } - packet.writeD(stop.isDoorOpen() ? 0x01 : 0x00); - packet.writeD(stop.hasDoorChanged() ? 0x01 : 0x00); + packet.writeD(stop.isDoorOpen() ? 1 : 0); + packet.writeD(stop.hasDoorChanged() ? 1 : 0); } return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java index 6ba38f29a1..28b33b998e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java @@ -43,7 +43,6 @@ public class ExShuttleMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_MOVE.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD((int) _shuttle.getStat().getMoveSpeed()); packet.writeD((int) _shuttle.getStat().getRotationSpeed()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java index bf2b6ea6eb..6c31189d6a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java @@ -44,7 +44,6 @@ public class ExStopMoveInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_SHUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java index f7f6849732..8492f42a6e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java @@ -44,7 +44,6 @@ public class ExValidateLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_SHUTTLE.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java index 1d59c6d002..e7654ed911 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java @@ -60,7 +60,7 @@ public class AccountKicked implements IOutgoingPacket { OutgoingPackets.ACCOUNT_KICKED.writeId(packet); packet.writeD(_reason.getCode()); - return true; } } + diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 2e3a1f6163..1fe813e393 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: response + * Format: d d: response */ public class GGAuth implements IOutgoingPacket { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/network/serverpackets/Init.java index 4b3f71f30e..d725f45ca2 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/network/serverpackets/Init.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/network/serverpackets/Init.java @@ -52,7 +52,6 @@ public class Init implements IOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.INIT.writeId(packet); - packet.writeD(_sessionId); // session id packet.writeD(0x0000c621); // protocol revision diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index 8c534554a8..f4dcd22b00 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: the failure reason + * Format: d d: the failure reason */ public class LoginFail implements IOutgoingPacket { diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index c700328f3d..f8b05abb47 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -529,7 +529,7 @@ public class Lindvior extends AbstractNpcAI for (Location loc : CONTROL_GENERATOR_SPAWNS) { guard = (FriendlyNpc) addSpawn(NPC_GENERATOR, loc, true); - guard.setDisplayEffect(0x01); + guard.setDisplayEffect(1); guard.setScriptValue(i++); _generatorSpawn.add(guard); } @@ -685,7 +685,7 @@ public class Lindvior extends AbstractNpcAI if (!hasFlag(_activeMask, 1 << index)) { _activeMask |= 1 << index; - npc.setDisplayEffect(0x02); + npc.setDisplayEffect(2); sendEventTrigger(true, GENERATOR_TRIGERS[index]); _zoneLair.getPlayersInside().stream().forEach(p -> p.broadcastPacket(new Earthquake(p.getX(), p.getY(), p.getZ(), 20, 10))); if (hasFlag(_activeMask, 0xf)) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/BaseRecievePacket.java index c682cb741d..a6ed15ce32 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/BaseRecievePacket.java @@ -73,7 +73,7 @@ public abstract class BaseRecievePacket try { result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE); - result = result.substring(0, result.indexOf(0x00)); + result = result.substring(0, result.indexOf(0)); _off += (result.length() * 2) + 2; } catch (Exception e) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/BaseSendablePacket.java index a9d918de4c..8fa8491cbf 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/commons/network/BaseSendablePacket.java @@ -117,16 +117,16 @@ public abstract class BaseSendablePacket public byte[] getBytes() { // if (this instanceof Init) - // writeD(0x00); // reserve for XOR initial key + // writeD(0); // reserve for XOR initial key - writeD(0x00); // reserve for checksum + writeD(0); // reserve for checksum final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++) { - writeC(0x00); + writeC(0); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/AttackType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/AttackType.java index 6064b10ed7..e9983f15e3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/AttackType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/AttackType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum AttackType { - MISSED(0x01), - BLOCKED(0x02), - CRITICAL(0x04), - SHOT_USED(0x08); + MISSED(1), + BLOCKED(2), + CRITICAL(4), + SHOT_USED(8); private final int _mask; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/GroupType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/GroupType.java index 954aaace8b..916a14fd05 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/GroupType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/GroupType.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum GroupType implements IUpdateTypeComponent { - NONE(0x01), - PARTY(0x02), - COMMAND_CHANNEL(0x04); + NONE(1), + PARTY(2), + COMMAND_CHANNEL(4); private int _mask; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/ItemListType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/ItemListType.java index 2d38c8f5b1..c80234439f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/ItemListType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/ItemListType.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum ItemListType implements IUpdateTypeComponent { - AUGMENT_BONUS(0x01), - ELEMENTAL_ATTRIBUTE(0x02), - ENCHANT_EFFECT(0x04), - VISUAL_ID(0x08), - SOUL_CRYSTAL(0x10); + AUGMENT_BONUS(1), + ELEMENTAL_ATTRIBUTE(2), + ENCHANT_EFFECT(4), + VISUAL_ID(8), + SOUL_CRYSTAL(16); private final int _mask; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java index b3d08596c6..29403b783d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum MacroUpdateType { - ADD(0x01), - LIST(0x01), - MODIFY(0x02), - DELETE(0x00); + ADD(1), + LIST(1), + MODIFY(2), + DELETE(0); private final int _id; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java index 86c6159869..7776721c0f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java @@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum PartySmallWindowUpdateType implements IUpdateTypeComponent { - CURRENT_CP(0x01), - MAX_CP(0x02), - CURRENT_HP(0x04), - MAX_HP(0x08), - CURRENT_MP(0x10), - MAX_MP(0x20), - LEVEL(0x40), - CLASS_ID(0x80), - PARTY_SUBSTITUTE(0x100), - VITALITY_POINTS(0x200); + CURRENT_CP(1), + MAX_CP(2), + CURRENT_HP(4), + MAX_HP(8), + CURRENT_MP(16), + MAX_MP(32), + LEVEL(64), + CLASS_ID(128), + PARTY_SUBSTITUTE(256), + VITALITY_POINTS(512); private final int _mask; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 00bb331778..667ce7f17c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.Broadcast; import org.l2jmobius.gameserver.util.Util; /** - * Fromat:(ch) dddddc + * Format:(ch) dddddc * @author -Wooden- */ public class RequestExMagicSkillUseGround implements IClientIncomingPacket diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java index ec60042793..6054868de7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java @@ -39,7 +39,6 @@ public class AbnormalStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ABNORMAL_STATUS_UPDATE.writeId(packet); - packet.writeH(_effects.size()); for (BuffInfo info : _effects) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 1b8ddb2042..bec794bef3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -44,7 +44,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; } @@ -60,7 +59,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; setHtml(html); } @@ -77,13 +75,11 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } - if (!html.contains(""; return; } - _html = html; } @@ -96,7 +92,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } - setHtml(content); return true; } @@ -138,12 +133,10 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { player.clearHtmlActions(getScope()); } - if (_disabledValidation) { return; } - if (player != null) { Util.buildHtmlActionCache(player, getScope(), _npcObjId, _html); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 9964cd1f64..b4b72650cf 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -110,12 +110,10 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket= 0) || (item.getAttributeDefence(AttributeType.FIRE) > 0) || (item.getAttributeDefence(AttributeType.WATER) > 0) || (item.getAttributeDefence(AttributeType.WIND) > 0) || (item.getAttributeDefence(AttributeType.EARTH) > 0) || (item.getAttributeDefence(AttributeType.HOLY) > 0) || (item.getAttributeDefence(AttributeType.DARK) > 0)) { mask |= ItemListType.ELEMENTAL_ATTRIBUTE.getMask(); } - if (item.getEnchantOptions() != null) { for (int id : item.getEnchantOptions()) @@ -127,17 +125,14 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket 0) { mask |= ItemListType.VISUAL_ID.getMask(); } - if (((item.getSoulCrystalOptions() != null) && !item.getSoulCrystalOptions().isEmpty()) || ((item.getSoulCrystalSpecialOptions() != null) && !item.getSoulCrystalSpecialOptions().isEmpty())) { mask |= ItemListType.SOUL_CRYSTAL.getMask(); } - return mask; } @@ -205,7 +200,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); packet.writeC(removeSkills.size()); for (Skill removed : removeSkills) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java index 8fa6259f64..6451dffd02 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ActionFailed implements IClientOutgoingPacket { public static final ActionFailed STATIC_PACKET = new ActionFailed(); - private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); + private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); static { for (SkillCastingType castingType : SkillCastingType.values()) @@ -57,7 +57,6 @@ public class ActionFailed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ACTION_FAIL.writeId(packet); - packet.writeD(_castingType); // MagicSkillUse castingType return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java index 6e868368c9..30ce58da60 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java @@ -44,9 +44,8 @@ public class AgitDecoInfo implements IClientOutgoingPacket { continue; } - packet.writeC(_residense.hasFunction(type) ? 0x01 : 0x00); + packet.writeC(_residense.hasFunction(type) ? 1 : 0); } - // Unknown packet.writeD(0); // TODO: Find me! packet.writeD(0); // TODO: Find me! diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java index 6cb71fc985..4683fb30f0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java @@ -44,7 +44,6 @@ public class AllianceInfo implements IClientOutgoingPacket _name = leader.getAllyName(); _leaderC = leader.getName(); _leaderP = leader.getLeaderName(); - final Collection allies = ClanTable.getInstance().getClanAllies(allianceId); _allies = new ClanInfo[allies.size()]; int idx = 0; @@ -57,7 +56,6 @@ public class AllianceInfo implements IClientOutgoingPacket total += ci.getTotal(); online += ci.getOnline(); } - _total = total; _online = online; } @@ -66,18 +64,16 @@ public class AllianceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_INFO.writeId(packet); - packet.writeS(_name); packet.writeD(_total); packet.writeD(_online); packet.writeS(_leaderC); packet.writeS(_leaderP); - packet.writeD(_allies.length); for (ClanInfo aci : _allies) { packet.writeS(aci.getClan().getName()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(aci.getClan().getLevel()); packet.writeS(aci.getClan().getLeaderName()); packet.writeD(aci.getTotal()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java index f9d08f6600..186fd12e81 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java @@ -44,7 +44,6 @@ public class AllyCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java index 6218f1717f..1ae4653f91 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java @@ -38,7 +38,6 @@ public class AskJoinAlly implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_ALLIANCE.writeId(packet); - packet.writeD(_requestorObjId); packet.writeS(null); // Ally Name ? packet.writeS(null); // TODO: Find me! diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java index a66bb3cd33..b9cfbe81b9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java @@ -39,7 +39,6 @@ public class AskJoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_PARTY.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 05c420ff59..227ab571be 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -45,7 +45,6 @@ public class Attack implements IClientOutgoingPacket _attackerObjId = attacker.getObjectId(); _attackerLoc = new Location(attacker); _targetLoc = new Location(target); - final Player player = attacker.getActingPlayer(); if (player == null) { @@ -111,7 +110,6 @@ public class Attack implements IClientOutgoingPacket final Iterator it = _hits.iterator(); final Hit firstHit = it.next(); OutgoingPackets.ATTACK.writeId(packet); - packet.writeD(_attackerObjId); packet.writeD(firstHit.getTargetId()); packet.writeD(_soulshotVisualSubstitute); // Ertheia @@ -121,13 +119,11 @@ public class Attack implements IClientOutgoingPacket packet.writeD(_attackerLoc.getX()); packet.writeD(_attackerLoc.getY()); packet.writeD(_attackerLoc.getZ()); - packet.writeH(_hits.size() - 1); while (it.hasNext()) { writeHit(packet, it.next()); } - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java index bd6878eb42..8b85fe85e3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java @@ -35,7 +35,6 @@ public class AutoAttackStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_START.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java index e767d1877a..a294b1e212 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java @@ -35,7 +35,6 @@ public class AutoAttackStop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_STOP.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java index 3f329415df..0c79677eae 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java @@ -38,7 +38,6 @@ public class BlockListPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BLOCK_LIST.writeId(packet); - packet.writeD(_playersId.size()); for (int playerId : _playersId) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index f610cdc6aa..d95f0543b9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -45,8 +45,7 @@ public class BuyList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x00); // Type BUY + packet.writeD(0); // Type BUY packet.writeQ(_money); // current money packet.writeD(_listId); packet.writeD(_inventorySlots); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index cd25af908d..7cb2bf4425 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -50,36 +50,34 @@ public class BuyListSeed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BUY_LIST_SEED.writeId(packet); - packet.writeQ(_money); // current money - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeD(_manorId); // manor id - if (!_list.isEmpty()) { packet.writeH(_list.size()); // list length for (SeedProduction s : _list) { - packet.writeC(0x00); // mask item 0 to print minimal item information + packet.writeC(0); // mask item 0 to print minimal item information packet.writeD(s.getId()); // ObjectId packet.writeD(s.getId()); // ItemId packet.writeC(0xFF); // T1 packet.writeQ(s.getAmount()); // Quantity - packet.writeC(0x05); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item - packet.writeC(0x00); // Filler (always 0) - packet.writeH(0x00); // Equipped : 00-No, 01-yes - packet.writeQ(0x00); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand - packet.writeH(0x00); // Enchant level (pet level shown in control item) + packet.writeC(5); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item + packet.writeC(0); // Filler (always 0) + packet.writeH(0); // Equipped : 00-No, 01-yes + packet.writeQ(0); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand + packet.writeH(0); // Enchant level (pet level shown in control item) packet.writeD(-1); packet.writeD(-9999); - packet.writeC(0x01); // GOD Item enabled = 1 disabled (red) = 0 + packet.writeC(1); // GOD Item enabled = 1 disabled (red) = 0 packet.writeQ(s.getPrice()); // price } _list.clear(); } else { - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java index 3a7b67af23..f3dc872dca 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java @@ -32,8 +32,7 @@ public class CSShowComBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - - packet.writeC(0x01); // c4 1 to show community 00 to hide + packet.writeC(1); // c4 1 to show community 00 to hide packet.writeB(_html); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java index eacc27aa07..b18dac4cc3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java @@ -36,7 +36,6 @@ public class CameraMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CAMERA_MODE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java index 1682f5bc62..adea754676 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java @@ -39,7 +39,6 @@ public class ChairSit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAIR_SIT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_staticObjectId); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java index 2bc31a285a..de141fa067 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java @@ -38,7 +38,6 @@ public class ChangeMoveType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_MOVE_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_running ? RUN : WALK); packet.writeD(0); // c2 diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index 73277d923d..fbe5e39e2e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -22,17 +22,17 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ChangeWaitType implements IClientOutgoingPacket { + public static final int WT_SITTING = 0; + public static final int WT_STANDING = 1; + public static final int WT_START_FAKEDEATH = 2; + public static final int WT_STOP_FAKEDEATH = 3; + private final int _objectId; private final int _moveType; private final int _x; private final int _y; private final int _z; - public static final int WT_SITTING = 0; - public static final int WT_STANDING = 1; - public static final int WT_START_FAKEDEATH = 2; - public static final int WT_STOP_FAKEDEATH = 3; - public ChangeWaitType(Creature creature, int newMoveType) { _objectId = creature.getObjectId(); @@ -46,7 +46,6 @@ public class ChangeWaitType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_WAIT_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_moveType); packet.writeD(_x); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index 41180bac50..aa2e7b2eaa 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -30,7 +30,6 @@ public class CharCreateFail implements IClientOutgoingPacket public static final int REASON_CREATE_NOT_ALLOWED = 0x05; // "Characters cannot be created from this server." public static final int REASON_CHOOSE_ANOTHER_SVR = 0x06; // "Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please // choose another server." - private final int _error; public CharCreateFail(int errorCode) @@ -42,7 +41,6 @@ public class CharCreateFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index f0e99885ad..768617e558 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -31,8 +31,7 @@ public class CharCreateOk implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_SUCCESS.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index bed289ca0a..1674eef343 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -33,7 +33,6 @@ public class CharDeleteFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_DELETE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 778ffbd3c3..29bb97c681 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -33,6 +33,22 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { + private static final int[] PAPERDOLL_ORDER = new int[] + { + Inventory.PAPERDOLL_UNDER, + Inventory.PAPERDOLL_HEAD, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_LHAND, + Inventory.PAPERDOLL_GLOVES, + Inventory.PAPERDOLL_CHEST, + Inventory.PAPERDOLL_LEGS, + Inventory.PAPERDOLL_FEET, + Inventory.PAPERDOLL_CLOAK, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_HAIR, + Inventory.PAPERDOLL_HAIR2 + }; + private final Player _player; private final Clan _clan; private int _objId; @@ -55,22 +71,6 @@ public class CharInfo implements IClientOutgoingPacket private int _vehicleId = 0; private final boolean _gmSeeInvis; - private static final int[] PAPERDOLL_ORDER = new int[] - { - Inventory.PAPERDOLL_UNDER, - Inventory.PAPERDOLL_HEAD, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_LHAND, - Inventory.PAPERDOLL_GLOVES, - Inventory.PAPERDOLL_CHEST, - Inventory.PAPERDOLL_LEGS, - Inventory.PAPERDOLL_FEET, - Inventory.PAPERDOLL_CLOAK, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_HAIR, - Inventory.PAPERDOLL_HAIR2 - }; - public CharInfo(Player player, boolean gmSeeInvis) { _player = player; @@ -125,9 +125,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_vehicleId); // Confirmed packet.writeD(_objId); // Confirmed packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed - packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) @@ -151,10 +150,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.getPvpFlag()); packet.writeD(_player.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -165,53 +162,40 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); - packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeS(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle()); - packet.writeD(_player.getAppearance().getVisibleClanId()); packet.writeD(_player.getAppearance().getVisibleClanCrestId()); packet.writeD(_player.getAppearance().getVisibleAllyId()); packet.writeD(_player.getAppearance().getVisibleAllyCrestId()); - - packet.writeC(_player.isSitting() ? 0x00 : 0x01); // Confirmed - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // Confirmed - packet.writeC(_player.isInCombat() ? 0x01 : 0x00); // Confirmed - - packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 0x01 : 0x00); // Confirmed - - packet.writeC(_player.isInvisible() ? 0x01 : 0x00); - + packet.writeC(_player.isSitting() ? 0 : 1); // Confirmed + packet.writeC(_player.isRunning() ? 1 : 0); // Confirmed + packet.writeC(_player.isInCombat() ? 1 : 0); // Confirmed + packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 1 : 0); // Confirmed + packet.writeC(_player.isInvisible() ? 1 : 0); packet.writeC(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount packet.writeC(_player.getPrivateStoreType().getId()); // Confirmed packet.writeH(_player.getCubics().size()); // Confirmed _player.getCubics().keySet().forEach(packet::writeH); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); // Confirmed packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); packet.writeH(_player.getRecomHave()); // Confirmed packet.writeD(_player.getMountNpcId() == 0 ? 0 : _player.getMountNpcId() + 1000000); - packet.writeD(_player.getClassId().getId()); // Confirmed - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeC(_player.isMounted() ? 0 : _enchantLevel); // Confirmed - packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeD(_player.getClanCrestLargeId()); packet.writeC(_player.getNobleLevel()); // Confirmed packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed - final ILocational baitLocation = _player.getFishing().getBaitLocation(); if (baitLocation != null) { @@ -227,29 +211,21 @@ public class CharInfo implements IClientOutgoingPacket } packet.writeD(_player.getAppearance().getNameColor()); // Confirmed - packet.writeD(_heading); // Confirmed - packet.writeC(_player.getPledgeClass()); packet.writeH(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); // Confirmed - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - - packet.writeC(0x00); // nPvPRestrainStatus - + packet.writeC(0); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentHp())); // Confirmed packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - - packet.writeC(0x00); // cBRLectureMark + packet.writeC(0); // cBRLectureMark final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed @@ -261,8 +237,9 @@ public class CharInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } + packet.writeC(_player.isTrueHero() ? 100 : 0); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); // Hair accessory + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); // Hair accessory packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 7187b73184..11f5f4df52 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -40,17 +40,16 @@ public class CharSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTED.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getTitle()); packet.writeD(_sessionId); packet.writeD(_player.getClanId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x01); // active ?? + packet.writeD(1); // active ?? packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -62,25 +61,20 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_player.getReputation()); packet.writeD(_player.getPkKills()); packet.writeD(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_player.getClassId().getId()); - packet.writeB(new byte[16]); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeB(new byte[28]); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index ef1a9088a3..ea750c697c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -44,10 +44,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { private static final Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); - private final String _loginName; - private final int _sessionId; - private int _activeId; - private final List _characterPackages; private static final int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { @@ -62,6 +58,11 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_HAIR2, }; + private final String _loginName; + private final int _sessionId; + private int _activeId; + private final List _characterPackages; + /** * Constructor for CharSelectionInfo. * @param loginName @@ -92,16 +93,13 @@ public class CharSelectionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.size(); packet.writeD(size); // Created character count - packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) - packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 0x01 : 0x00); // if 1 can't create new char - packet.writeC(0x01); // 0=can't play, 1=can play free until level 85, 2=100% free play - packet.writeD(0x02); // if 1, Korean client - packet.writeC(0x00); // If 1 suggests premium account - + packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 1 : 0); // if 1 can't create new char + packet.writeC(1); // 0=can't play, 1=can play free until level 85, 2=100% free play + packet.writeD(2); // if 1, Korean client + packet.writeC(0); // If 1 suggests premium account long lastAccess = 0; if (_activeId == -1) { @@ -114,7 +112,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - for (int i = 0; i < size; i++) { final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); @@ -122,90 +119,73 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name packet.writeD(_sessionId); // Account ID - packet.writeD(0x00); // Clan ID - packet.writeD(0x00); // Builder level - + packet.writeD(0); // Clan ID + packet.writeD(0); // Builder level packet.writeD(charInfoPackage.getSex()); // Sex packet.writeD(charInfoPackage.getRace()); // Race packet.writeD(charInfoPackage.getBaseClassId()); - - packet.writeD(0x01); // GameServerName - + packet.writeD(1); // GameServerName packet.writeD(charInfoPackage.getX()); packet.writeD(charInfoPackage.getY()); packet.writeD(charInfoPackage.getZ()); packet.writeF(charInfoPackage.getCurrentHp()); packet.writeF(charInfoPackage.getCurrentMp()); - packet.writeQ(charInfoPackage.getSp()); packet.writeQ(charInfoPackage.getExp()); packet.writeF((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel()))); // High // Five packet.writeD(charInfoPackage.getLevel()); - packet.writeD(charInfoPackage.getReputation()); packet.writeD(charInfoPackage.getPkKills()); packet.writeD(charInfoPackage.getPvPKills()); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); // Ertheia - packet.writeD(0x00); // Ertheia - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); // Ertheia + packet.writeD(0); // Ertheia for (int slot : getPaperdollOrder()) { packet.writeD(charInfoPackage.getPaperdollItemId(slot)); } - for (int slot : getPaperdollOrderVisualId()) { packet.writeD(charInfoPackage.getPaperdollItemVisualId(slot)); } - packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_CHEST)); // Upper Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_LEGS)); // Lower Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_HEAD)); // Headgear enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_GLOVES)); // Gloves enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_FEET)); // Boots enchant level - packet.writeD(charInfoPackage.getHairStyle()); packet.writeD(charInfoPackage.getHairColor()); packet.writeD(charInfoPackage.getFace()); - packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); - packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption1Id() : 0); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption2Id() : 0); - // packet.writeD(charInfoPackage.getTransformId()); // Used to display Transformations - packet.writeD(0x00); // Currently on retail when you are on character select you don't see your transformation. - - packet.writeD(0x00); // Pet NpcId - packet.writeD(0x00); // Pet level - packet.writeD(0x00); // Pet Food - packet.writeD(0x00); // Pet Food Level - packet.writeF(0x00); // Current pet HP - packet.writeF(0x00); // Current pet MP - + packet.writeD(0); // Currently on retail when you are on character select you don't see your transformation. + packet.writeD(0); // Pet NpcId + packet.writeD(0); // Pet level + packet.writeD(0); // Pet Food + packet.writeD(0); // Pet Food Level + packet.writeF(0); // Current pet HP + packet.writeF(0); // Current pet MP packet.writeD(charInfoPackage.getVitalityPoints()); // Vitality packet.writeD((int) Config.RATE_VITALITY_EXP_MULTIPLIER * 100); // Vitality Percent packet.writeD(charInfoPackage.getVitalityItemsUsed()); // Remaining vitality item uses - packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0x00 : 0x01); // Char is active or not - packet.writeC(charInfoPackage.isNoble() ? 0x01 : 0x00); - packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 0x01 : 0x00); // Hero glow - packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 0x01 : 0x00); // Show hair accessory if enabled + packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0 : 1); // Char is active or not + packet.writeC(charInfoPackage.isNoble() ? 1 : 0); + packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 1 : 0); // Hero glow + packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 1 : 0); // Show hair accessory if enabled } return true; } @@ -214,7 +194,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); - try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate")) { @@ -227,7 +206,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (charInfopackage != null) { characterList.add(charInfopackage); - final Player player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { @@ -241,7 +219,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return characterList; } @@ -283,7 +260,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { clan.removeClanMember(objectId, 0); } - GameClient.deleteCharByObjId(objectId); return null; } @@ -302,20 +278,16 @@ public class CharSelectionInfo implements IClientOutgoingPacket charInfopackage.setHairStyle(chardata.getInt("hairstyle")); charInfopackage.setHairColor(chardata.getInt("haircolor")); charInfopackage.setSex(chardata.getInt("sex")); - charInfopackage.setExp(chardata.getLong("exp")); charInfopackage.setSp(chardata.getLong("sp")); charInfopackage.setVitalityPoints(chardata.getInt("vitality_points")); charInfopackage.setClanId(chardata.getInt("clanid")); - charInfopackage.setRace(chardata.getInt("race")); - final int baseClassId = chardata.getInt("base_class"); final int activeClassId = chardata.getInt("classid"); charInfopackage.setX(chardata.getInt("x")); charInfopackage.setY(chardata.getInt("y")); charInfopackage.setZ(chardata.getInt("z")); - final int faction = chardata.getInt("faction"); if (faction == 1) { @@ -325,7 +297,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setEvil(); } - if (Config.MULTILANG_ENABLE) { String lang = chardata.getString("language"); @@ -335,22 +306,18 @@ public class CharSelectionInfo implements IClientOutgoingPacket } charInfopackage.setHtmlPrefix("data/lang/" + lang + "/"); } - // if is in subclass, load subclass exp, sp, level info if (baseClassId != activeClassId) { loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId); } - charInfopackage.setClassId(activeClassId); - // Get the augmentation id for equipped weapon int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); if (weaponObjId < 1) { weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); } - if (weaponObjId > 0) { try (Connection con = DatabaseFactory.getConnection(); @@ -376,7 +343,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } - // Check if the base class is set to zero and also doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly. if ((baseClassId == 0) && (activeClassId > 0)) { @@ -386,7 +352,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setBaseClassId(baseClassId); } - charInfopackage.setDeleteTimer(deletetime); charInfopackage.setLastAccess(chardata.getLong("lastAccess")); charInfopackage.setNoble(chardata.getInt("nobless") == 1); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java index 847e24db87..d59df7911a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java @@ -32,7 +32,6 @@ public class ChooseInventoryItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHOOSE_INVENTORY_ITEM.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java index 12a3940521..ac66c2fa0f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java @@ -32,7 +32,6 @@ public class ClientSetTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CLIENT_SET_TIME.writeId(packet); - packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // time in client minutes packet.writeD(6); // constant to match the server time( this determines the speed of the client clock) return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java index 195824578b..5fdb62f544 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java @@ -68,7 +68,6 @@ public class ConfirmDlg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CONFIRM_DLG.writeId(packet); - final SMParam[] params = _systemMessage.getParams(); packet.writeD(_systemMessage.getId()); packet.writeD(params.length); @@ -130,7 +129,6 @@ public class ConfirmDlg implements IClientOutgoingPacket } } } - packet.writeD(_time); packet.writeD(_requesterId); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 2a98428740..85d5630327 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -71,7 +71,6 @@ public class CreatureSay implements IClientOutgoingPacket _mask |= 0x08; } } - // Does not shows level if (sender.isGM()) { @@ -123,7 +122,6 @@ public class CreatureSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_sender == null ? 0 : _sender.getObjectId()); packet.writeD(_chatType.getClientId()); if (_senderName != null) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index dfc40d995f..a307b06e4b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -38,9 +38,8 @@ public class DeleteObject implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DELETE_OBJECT.writeId(packet); - packet.writeD(_objectId); - packet.writeC(0x00); // c2 + packet.writeC(0); // c2 return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java index 982c8f3311..3b5917e55b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java @@ -50,7 +50,6 @@ public class Dice implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DICE.writeId(packet); - packet.writeD(_objectId); // object id of player packet.writeD(_itemId); // item id of dice (spade) 4625,4626,4627,4628 packet.writeD(_number); // number rolled diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 3d741a86a6..ebc93d0fc4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -68,7 +68,6 @@ public class Die implements IClientOutgoingPacket siegeClan = fort.getSiege().getAttackerClan(clan); isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan); } - _toVillage = creature.canRevive() && !creature.isPendingRevive(); _toClanHall = (clan != null) && (clan.getHideoutId() > 0); _toCastle = ((clan != null) && (clan.getCastleId() > 0)) || isInCastleDefense; @@ -76,7 +75,6 @@ public class Die implements IClientOutgoingPacket _useFeather = creature.getAccessLevel().allowFixedRes() || creature.getInventory().haveItemForSelfResurrection(); _toFortress = ((clan != null) && (clan.getFortId() > 0)) || isInFortDefense; } - _isSweepable = creature.isAttackable() && creature.isSweepActive(); } @@ -91,7 +89,6 @@ public class Die implements IClientOutgoingPacket { _items = new ArrayList<>(8); } - if (_items.size() < 8) { _items.add(itemId); @@ -116,20 +113,18 @@ public class Die implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DIE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_toVillage ? 0x01 : 0x00); - packet.writeD(_toClanHall ? 0x01 : 0x00); - packet.writeD(_toCastle ? 0x01 : 0x00); - packet.writeD(_toOutpost ? 0x01 : 0x00); - packet.writeD(_isSweepable ? 0x01 : 0x00); - packet.writeD(_useFeather ? 0x01 : 0x00); - packet.writeD(_toFortress ? 0x01 : 0x00); - packet.writeD(0x00); // Disables use Feather button for X seconds - packet.writeD(0x00); // Adventure's Song - packet.writeC(_hideAnimation ? 0x01 : 0x00); - - packet.writeD(_itemsEnabled ? 0x01 : 0x00); + packet.writeD(_toVillage ? 1 : 0); + packet.writeD(_toClanHall ? 1 : 0); + packet.writeD(_toCastle ? 1 : 0); + packet.writeD(_toOutpost ? 1 : 0); + packet.writeD(_isSweepable ? 1 : 0); + packet.writeD(_useFeather ? 1 : 0); + packet.writeD(_toFortress ? 1 : 0); + packet.writeD(0); // Disables use Feather button for X seconds + packet.writeD(0); // Adventure's Song + packet.writeC(_hideAnimation ? 1 : 0); + packet.writeD(_itemsEnabled ? 1 : 0); packet.writeD(getItems().size()); getItems().forEach(packet::writeD); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java index 15404f9dee..5837faec19 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java @@ -33,7 +33,6 @@ public class DoorInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_INFO.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.getId()); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java index 54f8742a73..14d41afee7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java @@ -33,7 +33,6 @@ public class DoorStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_STATUS_UPDATE.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.isOpen() ? 0 : 1); packet.writeD(_door.getDamage()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index cfa4f6759d..52e04af09c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -40,20 +40,17 @@ public class DropItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DROP_ITEM.writeId(packet); - packet.writeD(_objectId); packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeC(_item.isStackable() ? 0x01 : 0x00); + packet.writeC(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - - packet.writeC(0x00); - // packet.writeD(0x01); if above C == true (1) then packet.readD() + packet.writeC(0); + // packet.writeD(1); if above C == true (1) then packet.readD() return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java index 631c43ba0c..99bd80d97e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java @@ -62,13 +62,12 @@ public class Earthquake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EARTHQUAKE.writeId(packet); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_intensity); packet.writeD(_duration); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index db168592f1..335ea9dced 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -58,7 +58,6 @@ public class EnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_crystal); packet.writeQ(_count); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java index 837be1f5e3..169410245b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java @@ -41,7 +41,6 @@ public class EtcStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ETC_STATUS_UPDATE.writeId(packet); - packet.writeC(_player.getCharges()); // 1-7 increase force, level packet.writeD(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%) packet.writeC(_player.getExpertiseWeaponPenalty()); // Weapon Grade Penalty [1-4] diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java index 5dca90f960..9f8d576148 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java @@ -24,13 +24,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class Ex2ndPasswordAck implements IClientOutgoingPacket { + // TODO: Enum + public static final int SUCCESS = 0; + public static final int WRONG_PATTERN = 1; + private final int _status; private final int _response; - // TODO: Enum - public static final int SUCCESS = 0x00; - public static final int WRONG_PATTERN = 0x01; - public Ex2ndPasswordAck(int status, int response) { _status = status; @@ -41,10 +41,9 @@ public class Ex2ndPasswordAck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_ACK.writeId(packet); - packet.writeC(_status); - packet.writeD(_response == WRONG_PATTERN ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(_response == WRONG_PATTERN ? 1 : 0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java index 48bde5161d..c86b5185d0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordCheck implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_NEW = 0x00; - public static final int PASSWORD_PROMPT = 0x01; - public static final int PASSWORD_OK = 0x02; + public static final int PASSWORD_NEW = 0; + public static final int PASSWORD_PROMPT = 1; + public static final int PASSWORD_OK = 2; private final int _windowType; @@ -40,9 +40,8 @@ public class Ex2ndPasswordCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_CHECK.writeId(packet); - packet.writeD(_windowType); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java index 1abf50ab01..f6731bf18f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordVerify implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_OK = 0x00; - public static final int PASSWORD_WRONG = 0x01; - public static final int PASSWORD_BAN = 0x02; + public static final int PASSWORD_OK = 0; + public static final int PASSWORD_WRONG = 1; + public static final int PASSWORD_BAN = 2; private final int _wrongTentatives; private final int _mode; @@ -42,7 +42,6 @@ public class Ex2ndPasswordVerify implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_VERIFY.writeId(packet); - packet.writeD(_mode); packet.writeD(_wrongTentatives); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java index 8f3d5ec764..528988ab5f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java @@ -45,10 +45,8 @@ public class ExAbnormalStatusUpdateFromTarget implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ABNORMAL_STATUS_UPDATE_FROM_TARGET.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeH(_effects.size()); - for (BuffInfo info : _effects) { packet.writeD(info.getSkill().getDisplayId()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java index c4b9cd8356..f3abd6ec5c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java @@ -41,7 +41,6 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRABLE_SKILL_LIST_BY_CLASS.writeId(packet); - packet.writeH(_type.getId()); packet.writeH(_learnable.size()); for (SkillLearn skill : _learnable) @@ -54,7 +53,7 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket packet.writeC(skill.getRequiredItems().size()); if (_type == AcquireSkillType.SUBPLEDGE) { - packet.writeH(0x00); + packet.writeH(0); } } return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java index fd0e2fc97c..8555bb6e86 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java @@ -61,7 +61,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_SKILL_INFO.writeId(packet); - packet.writeD(_id); packet.writeD(_level); packet.writeQ(_spCost); @@ -73,7 +72,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket packet.writeD(holder.getId()); packet.writeQ(holder.getCount()); } - packet.writeD(_skillRem.size()); for (Skill skill : _skillRem) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java index 29793f4d6c..ff8c526ec4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java @@ -36,7 +36,6 @@ public class ExAdenaInvenCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ADENA_INVEN_COUNT.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeH(_player.getInventory().getSize()); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java index 2aa2d85bc5..5ef11e0f1e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java @@ -50,13 +50,11 @@ public class ExAirShipInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_INFO.writeId(packet); - packet.writeD(_ship.getObjectId()); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(_captain); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); @@ -73,14 +71,13 @@ public class ExAirShipInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - packet.writeD(_ship.getFuel()); packet.writeD(_ship.getMaxFuel()); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java index 4cfc76bfba..8b37f4fc0a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java @@ -42,7 +42,6 @@ public class ExAirShipStopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_airShipId); packet.writeD(_playerId); packet.writeD(_x); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java index 33c57712da..52958f931b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java @@ -37,12 +37,10 @@ public class ExAirShipTeleportList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_TELEPORT_LIST.writeId(packet); - packet.writeD(_dockId); if (_teleports != null) { packet.writeD(_teleports.length); - for (int i = 0; i < _teleports.length; i++) { packet.writeD(i - 1); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java index 392b228f0d..7918022c72 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java @@ -50,13 +50,12 @@ public class ExAlchemySkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_SKILL_LIST.writeId(packet); - packet.writeD(_skills.size()); for (Skill skill : _skills) { packet.writeD(skill.getId()); packet.writeD(skill.getLevel()); - packet.writeQ(0x00); // Always 0 on Naia, SP i guess? + packet.writeQ(0); // Always 0 on Naia, SP i guess? packet.writeC(skill.getId() == CommonSkill.ALCHEMY_CUBE.getId() ? 0 : 1); // This is type in flash, visible or not } return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java index 3bfadd2650..ed7f8d4255 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java @@ -47,12 +47,10 @@ public class ExAlterSkillRequest implements IClientOutgoingPacket { return true; } - OutgoingPackets.EX_ALTER_SKILL_REQUEST.writeId(packet); packet.writeD(_nextSkillId); packet.writeD(_currentSkillId); packet.writeD(_alterTime); - if (_alterTime > 0) { _player.setAlterSkillActive(true); @@ -62,7 +60,6 @@ public class ExAlterSkillRequest implements IClientOutgoingPacket _player.setAlterSkillActive(false); }, _alterTime * 1000); } - return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java index 3d7ee12a81..1990e1e701 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java @@ -37,7 +37,6 @@ public class ExAskCoupleAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_COUPLE_ACTION.writeId(packet); - packet.writeD(_actionId); packet.writeD(_objectId); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java index 61cabedd98..45615daf5a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java @@ -39,9 +39,8 @@ public class ExAskJoinMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_MPCC.writeId(packet); - packet.writeS(_requestorName); // name of CCLeader - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java index 17fa9d028f..908022ff7e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java @@ -38,7 +38,6 @@ public class ExAskJoinPartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_PARTY_ROOM.writeId(packet); - packet.writeS(_charName); packet.writeS(_roomName); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java index 2a6b958dc9..1551840013 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java @@ -38,7 +38,6 @@ public class ExAskModifyPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_MODIFY_PARTY_LOOTING.writeId(packet); - packet.writeS(_requestor); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java index 958e7c3d06..fa62c8a207 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java @@ -45,7 +45,6 @@ public class ExAttributeEnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ATTRIBUTE_ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeC(_isWeapon); packet.writeH(_type); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java index 1a3a1ef3fe..3d65055b3c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java @@ -41,9 +41,8 @@ public class ExAutoSoulShot implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AUTO_SOUL_SHOT.writeId(packet); - packet.writeD(_itemId); - packet.writeD(_enable ? 0x01 : 0x00); + packet.writeD(_enable ? 1 : 0); packet.writeD(_type); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java index 8680c6bd7a..a8137347ec 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java @@ -37,8 +37,7 @@ public class ExBaseAttributeCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASE_ATTRIBUTE_CANCEL_RESULT.writeId(packet); - - packet.writeD(0x01); // result + packet.writeD(1); // result packet.writeD(_objId); packet.writeD(_attribute); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java index acbad69599..27f7fb5a63 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java @@ -75,7 +75,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 1149, 1150, 1151, 1152, 1153, 1154, 1155 }; - public static final int[] DEFAULT_ACTION_LIST = { 0, 1, 2, 3, @@ -145,7 +144,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 5012, 5013, 5014, 5015 }; //@formatter:on - public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST); private final int[] _actionIds; @@ -159,7 +157,6 @@ public class ExBasicActionList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASIC_ACTION_LIST.writeId(packet); - packet.writeD(_actionIds.length); for (int _actionId : _actionIds) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java index 4c4fac8c91..d32dca4d21 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java @@ -34,13 +34,14 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBeautyItemList implements IClientOutgoingPacket { - private int _colorCount; - private final BeautyData _beautyData; - private final Map> _colorData = new HashMap<>(); private static final int HAIR_TYPE = 0; private static final int FACE_TYPE = 1; private static final int COLOR_TYPE = 2; + private int _colorCount; + private final BeautyData _beautyData; + private final Map> _colorData = new HashMap<>(); + public ExBeautyItemList(Player player) { _beautyData = BeautyShopData.getInstance().getBeautyData(player.getRace(), player.getAppearance().getSexType()); @@ -60,7 +61,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BEAUTY_ITEM_LIST.writeId(packet); - packet.writeD(HAIR_TYPE); packet.writeD(_beautyData.getHairList().size()); for (BeautyItem hair : _beautyData.getHairList().values()) @@ -72,7 +72,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(hair.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(FACE_TYPE); packet.writeD(_beautyData.getFaceList().size()); for (BeautyItem face : _beautyData.getFaceList().values()) @@ -84,7 +83,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(face.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(COLOR_TYPE); packet.writeD(_colorCount); for (Entry> entry : _colorData.entrySet()) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java index 1825236886..6d4c45cb2b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java @@ -34,7 +34,6 @@ public class ExBirthdayPopup implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_BIRTH_DAY.writeId(packet); - return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java index 7d2f17e697..43e525f05f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java @@ -26,6 +26,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBrBroadcastEventState implements IClientOutgoingPacket { + public static final int APRIL_FOOLS = 20090401; + public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) + public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) + public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) + public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) + private final int _eventId; private final int _eventState; private int _param0; @@ -36,12 +42,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket private String _param5; private String _param6; - public static final int APRIL_FOOLS = 20090401; - public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) - public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) - public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) - public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) - public ExBrBroadcastEventState(int eventId, int eventState) { _eventId = eventId; @@ -65,7 +65,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BROADCAST_EVENT_STATE.writeId(packet); - packet.writeD(_eventId); packet.writeD(_eventState); packet.writeD(_param0); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java index 1fd7ec663a..c0683c8797 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java @@ -44,7 +44,6 @@ public class ExBrBuffEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUFF_EVENT_STATE.writeId(packet); - packet.writeD(_type); packet.writeD(_value); packet.writeD(_state); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java index 943aae8a62..8e009d7b09 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java @@ -43,7 +43,6 @@ public class ExBrLoadEventTopRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_LOAD_EVENT_TOP_RANKERS.writeId(packet); - packet.writeD(_eventId); packet.writeD(_day); packet.writeD(_count); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java index 6a98c01654..9105e39efe 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java @@ -36,9 +36,8 @@ public class ExBrPremiumState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PREMIUM_STATE.writeId(packet); - packet.writeD(_player.getObjectId()); - packet.writeC(_player.hasPremiumStatus() ? 0x01 : 0x00); + packet.writeC(_player.hasPremiumStatus() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 381dd859ad..567cfc70f9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -59,10 +59,8 @@ public class ExBuySellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x01); // Type SELL + packet.writeD(1); // Type SELL packet.writeD(_inventorySlots); - if ((_sellList != null)) { packet.writeH(_sellList.size()); @@ -74,9 +72,8 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - if ((_refundList != null) && !_refundList.isEmpty()) { packet.writeH(_refundList.size()); @@ -90,10 +87,9 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - - packet.writeC(_done ? 0x01 : 0x00); + packet.writeC(_done ? 1 : 0); return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java index 2b43c0ce4b..e0ec81e0e7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java @@ -39,7 +39,6 @@ public class ExCastleState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CASTLE_STATE.writeId(packet); - packet.writeD(_castleId); packet.writeD(_castleSide.ordinal()); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java index b7f90d261b..a8196c7a83 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java @@ -52,7 +52,6 @@ public class ExChangeClientEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_CLIENT_EFFECT_INFO.writeId(packet); - packet.writeD(_type); packet.writeD(_key); packet.writeD(_value); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java index 472abc88df..eea59162ee 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java @@ -37,7 +37,6 @@ public class ExChangeNpcState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NPC_STATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java index 8cdcb4460d..45f2805517 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java @@ -49,7 +49,6 @@ public class ExChangePostState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_POST_STATE.writeId(packet); - packet.writeD(_receivedBoard ? 1 : 0); packet.writeD(_changedMsgIds.length); for (int postId : _changedMsgIds) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java index fc58ec9a2e..d765ab54e0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java @@ -35,7 +35,6 @@ public class ExChangeToAwakenedClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_TO_AWAKENED_CLASS.writeId(packet); - packet.writeD(_classId); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index f51a3eb3ae..1e9b8e9dc8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -47,7 +47,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket throw new IllegalArgumentException("Undefined Atribute item: " + stone); } _level = ElementalAttributeData.getInstance().getMaxElementLevel(_itemId); - // Register only items that can be put an attribute stone/crystal for (Item item : player.getInventory().getItems()) { @@ -62,7 +61,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_INVENTORY_ATTRIBUTE_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeQ(_count); packet.writeD(_atribute == AttributeType.FIRE ? 1 : 0); // Fire diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java index a272d85469..238882cd11 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java @@ -35,7 +35,6 @@ public class ExCloseMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java index d2ecd70952..877bca760a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java @@ -34,7 +34,6 @@ public class ExClosePartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_PARTY_ROOM.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java index 27c112776b..1d02c972b5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java @@ -54,7 +54,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLOSSEUM_FENCE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_clientState); packet.writeD(_x); @@ -62,7 +61,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_width); packet.writeD(_length); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java index 766d3619ad..b72bef93e8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java @@ -37,9 +37,8 @@ public class ExConfirmAddingContact implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AGIT_AUCTION_CMD.writeId(packet); - packet.writeS(_charName); - packet.writeD(_added ? 0x01 : 0x00); + packet.writeD(_added ? 1 : 0); return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java index beded32254..c832d507ed 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameAddPlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x01); - + packet.writeD(1); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java index 5f36f730d0..847ea93e6a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java @@ -45,9 +45,7 @@ public class ExCubeGameChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java index 66abbf4b75..a2f2e61ded 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java @@ -43,12 +43,10 @@ public class ExCubeGameChangeTeam implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x05); - + packet.writeD(5); packet.writeD(_player.getObjectId()); - packet.writeD(_fromRedTeam ? 0x01 : 0x00); - packet.writeD(_fromRedTeam ? 0x00 : 0x01); + packet.writeD(_fromRedTeam ? 1 : 0); + packet.writeD(_fromRedTeam ? 0 : 1); return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java index 5273b2099a..136b439283 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java @@ -39,9 +39,7 @@ public class ExCubeGameChangeTimeToStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x03); - + packet.writeD(3); packet.writeD(_seconds); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java index f81a302941..9bdba49029 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java @@ -35,7 +35,6 @@ public class ExCubeGameCloseUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0xffffffff); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java index 259a0e9407..3177e7a488 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java @@ -40,11 +40,9 @@ public class ExCubeGameEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x01); - - packet.writeD(_isRedTeamWin ? 0x01 : 0x00); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(1); + packet.writeD(_isRedTeamWin ? 1 : 0); + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java index 4d89e621ce..8b96bb545f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java @@ -55,14 +55,11 @@ public class ExCubeGameExtendedChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeD(_playerPoints); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java index e5a00f1ab7..c084789f13 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameRemovePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java index 00be884d2f..35a3f289d1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java @@ -35,8 +35,7 @@ public class ExCubeGameRequestReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x04); + packet.writeD(4); return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java index 1bc89e0c32..8b755dd3cc 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java @@ -30,7 +30,6 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket // Players Lists private final List _bluePlayers; private final List _redPlayers; - // Common Values private final int _roomNumber; @@ -51,12 +50,9 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_roomNumber); packet.writeD(0xffffffff); - packet.writeD(_bluePlayers.size()); for (Player player : _bluePlayers) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java index 2f2c092c08..d000112787 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java @@ -31,7 +31,6 @@ public class ExCursedWeaponList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet); - final Set ids = CursedWeaponsManager.getInstance().getCursedWeaponsIds(); packet.writeD(ids.size()); ids.forEach(packet::writeD); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java index 2f60a1b80c..5bc7ff3238 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java @@ -39,7 +39,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet); - if (!_cursedWeaponInfo.isEmpty()) { packet.writeD(_cursedWeaponInfo.size()); @@ -47,7 +46,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { packet.writeD(w.id); packet.writeD(w.activated); - packet.writeD(w.pos.getX()); packet.writeD(w.pos.getY()); packet.writeD(w.pos.getZ()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java index f475a02b28..0456fb9dae 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java @@ -34,7 +34,6 @@ public class ExDissmissMPCCRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DISSMISS_MPCC_ROOM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java index 258010f717..c731b7c7a9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java @@ -37,7 +37,6 @@ public class ExDuelAskStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_ASK_START.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDuel); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java index 043c82c0db..e9a31bee57 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java @@ -38,7 +38,6 @@ public class ExDuelEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_END.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java index 264409b3d6..e1fa1cea88 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java @@ -38,7 +38,6 @@ public class ExDuelReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_READY.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java index 488aafcb7d..ecdd528a16 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java @@ -38,7 +38,6 @@ public class ExDuelStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_START.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java index 7df040c5e7..5ed0c09675 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java @@ -36,7 +36,6 @@ public class ExDuelUpdateUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_UPDATE_USER_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeD(_player.getClassId().getId()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 7ab055a3d8..f58c0573a8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExEnchantSkillInfo implements IClientOutgoingPacket { private final Set _routes; - private final int _skillId; private final int _skillLevel; private final int _skillSubLevel; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 41368a8efb..e4ee350e64 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -50,7 +50,6 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_INFO_DETAIL.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java index 5cedcd6284..1d32f0d725 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java @@ -43,7 +43,6 @@ public class ExEnchantSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_LIST.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skills.size()); for (Skill skill : _skills) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java index 6ab5e869f2..853d74039f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java @@ -38,7 +38,6 @@ public class ExEnchantSkillResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_RESULT.writeId(packet); - packet.writeD(_enchanted ? 1 : 0); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java index 7b7d2d008d..410bf16510 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java @@ -42,7 +42,6 @@ public class ExEventMatchMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_EVENT_MATCH_MESSAGE.writeId(packet); - packet.writeC(_type); packet.writeS(_message); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java index 7264e90233..1946758bf5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java @@ -37,11 +37,9 @@ public class ExGetBookMarkInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOOK_MARK_INFO.writeId(packet); - - packet.writeD(0x00); // Dummy + packet.writeD(0); // Dummy packet.writeD(_player.getBookMarkSlot()); packet.writeD(_player.getTeleportBookmarks().size()); - for (TeleportBookmark tpbm : _player.getTeleportBookmarks()) { packet.writeD(tpbm.getId()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java index 36e7bb81af..201e8eb49b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java @@ -42,15 +42,14 @@ public class ExGetBossRecord implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOSS_RECORD.writeId(packet); - packet.writeD(_ranking); packet.writeD(_totalPoints); if (_bossRecordInfo == null) { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } else { @@ -59,7 +58,7 @@ public class ExGetBossRecord implements IClientOutgoingPacket { packet.writeD(entry.getKey()); packet.writeD(entry.getValue()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? } } return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java index ea0a5f8b18..85ccad0758 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java @@ -41,7 +41,6 @@ public class ExGetOffAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_OFF_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_x); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java index f8e16a4191..9a02e49223 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java @@ -39,7 +39,6 @@ public class ExGetOnAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_ON_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java index 51197344a5..704b3212a1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExGetPremiumItemList implements IClientOutgoingPacket { private final Player _player; - private final Map _map; public ExGetPremiumItemList(Player player) @@ -43,7 +42,6 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_PREMIUM_ITEM_LIST.writeId(packet); - packet.writeD(_map.size()); for (Entry entry : _map.entrySet()) { @@ -51,7 +49,7 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket packet.writeQ(entry.getKey()); packet.writeD(item.getItemId()); packet.writeQ(item.getCount()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeS(item.getSender()); } return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index a005fa8ad8..0200bdee08 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -40,7 +40,6 @@ public class ExHeroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HERO_LIST.writeId(packet); - packet.writeD(_heroList.size()); for (StatSet hero : _heroList.values()) { @@ -51,7 +50,7 @@ public class ExHeroList implements IClientOutgoingPacket packet.writeS(hero.getString(Hero.ALLY_NAME, "")); packet.writeD(hero.getInt(Hero.ALLY_CREST, 0)); packet.writeD(hero.getInt(Hero.COUNT)); - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index f7ab7c4fa3..c424b903be 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -46,7 +46,6 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); - packet.writeD(_currentTemplateId); packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java index 81db66b88f..323c0cdf1e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java @@ -35,7 +35,6 @@ public class ExIsCharNameCreatable implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_IS_CHAR_NAME_CREATABLE.writeId(packet); - packet.writeD(_allowed); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java index ecc751eab3..45def9e0be 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java @@ -38,7 +38,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { throw new NullPointerException(); } - if (currentAuction.getAuctionState() != ItemAuctionState.STARTED) { _timeRemaining = 0; @@ -47,7 +46,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { _timeRemaining = (int) (currentAuction.getFinishingTimeRemaining() / 1000); // in seconds } - _refresh = refresh; _currentAuction = currentAuction; _nextAuction = nextAuction; @@ -57,16 +55,12 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_AUCTION_INFO.writeId(packet); - - packet.writeC(_refresh ? 0x00 : 0x01); + packet.writeC(_refresh ? 0 : 1); packet.writeD(_currentAuction.getInstanceId()); - final ItemAuctionBid highestBid = _currentAuction.getHighestBid(); packet.writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid()); - packet.writeD(_timeRemaining); writeItem(packet, _currentAuction.getItemInfo()); - if (_nextAuction != null) { packet.writeQ(_nextAuction.getAuctionInitBid()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java index 53ad8abd58..1c5e38cbab 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListMpccWaiting implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _rooms = new LinkedList<>(); @@ -53,7 +54,6 @@ public class ExListMpccWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_MPCC_WAITING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 78f2fec636..eafea24fa6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _players = new LinkedList<>(); @@ -60,7 +61,6 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(packet); - packet.writeD(_size); packet.writeD(_players.size()); for (Player player : _players) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java index 786c616875..c8723a9fc0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java @@ -46,7 +46,6 @@ public class ExMPCCPartyInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCPARTY_INFO_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_LeaderOID); packet.writeD(_memberCount); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java index 4bf07f0133..08259e4e6c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java @@ -37,7 +37,6 @@ public class ExMPCCPartymasterList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_PARTYMASTER_LIST.writeId(packet); - packet.writeD(_leadersName.size()); _leadersName.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java index abbdc8fe76..f021ef5f1f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java @@ -36,7 +36,6 @@ public class ExMPCCRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java index 154e156270..2eec590cb4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java @@ -41,7 +41,6 @@ public class ExMPCCRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java index 06e3027bfc..a0e9d0a4b0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java @@ -37,7 +37,6 @@ public class ExMPCCShowPartyMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCSHOW_PARTY_MEMBER_INFO.writeId(packet); - packet.writeD(_party.getMemberCount()); for (Player pc : _party.getMembers()) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java index e454a746f3..771b2f22cb 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java @@ -49,7 +49,6 @@ public class ExMagicAttackInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAGIC_ATTACK_INFO.writeId(packet); - packet.writeD(_caster); packet.writeD(_target); packet.writeD(_type); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java index 9cfbeb5aee..1aaa5b6520 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java @@ -35,7 +35,6 @@ public class ExMailArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAIL_ARRIVED.writeId(packet); - return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java index 983ff22b92..48156c0600 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java @@ -44,7 +44,6 @@ public class ExManageMpccRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MANAGE_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java index f710c006e8..9d7d14211e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java @@ -45,7 +45,6 @@ public class ExMoveToLocationAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_objId); packet.writeD(_tx); packet.writeD(_ty); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java index 3e3bdc9fed..87e44b51cd 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java @@ -43,7 +43,6 @@ public class ExMoveToLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java index 7ab0d1c7da..3c1902892a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java @@ -40,11 +40,9 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet); - packet.writeS(_channel.getLeader().getName()); - packet.writeD(0x00); // Channel loot 0 or 1 + packet.writeD(0); // Channel loot 0 or 1 packet.writeD(_channel.getMemberCount()); - packet.writeD(_channel.getParties().size()); for (Party p : _channel.getParties()) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java index 1536bd5f9b..f2a32bb6e8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java @@ -43,7 +43,6 @@ public class ExNeedToChangeName implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEED_TO_CHANGE_NAME.writeId(packet); - packet.writeD(_type); packet.writeD(_subType); packet.writeS(_name); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java index be9bec8559..d18b4606b3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java @@ -35,7 +35,6 @@ public class ExNevitAdventEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CHANNELING_EFFECT.writeId(packet); - packet.writeD(_timeLeft); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java index 3a0367c178..09f6250f51 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java @@ -35,7 +35,6 @@ public class ExNevitAdventPointInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_AGATHION_ENERGY_INFO.writeId(packet); - packet.writeD(_points); // 72 = 1%, max 7200 = 100% return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java index 88fdaae499..ef220d86de 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java @@ -37,9 +37,8 @@ public class ExNevitAdventTimeChange implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - // state 0 - pause 1 - started - packet.writeC(_paused ? 0x00 : 0x01); + packet.writeC(_paused ? 0 : 1); // left time in ms max is 16000 its 4m and state is automatically changed to quit packet.writeD(_time); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java index fccdf510cc..4025bf78fa 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java @@ -34,7 +34,6 @@ public class ExNewSkillToLearnByLevelUp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEW_SKILL_TO_LEARN_BY_LEVEL_UP.writeId(packet); - return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java index 324c18a517..f2ce8614dc 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java @@ -43,8 +43,7 @@ public class ExNoticePostArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTICE_POST_ARRIVED.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java index afe3719d9b..050c7ccea5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java @@ -43,8 +43,7 @@ public class ExNoticePostSent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_WRITE_POST.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java index 5d98c20b09..e0bd08d39a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java @@ -30,7 +30,6 @@ public class ExNotifyPremiumItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_PREMIUM_ITEM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java index 6cb3724448..ba3c0cfeaa 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java @@ -34,7 +34,6 @@ public class ExOlympiadMatchEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MATCH_END.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java index 264d5aa484..7ffd5ed3bd 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java @@ -55,19 +55,15 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x00); // Type 0 = Match List, 1 = Match Result - + packet.writeD(0); // Type 0 = Match List, 1 = Match Result packet.writeD(_games.size()); - packet.writeD(0x00); - + packet.writeD(0); for (OlympiadGameTask curGame : _games) { final AbstractOlympiadGame game = curGame.getGame(); if (game != null) { packet.writeD(game.getStadiumId()); // Stadium Id (Arena 1 = 0) - if (game instanceof OlympiadGameNonClassed) { packet.writeD(1); @@ -80,8 +76,7 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket { packet.writeD(0); } - - packet.writeD(curGame.isRunning() ? 0x02 : 0x01); // (1 = Standby, 2 = Playing) + packet.writeD(curGame.isRunning() ? 2 : 1); // (1 = Standby, 2 = Playing) packet.writeS(game.getPlayerNames()[0]); // Player 1 Name packet.writeS(game.getPlayerNames()[1]); // Player 2 Name } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java index 712651603d..b387271fba 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java @@ -53,9 +53,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x01); // Type 0 = Match List, 1 = Match Result - + packet.writeD(1); // Type 0 = Match List, 1 = Match Result packet.writeD(_tie ? 1 : 0); // 0 - win, 1 - tie packet.writeS(_winnerList.get(0).getName()); packet.writeD(_winTeam); @@ -69,9 +67,8 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } - packet.writeD(_loseTeam); packet.writeD(_loserList.size()); for (OlympiadInfo info : _loserList) @@ -83,7 +80,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java index 34d81d1f53..712b9e06c6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java @@ -38,7 +38,6 @@ public class ExOlympiadMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MODE.writeId(packet); - packet.writeC(_mode); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java index ebea6c56f3..5b4f2c2523 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java @@ -53,7 +53,6 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_SPELLED_INFO.writeId(packet); - packet.writeD(_playerId); packet.writeD(_effects.size() + _effects2.size()); for (BuffInfo info : _effects) @@ -62,7 +61,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(info.getSkill().getDisplayId()); packet.writeH(info.getSkill().getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(info.getSkill().getAbnormalType().getClientId()); writeOptionalD(packet, info.getSkill().isAura() ? -1 : info.getTime()); } @@ -73,7 +72,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(skill.getDisplayId()); packet.writeH(skill.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(skill.getAbnormalType().getClientId()); packet.writeH(-1); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java index 18c34fe9de..ca473edfcf 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java @@ -76,7 +76,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_USER_INFO.writeId(packet); - if (_player != null) { packet.writeC(_player.getOlympiadSide()); @@ -91,7 +90,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket packet.writeS(_par.getName()); packet.writeD(_par.getBaseClass()); } - packet.writeD(_curHp); packet.writeD(_maxHp); packet.writeD(_curCp); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java index e84d0251bd..7ec64cc8c3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java @@ -35,7 +35,6 @@ public class ExOpenMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OPEN_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java index 90349cc1a2..5661dc9f57 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java @@ -56,7 +56,6 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PCCAFE_POINT_INFO.writeId(packet); - packet.writeD(_points); // num points packet.writeD(_mAddPoint); // points inc display packet.writeC(_mPeriodType); // period(0=don't show window,1=acquisition,2=use points) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java index f7e8b4a99a..248a2f7d98 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_ADD.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java index 832bee0012..1f452f4bae 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_DELETE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_summon.getSummonType()); packet.writeD(_summon.getOwner().getObjectId()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java index 0646a67001..703694fa2f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_UPDATE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 0e3edb3ea7..e4c6b79ae0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -47,7 +47,6 @@ public class ExPartyRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2bffdec368..2ebf1dc7f0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -43,10 +43,8 @@ public class ExPetInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class ExPetInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class ExPetInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,9 +154,8 @@ public class ExPetInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -227,28 +205,24 @@ public class ExPetInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PET_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -267,7 +241,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -283,19 +257,19 @@ public class ExPetInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -307,20 +281,20 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -344,12 +318,12 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -379,12 +353,10 @@ public class ExPetInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java index 082f4c7662..0f72c05a3a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java @@ -34,7 +34,6 @@ public class ExPlayScene implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLAY_SCENE.writeId(packet); - return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java index e98d317e14..7e3803bdaa 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java @@ -36,7 +36,6 @@ public class ExPledgeCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_COUNT.writeId(packet); - packet.writeD(_count); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java index 838029e284..4084de3481 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java @@ -38,7 +38,6 @@ public class ExPledgeDraftListSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_DRAFT_LIST_SEARCH.writeId(packet); - packet.writeD(_pledgeRecruitList.size()); for (PledgeWaitingInfo prl : _pledgeRecruitList) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java index fb956e9996..44e34004ea 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java @@ -25,11 +25,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExPledgeEmblem implements IClientOutgoingPacket { + private static final int TOTAL_SIZE = 65664; + private final int _crestId; private final int _clanId; private final byte[] _data; private final int _chunkId; - private static final int TOTAL_SIZE = 65664; public ExPledgeEmblem(int crestId, byte[] chunkedData, int clanId, int chunkId) { @@ -43,7 +44,6 @@ public class ExPledgeEmblem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clanId); packet.writeD(_crestId); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java index ed19bf976b..b32f8c0645 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitApplyInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_APPLY_INFO.writeId(packet); - packet.writeD(_status.ordinal()); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java index fc98b7b6f7..af4af9c9c1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitBoardDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_DETAIL.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClanId()); packet.writeD(_pledgeRecruitInfo.getKarma()); packet.writeS(_pledgeRecruitInfo.getInformation()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index b4d48373a6..eda808e754 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -34,7 +34,6 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket private final int _clanOnCurrentPage; private final int _startIndex; private final int _endIndex; - static final int CLAN_PER_PAGE = 12; public ExPledgeRecruitBoardSearch(List clanList, int currentPage) @@ -51,11 +50,9 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_SEARCH.writeId(packet); - packet.writeD(_currentPage); packet.writeD(_totalNumberOfPage); packet.writeD(_clanOnCurrentPage); - for (int i = _startIndex; i < _endIndex; i++) { packet.writeD(_clanList.get(i).getClanId()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 4ae5ffe316..b1f139226d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -40,7 +40,6 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java index 77080a3820..5844f220ec 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java @@ -39,7 +39,6 @@ public class ExPledgeWaitingList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST.writeId(packet); - packet.writeD(pledgePlayerRecruitInfos.size()); for (PledgeApplicantInfo recruitInfo : pledgePlayerRecruitInfos.values()) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java index a9245c1309..6b88572057 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java @@ -30,7 +30,6 @@ public class ExPledgeWaitingListAlarm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_ALARM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java index 60997b3da0..28c3967119 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java @@ -40,7 +40,6 @@ public class ExPledgeWaitingListApplied implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_APPLIED.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClan().getId()); packet.writeS(_pledgeRecruitInfo.getClan().getName()); packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java index 66a06892c2..1f53d1bb38 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java @@ -36,7 +36,6 @@ public class ExPledgeWaitingUser implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_USER.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getPlayerId()); packet.writeS(_pledgeRecruitInfo.getMessage()); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java index 49bc9b0995..5f404779f5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java @@ -43,7 +43,6 @@ public class ExPrivateStoreSetWholeMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_objectId); packet.writeS(_msg); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java index cb5e8fbce9..ff996b5d0c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutCommissionResultForVariationMake implements IClientOutgoingPac public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_COMMISSION_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_gemstoneObjId); packet.writeD(_itemId); packet.writeQ(_gemstoneCount); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java index 81721e921f..098472b7ae 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantScrollItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SCROLL_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java index 871f377db2..ffea182a49 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java index c47a4bcff4..8016e128f4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java index c8b46be499..95c0c0e4e1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_INTENSIVE_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_refinerItemObjId); packet.writeD(_lifestoneItemId); packet.writeD(_gemstoneItemId); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 2128b2b19f..2970ca00a2 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -41,13 +41,12 @@ public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_CANCEL.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); packet.writeD(_itemAug1); packet.writeD(_itemAug2); packet.writeQ(_price); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java index 80541e65cd..c25dd16b01 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java @@ -34,10 +34,9 @@ public class ExPutItemResultForVariationMake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index b739a94c55..c4d27d1728 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -48,7 +48,6 @@ public class ExQuestItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java index fe5eb74eb0..bc8896164d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java @@ -56,13 +56,12 @@ public class ExQuestNpcLogList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_NPC_LOG_LIST.writeId(packet); - packet.writeD(_questId); packet.writeC(_npcLogList.size()); for (NpcLogListHolder holder : _npcLogList) { packet.writeD(holder.isNpcString() ? holder.getId() : holder.getId() + 1000000); - packet.writeC(holder.isNpcString() ? 0x01 : 0x00); + packet.writeC(holder.isNpcString() ? 1 : 0); packet.writeD(holder.getCount()); } return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java index 62d622caff..60616b256d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java @@ -35,7 +35,6 @@ public class ExRedSky implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RED_SKY.writeId(packet); - packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java index ce40b1a792..163faff855 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java @@ -36,7 +36,6 @@ public class ExRegenMax implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REGEN_MAX.writeId(packet); - packet.writeD(1); packet.writeD(_time); packet.writeD(_tickInterval); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java index d864795cd6..a17525576b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java @@ -34,7 +34,6 @@ public class ExRemoveEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REMOVE_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 29d5eafeef..77458fd485 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -41,7 +41,6 @@ public class ExReplyPostItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_POST_ITEM_LIST.writeId(packet); - packet.writeD(_itemList.size()); for (Item item : _itemList) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 57ed88ac29..4e479e75a6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -56,7 +56,6 @@ public class ExReplyReceivedPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_RECEIVED_POST.writeId(packet); - packet.writeD(_msg.getMailType().ordinal()); // GOD if (_msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED) { @@ -76,11 +75,10 @@ public class ExReplyReceivedPost extends AbstractItemPacket } packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown packet.writeS(_msg.getSenderName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -92,9 +90,8 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeQ(_msg.getReqAdena()); packet.writeD(_msg.hasAttachments() ? 1 : 0); packet.writeD(_msg.isReturned() ? 1 : 0); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 75f6596194..ed490eae91 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -54,14 +54,12 @@ public class ExReplySentPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_SENT_POST.writeId(packet); - - packet.writeD(0x00); // GOD + packet.writeD(0); // GOD packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); packet.writeS(_msg.getReceiverName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -73,11 +71,11 @@ public class ExReplySentPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeQ(_msg.getReqAdena()); - packet.writeD(_msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(_msg.isReturned() ? 0x01 : 00); + packet.writeD(_msg.hasAttachments() ? 1 : 0); + packet.writeD(_msg.isReturned() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index cc4f7ce1d8..e6a3f9bca2 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -35,7 +35,6 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java index 2634aa1cdd..60201b177f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java @@ -35,7 +35,6 @@ public class ExRequestHackShield implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REQUEST_HACK_SHIELD.writeId(packet); - return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java index c51ff31d0b..75e3b3a945 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java @@ -29,13 +29,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyList implements IClientOutgoingPacket { + public static final int SHOW_FACESHAPE = 1; + public static final int SHOW_HAIRSTYLE = 0; + private final Player _player; private final int _type; private final Map _beautyItem; - public static final int SHOW_FACESHAPE = 1; - public static final int SHOW_HAIRSTYLE = 0; - public ExResponseBeautyList(Player player, int type) { _player = player; @@ -54,7 +54,6 @@ public class ExResponseBeautyList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java index ca2ed360ab..4b19201833 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java @@ -25,16 +25,15 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket { + public static final int FAILURE = 0; + public static final int SUCCESS = 1; + public static final int CHANGE = 0; + public static final int RESTORE = 1; + private final Player _player; private final int _type; private final int _result; - public static final int FAILURE = 0; - public static final int SUCCESS = 1; - - public static final int CHANGE = 0; - public static final int RESTORE = 1; - public ExResponseBeautyRegistReset(Player player, int type, int result) { _player = player; @@ -46,7 +45,6 @@ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_REGIST_RESET.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java index 0e313ef3b7..c0922cfb04 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java @@ -36,10 +36,8 @@ public class ExResponseResetList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_RESET_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); - packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java index 01fe1945ef..a230033d67 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java @@ -37,7 +37,6 @@ public class ExRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ROTATION.writeId(packet); - packet.writeD(_charId); packet.writeD(_heading); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index c58ccfc233..2646a71e77 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -36,7 +36,6 @@ public class ExRpItemLink extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RP_ITEM_LINK.writeId(packet); - writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java index 04556bbed2..f0c6eba8e9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java @@ -34,7 +34,6 @@ public class ExSearchOrc implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEARCH_ORC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index 1e06cc2a3f..7a4dced122 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -38,7 +38,6 @@ public class ExSendManorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_MANOR_LIST.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java index b63c69f37e..2c25cc8bfc 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java @@ -124,7 +124,6 @@ public class ExSendUIEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_UIEVENT.writeId(packet); - packet.writeD(_objectId); packet.writeD(_type); // 0 = show, 1 = hide (there is 2 = pause and 3 = resume also but they don't work well you can only pause count down and you cannot resume it because resume hides the counter). packet.writeD(0); // unknown diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java index 4378479707..716a3e8623 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java @@ -385,16 +385,13 @@ public class ExServerPrimitive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SERVER_PRIMITIVE.writeId(packet); - packet.writeS(_name); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(65535); // has to do something with display range and angle packet.writeD(65535); // has to do something with display range and angle - packet.writeD(_points.size() + _lines.size()); - for (Point point : _points) { packet.writeC(1); // Its the type in this case Point @@ -408,7 +405,6 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(point.getY()); packet.writeD(point.getZ()); } - for (Line line : _lines) { packet.writeC(2); // Its the type in this case Line diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java index fb32e199b2..51fb91b643 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java @@ -46,7 +46,6 @@ public class ExSetCompassZoneCode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_COMPASS_ZONE_CODE.writeId(packet); - packet.writeD(_zoneType); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java index 1d0fbae3a4..34dee8bda0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java @@ -38,7 +38,6 @@ public class ExSetPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_PARTY_LOOTING.writeId(packet); - packet.writeD(_result); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java index 7b14ec8412..4e491af9d1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java @@ -34,7 +34,6 @@ public class ExShowAdventurerGuideBook implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_ADVENTURER_GUIDE_BOOK.writeId(packet); - return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index 82554fdc5f..1f8df76083 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -39,7 +39,6 @@ public class ExShowAgitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AGIT_INFO.writeId(packet); - final Collection clanHalls = ClanHallData.getInstance().getClanHalls(); packet.writeD(clanHalls.size()); clanHalls.forEach(clanHall -> diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index dd11ee0150..51e6646ff5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -44,7 +44,6 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BASE_ATTRIBUTE_CANCEL_WINDOW.writeId(packet); - packet.writeD(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java index 14e55d39f3..e22345c4fd 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java @@ -25,13 +25,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExShowBeautyMenu implements IClientOutgoingPacket { - private final Player _player; - private final int _type; - // TODO: Enum public static final int MODIFY_APPEARANCE = 0; public static final int RESTORE_APPEARANCE = 1; + private final Player _player; + private final int _type; + public ExShowBeautyMenu(Player player, int type) { _player = player; @@ -42,7 +42,6 @@ public class ExShowBeautyMenu implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BEAUTY_MENU.writeId(packet); - packet.writeD(_type); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 6ca5edc29b..c0cd4bc02a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -41,7 +41,6 @@ public class ExShowCastleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CASTLE_INFO.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java index aeb4079f3a..f9a6ebe0e7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java @@ -38,7 +38,6 @@ public class ExShowContactList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_SHOW_POST_FRIEND.writeId(packet); - packet.writeD(_contacts.size()); _contacts.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index a079ea3129..94b989b583 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -37,7 +37,6 @@ public class ExShowCropInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _crops = (nextPeriod && !manor.isManorApproved()) ? null : manor.getCropProcure(manorId, nextPeriod); } @@ -46,10 +45,9 @@ public class ExShowCropInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Crop Sales" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Crop Sales" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); + packet.writeD(0); if (_crops != null) { packet.writeD(_crops.size()); @@ -64,17 +62,17 @@ public class ExShowCropInfo implements IClientOutgoingPacket if (seed == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(seed.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(seed.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(seed.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index ebffd775d8..1f01ee7b87 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -62,10 +62,8 @@ public class ExShowCropSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getCropId()); // crop id diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index ee9fa9fd37..b625a1e4e7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -39,7 +39,6 @@ public class ExShowFortressInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_INFO.writeId(packet); - final Collection forts = FortManager.getInstance().getForts(); packet.writeD(forts.size()); for (Fort fort : forts) @@ -47,7 +46,7 @@ public class ExShowFortressInfo implements IClientOutgoingPacket final Clan clan = fort.getOwnerClan(); packet.writeD(fort.getResidenceId()); packet.writeS(clan != null ? clan.getName() : ""); - packet.writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00); + packet.writeD(fort.getSiege().isInProgress() ? 1 : 0); // Time of possession packet.writeD(fort.getOwnedTime()); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index f389b26ed5..678ab43e96 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -42,11 +42,9 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_MAP_INFO.writeId(packet); - packet.writeD(_fortress.getResidenceId()); packet.writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status packet.writeD(_fortress.getFortSize()); // barracks count - final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId()); if ((commanders != null) && !commanders.isEmpty() && _fortress.getSiege().isInProgress()) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 27da99cf41..da186103ae 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -51,7 +51,6 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_SIEGE_INFO.writeId(packet); - packet.writeD(_fortId); // Fortress Id packet.writeD(_size); // Total Barracks Count if (_csize > 0) @@ -64,22 +63,22 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { case 0: { - packet.writeD(0x03); + packet.writeD(3); break; } case 1: { - packet.writeD(0x02); + packet.writeD(2); break; } case 2: { - packet.writeD(0x01); + packet.writeD(1); break; } case 3: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -92,27 +91,27 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket // TODO: once control room supported, update packet.writeD(0x0x) to support 5th room case 0: { - packet.writeD(0x05); + packet.writeD(5); break; } case 1: { - packet.writeD(0x04); + packet.writeD(4); break; } case 2: { - packet.writeD(0x03); + packet.writeD(3); break; } case 3: { - packet.writeD(0x02); + packet.writeD(2); break; } case 4: { - packet.writeD(0x01); + packet.writeD(1); break; } } @@ -124,7 +123,7 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { for (int i = 0; i < _size; i++) { - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java index f7aca7dffd..912839e242 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java @@ -41,8 +41,7 @@ public class ExShowManorDefaultInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_MANOR_DEFAULT_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" and "Crop Sales" buttons + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" and "Crop Sales" buttons packet.writeD(_crops.size()); for (Seed crop : _crops) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 1d3312d668..d03ce2a5fd 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -52,10 +52,8 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet); - packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java index cf38d18c1c..f41999329f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java @@ -34,7 +34,6 @@ public class ExShowQuestInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_INFO.writeId(packet); - return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java index 70f31e318f..0fa64c401d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java @@ -37,7 +37,6 @@ public class ExShowQuestMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_MARK.writeId(packet); - packet.writeD(_questId); packet.writeD(_questState); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index ab85228caf..1a6ee00a10 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ExShowReceivedPostList implements IClientOutgoingPacket { - private final List _inbox; - private static final int MESSAGE_FEE = 100; private static final int MESSAGE_FEE_PER_SLOT = 1000; + private final List _inbox; + public ExShowReceivedPostList(int objectId) { _inbox = MailManager.getInstance().getInbox(objectId); @@ -45,7 +45,6 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { @@ -64,18 +63,18 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getSenderName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); + packet.writeD(msg.isUnread() ? 1 : 0); packet.writeD(((msg.getMailType() == MailType.COMMISSION_ITEM_SOLD) || (msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED)) ? 0 : 1); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(msg.isReturned() ? 0x01 : 0x00); - packet.writeD(0x00); // SysString in some case it seems + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(msg.isReturned() ? 1 : 0); + packet.writeD(0); // SysString in some case it seems } } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(MESSAGE_FEE); packet.writeD(MESSAGE_FEE_PER_SLOT); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java index 9679468789..deebb99c8f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java @@ -33,6 +33,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; */ public class ExShowScreenMessage implements IClientOutgoingPacket { + // Positions + public static final byte TOP_LEFT = 1; + public static final byte TOP_CENTER = 2; + public static final byte TOP_RIGHT = 3; + public static final byte MIDDLE_LEFT = 4; + public static final byte MIDDLE_CENTER = 5; + public static final byte MIDDLE_RIGHT = 6; + public static final byte BOTTOM_CENTER = 7; + public static final byte BOTTOM_RIGHT = 8; + private final int _type; private final int _sysMessageId; private final int _unk1; @@ -48,15 +58,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket private List _parameters; // Localisation related. private String _lang; - // Positions - public static final byte TOP_LEFT = 0x01; - public static final byte TOP_CENTER = 0x02; - public static final byte TOP_RIGHT = 0x03; - public static final byte MIDDLE_LEFT = 0x04; - public static final byte MIDDLE_CENTER = 0x05; - public static final byte MIDDLE_RIGHT = 0x06; - public static final byte BOTTOM_CENTER = 0x07; - public static final byte BOTTOM_RIGHT = 0x08; public void setLang(String lang) { @@ -265,7 +266,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SCREEN_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -284,9 +284,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(sml.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -308,9 +308,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -318,7 +318,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket } } } - packet.writeD(_type); packet.writeD(_sysMessageId); packet.writeD(_position); @@ -326,9 +325,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java index 29ab5d355f..6123b08991 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java @@ -37,7 +37,6 @@ public class ExShowSeedInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _seeds = (nextPeriod && !manor.isManorApproved()) ? null : manor.getSeedProduction(manorId, nextPeriod); } @@ -46,16 +45,14 @@ public class ExShowSeedInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown if (_seeds == null) { packet.writeD(0); return true; } - packet.writeD(_seeds.size()); for (SeedProduction seed : _seeds) { @@ -67,17 +64,17 @@ public class ExShowSeedInfo implements IClientOutgoingPacket if (s == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(s.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(s.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(s.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java index 009dce459b..7c757f08a9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java @@ -32,15 +32,12 @@ public class ExShowSeedMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_MAP_INFO.writeId(packet); - packet.writeD(2); // seed count - // Seed of Destruction packet.writeD(-246857); // x coord packet.writeD(251960); // y coord packet.writeD(4331); // z coord packet.writeD(2770 + GraciaSeedsManager.getInstance().getSoDState()); // sys msg id - // Seed of Infinity packet.writeD(-213770); // x coord packet.writeD(210760); // y coord diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index 4fd891a466..373c314eba 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -62,10 +62,8 @@ public class ExShowSeedSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getSeedId()); // seed id diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 1994402da2..269bec5b97 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -47,7 +47,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _cropsItems.put(cropId, item); } } - for (CropProcure crop : CastleManorManager.getInstance().getCropProcure(_manorId, false)) { if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) @@ -61,7 +60,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_cropsItems.size()); // size for (Item item : _cropsItems.values()) @@ -70,9 +68,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket packet.writeD(item.getObjectId()); // Object id packet.writeD(item.getId()); // crop id packet.writeD(seed.getLevel()); // seed level - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(1)); // reward 1 id - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(2)); // reward 2 id if (_castleCrops.containsKey(item.getId())) { @@ -85,9 +83,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket else { packet.writeD(0xFFFFFFFF); // manor - packet.writeQ(0x00); // buy residual - packet.writeQ(0x00); // buy price - packet.writeC(0x00); // reward + packet.writeQ(0); // buy residual + packet.writeQ(0); // buy price + packet.writeC(0); // reward } packet.writeQ(item.getCount()); // my crops } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index db4bccc928..b61d5b2301 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -40,7 +40,6 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { @@ -50,17 +49,17 @@ public class ExShowSentPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getReceiverName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); - packet.writeD(0x01); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(msg.isUnread() ? 1 : 0); + packet.writeD(1); + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(0); } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java index 0e4e9fd2ef..0dca57f2f8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java @@ -48,7 +48,6 @@ public class ExShowTerritory implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TERRITORY.writeId(packet); - packet.writeD(_vertices.size()); packet.writeD(_minZ); packet.writeD(_maxZ); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java index 4e284f82c5..86e1009bbf 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java @@ -46,7 +46,6 @@ public class ExShowTrace implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TRACE.writeId(packet); - packet.writeH(0); // type broken in H5 packet.writeD(0); // time broken in H5 packet.writeH(_locations.size()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java index 3245767ed7..836a5c9624 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java @@ -44,7 +44,6 @@ public class ExShowUsm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_USM.writeId(packet); - packet.writeD(_videoId); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java index 4acdffa842..1f1a14c31b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java @@ -34,7 +34,6 @@ public class ExShowVariationCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_CANCEL_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java index 3a2298019e..9870424e26 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java @@ -35,7 +35,6 @@ public class ExShowVariationMakeWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_MAKE_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java index 169827bab3..86211c8d97 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java @@ -44,10 +44,9 @@ public class ExSpawnEmitter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SPAWN_EMITTER.writeId(packet); - packet.writeD(_npcObjectId); packet.writeD(_playerObjectId); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java index 620800c1c4..534549b4fe 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java @@ -36,7 +36,6 @@ public class ExStartScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_START_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java index 0bd990cf34..babac59129 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java index 0e2689d598..d3e67afe99 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipObjId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java index 44b064113f..f5b3e1340f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java @@ -36,7 +36,6 @@ public class ExStopScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index 0b1e077353..7c8def3864 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -66,7 +66,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket } OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet); - packet.writeD(_inventory); packet.writeD(_warehouse); packet.writeD(_freight); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java index 3293a5b557..57563ca2f9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java @@ -39,7 +39,6 @@ public class ExSubPledgeSkillAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUB_PLEDGET_SKILL_ADD.writeId(packet); - packet.writeD(_type); packet.writeD(_skillId); packet.writeD(_skillLevel); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java index d61dfa20ab..816d6f16a6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java @@ -97,7 +97,6 @@ public class ExSubjobInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUBJOB_INFO.writeId(packet); - packet.writeC(_type); packet.writeD(_currClassId); packet.writeD(_currRace); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java index 85616016c7..b7a152629d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java @@ -38,7 +38,6 @@ public class ExTacticalSign implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TACTICAL_SIGN.writeId(packet); - packet.writeD(_target.getObjectId()); packet.writeD(_tokenId); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java index 3486e6281d..9e03a8bd0a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java @@ -39,7 +39,6 @@ public class ExTeleportToLocationActivate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_TO_LOCATION_ACTIVATE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java index a214c53a0f..7bcddd964d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java @@ -27,6 +27,7 @@ public class ExUISetting implements IClientOutgoingPacket { public static final String UI_KEY_MAPPING_VAR = "UI_KEY_MAPPING"; public static final String SPLIT_VAR = " "; + private final byte[] _uiKeyMapping; public ExUISetting(Player player) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java index 187770cfc8..eff4285a8b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java @@ -37,7 +37,6 @@ public class ExUnReadMailCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_UN_READ_MAIL_COUNT.writeId(packet); - packet.writeD(_mailUnreadCount); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java index f992b3c937..e59c651371 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java @@ -41,7 +41,6 @@ public class ExUseSharedGroupItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USE_SHARED_GROUP_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeD(_grpId); packet.writeD(_remainingTime); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java index 474fcc5208..f49d451587 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class ExUserInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getTransformationId()); - final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); final boolean isInvisible = _player.isInvisible(); packet.writeD(abnormalVisualEffects.size() + (isInvisible ? 1 : 0)); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java index b841449ab3..1069a64e3e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java @@ -36,12 +36,9 @@ public class ExUserInfoCubic implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_CUBIC.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(_player.getCubics().size()); - _player.getCubics().keySet().forEach(packet::writeH); - packet.writeD(_player.getAgathionId()); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java index 048986d108..7a0d1bfd74 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java @@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExUserInfoEquipSlot extends AbstractMaskPacket { private final Player _player; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -63,11 +62,9 @@ public class ExUserInfoEquipSlot extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_EQUIP_SLOT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(InventorySlot.values().length); packet.writeB(_masks); - final PlayerInventory inventory = _player.getInventory(); for (InventorySlot slot : InventorySlot.values()) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java index 3eb1cf9578..d655e48843 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java @@ -36,7 +36,6 @@ public class ExUserInfoInvenWeight implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_INVEN_WEIGHT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java index 91e0e92338..16aa81e9c0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java @@ -44,7 +44,6 @@ public class ExValidateLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java index 727267c9d5..50cb4025e4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java @@ -35,7 +35,6 @@ public class ExVariationCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_CANCEL_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java index 5cdc1b8d0e..4fde190ae2 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java @@ -32,14 +32,13 @@ public class ExVariationResult implements IClientOutgoingPacket { _option1 = option1; _option2 = option2; - _success = success ? 0x01 : 0x00; + _success = success ? 1 : 0; } @Override public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_RESULT.writeId(packet); - packet.writeD(_option1); packet.writeD(_option2); packet.writeD(_success); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java index db0acfd5ff..60fb57c0b3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java @@ -41,10 +41,9 @@ public class ExVitalityEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_EFFECT_INFO.writeId(packet); - packet.writeD(_points); packet.writeD(_vitalityBonus); // Vitality Bonus - packet.writeH(0x00); // Vitality additional bonus in % + packet.writeH(0); // Vitality additional bonus in % packet.writeH(_vitalityItemsRemaining); // How much vitality items remaining for use packet.writeH(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java index 3cd9d26602..9a401c2321 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java @@ -35,7 +35,6 @@ public class ExVitalityPointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_POINT_INFO.writeId(packet); - packet.writeD(_vitalityPoints); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java index 71baff96ea..c4c5539ca4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java @@ -45,7 +45,6 @@ public class ExVoteSystemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VOTE_SYSTEM_INFO.writeId(packet); - packet.writeD(_recomLeft); packet.writeD(_recomHave); packet.writeD(_bonusTime); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java index 21411f5abc..452b0dc43a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java @@ -37,7 +37,6 @@ public class ExWorldChatCnt implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_WORLD_CHAT_CNT.writeId(packet); - packet.writeD(_points); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java index 7e252afb21..2760599847 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java @@ -82,15 +82,13 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // vehicleId + packet.writeD(0); // vehicleId packet.writeD(_objId); packet.writeS(_npc.getName()); - packet.writeH(_npc.getRace().ordinal()); - packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 0x01 : 0x00); + packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 1 : 0); packet.writeD(_fpcHolder.getClassId()); - - packet.writeD(0x00); // Inventory.PAPERDOLL_UNDER + packet.writeD(0); // Inventory.PAPERDOLL_UNDER packet.writeD(_fpcHolder.getEquipHead()); packet.writeD(_fpcHolder.getEquipRHand()); packet.writeD(_fpcHolder.getEquipLHand()); @@ -102,28 +100,22 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_fpcHolder.getEquipRHand()); // dual hand packet.writeD(_fpcHolder.getEquipHair()); packet.writeD(_fpcHolder.getEquipHair2()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderAugument()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } - packet.writeC(_fpcHolder.getArmorEnchantLevel()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderVisualId()) { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeC(_npc.getScriptValue()); // getPvpFlag() packet.writeD(_npc.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -134,16 +126,12 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_npc.getCollisionRadius()); packet.writeF(_npc.getCollisionHeight()); - packet.writeD(_fpcHolder.getHair()); packet.writeD(_fpcHolder.getHairColor()); packet.writeD(_fpcHolder.getFace()); - packet.writeS(_npc.getTemplate().getTitle()); - if (_clan != null) { packet.writeD(_clan.getId()); @@ -153,71 +141,51 @@ public class FakePlayerInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - - packet.writeC(0x01); // isSitting() ? 0x00 : 0x01 (at some initial tests it worked) - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); - packet.writeC(_npc.isInCombat() ? 0x01 : 0x00); - - packet.writeC(_npc.isAlikeDead() ? 0x01 : 0x00); - - packet.writeC(_npc.isInvisible() ? 0x01 : 0x00); - - packet.writeC(0x00); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount - packet.writeC(0x00); // getPrivateStoreType().getId() - - packet.writeH(0x00); // getCubics().size() + packet.writeC(1); // isSitting() ? 0 : 1 (at some initial tests it worked) + packet.writeC(_npc.isRunning() ? 1 : 0); + packet.writeC(_npc.isInCombat() ? 1 : 0); + packet.writeC(_npc.isAlikeDead() ? 1 : 0); + packet.writeC(_npc.isInvisible() ? 1 : 0); + packet.writeC(0); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount + packet.writeC(0); // getPrivateStoreType().getId() + packet.writeH(0); // getCubics().size() // getCubics().keySet().forEach(packet::writeH); - packet.writeC(0x00); - + packet.writeC(0); packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : 0); packet.writeH(_fpcHolder.getRecommends()); - packet.writeD(0x00); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 - + packet.writeD(0); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 packet.writeD(_fpcHolder.getClassId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(_fpcHolder.getWeaponEnchantLevel()); // isMounted() ? 0 : _enchantLevel - packet.writeC(_npc.getTeam().getId()); - - packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0x00); + packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0); packet.writeC(_fpcHolder.getNobleLevel()); - packet.writeC(_fpcHolder.isHero() ? 0x01 : 0x00); - - packet.writeC(_fpcHolder.isFishing() ? 0x01 : 0x00); - + packet.writeC(_fpcHolder.isHero() ? 1 : 0); + packet.writeC(_fpcHolder.isFishing() ? 1 : 0); packet.writeD(_fpcHolder.getBaitLocationX()); packet.writeD(_fpcHolder.getBaitLocationY()); packet.writeD(_fpcHolder.getBaitLocationZ()); - packet.writeD(_fpcHolder.getNameColor()); - packet.writeD(_heading); - packet.writeC(_fpcHolder.getPledgeStatus()); - packet.writeH(0x00); // getPledgeType() - + packet.writeH(0); // getPledgeType() packet.writeD(_fpcHolder.getTitleColor()); - - packet.writeC(0x00); // isCursedWeaponEquipped - - packet.writeD(0x00); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 - packet.writeD(0x00); // getTransformationDisplayId() + packet.writeC(0); // isCursedWeaponEquipped + packet.writeD(0); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 + packet.writeD(0); // getTransformationDisplayId() packet.writeD(_fpcHolder.getAgathionId()); - - packet.writeC(0x00); - - packet.writeD(0x00); // getCurrentCp() + packet.writeC(0); + packet.writeD(0); // getCurrentCp() packet.writeD(_npc.getMaxHp()); packet.writeD((int) Math.round(_npc.getCurrentHp())); packet.writeD(_npc.getMaxMp()); packet.writeD((int) Math.round(_npc.getCurrentMp())); - - packet.writeC(0x00); + packet.writeC(0); final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) @@ -228,9 +196,9 @@ public class FakePlayerInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(0x00); // cocPlayer.getPosition() - packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 0x01 : 0x00); - packet.writeC(0x00); // Used Ability Points + packet.writeC(0); // cocPlayer.getPosition() + packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 1 : 0); + packet.writeC(0); // Used Ability Points return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java index ae088538da..03223c8a3e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java @@ -62,7 +62,6 @@ public class FlyToLocation implements IClientOutgoingPacket _destY = destY; _destZ = destZ; _type = type; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -82,7 +81,6 @@ public class FlyToLocation implements IClientOutgoingPacket _flySpeed = flySpeed; _flyDelay = flyDelay; _animationSpeed = animationSpeed; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -103,7 +101,6 @@ public class FlyToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FLY_TO_LOCATION.writeId(packet); - packet.writeD(_chaObjId); packet.writeD(_destX); packet.writeD(_destY); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java index 1e52b0ef72..471d70f791 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java @@ -35,8 +35,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x01); + packet.writeC(1); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 81a384642c..fb7572fc5d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -50,7 +50,6 @@ public class GMHennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GMHENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON @@ -64,19 +63,19 @@ public class GMHennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(0x01); + packet.writeD(1); } if (_player.getHenna(4) != null) { packet.writeD(_player.getHenna(4).getDyeId()); - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 1 : 0); } else { - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid } return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java index 38ca4c7be0..59bf0d9d93 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java @@ -38,7 +38,6 @@ public class GMHide implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_HIDE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index c9bdff3ca6..577bf7c2c2 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -50,7 +50,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -79,28 +78,24 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); packet.writeD(_player.getPkKills()); - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollObjectId(slot)); } - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); } - for (int slot : getPaperdollOrder()) { final VariationInstance augment = _player.getInventory().getPaperdollAugmentation(slot); packet.writeD(augment != null ? augment.getOption1Id() : 0); // Confirmed packet.writeD(augment != null ? augment.getOption2Id() : 0); // Confirmed } - packet.writeC(_player.getInventory().getTalismanSlots()); // CT2.3 packet.writeC(_player.getInventory().canEquipCloak() ? 1 : 0); // CT2.3 - packet.writeD(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeH(0); packet.writeD(_player.getPAtk()); packet.writeD(_player.getPAtkSpd()); packet.writeD(_player.getPDef()); @@ -108,18 +103,14 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAccuracy()); packet.writeD(_player.getCriticalHit()); packet.writeD(_player.getMAtk()); - packet.writeD(_player.getMAtkSpd()); packet.writeD(_player.getPAtkSpd()); - packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicEvasionRate()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name packet.writeD(_player.getReputation()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -135,8 +126,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeD(_player.isGM() ? 0x01 : 0x00); // builder level - + packet.writeD(_player.isGM() ? 1 : 0); // builder level packet.writeS(_player.getTitle()); packet.writeD(_player.getClanId()); // pledge id packet.writeD(_player.getClanCrestId()); // pledge crest id @@ -146,26 +136,19 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeC(_player.hasDwarvenCraft() ? 1 : 0); packet.writeD(_player.getPkKills()); packet.writeD(_player.getPvpKills()); - packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); - - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeC(321); - packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window - packet.writeC(_player.getNobleLevel()); - packet.writeC(_player.isHero() ? 0x01 : 0x00); - + packet.writeC(_player.isHero() ? 1 : 0); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); - final AttributeType attackAttribute = _player.getAttackElement(); packet.writeH(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); @@ -175,8 +158,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket } packet.writeD(_player.getFame()); packet.writeD(_player.getVitalityPoints()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index f212539af7..41f151be6f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -55,10 +55,9 @@ public class GMViewItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_ITEM_LIST.writeId(packet); - packet.writeS(_playerName); packet.writeD(_limit); // inventory limit - packet.writeH(0x01); // show window ?? + packet.writeH(1); // show window ?? packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index 1d88596096..552b6e6168 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -37,14 +37,12 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_player.getName()); packet.writeD(_clan.getId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); @@ -52,15 +50,14 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 packet.writeD(_clan.getAllyCrestId()); // c2 packet.writeD(_clan.isAtWar() ? 1 : 0); // c3 - packet.writeD(0x00); // T3 Unknown - + packet.writeD(0); // T3 Unknown packet.writeD(_clan.getMembers().size()); for (ClanMember member : _clan.getMembers()) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java index 93af10e254..3c155ff816 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -38,10 +38,8 @@ public class GMViewSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_SKILL_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_skills.size()); - final boolean isDisabled = (_player.getClan() != null) && (_player.getClan().getReputationScore() < 0); for (Skill skill : _skills) { @@ -49,7 +47,7 @@ public class GMViewSkillInfo implements IClientOutgoingPacket packet.writeH(skill.getDisplayLevel()); packet.writeH(skill.getSubLevel()); packet.writeD(skill.getDisplayId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(isDisabled && skill.isClanSkill() ? 1 : 0); packet.writeC(skill.isEnchantable() ? 1 : 0); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java index d8c273f914..449271993b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java @@ -35,7 +35,6 @@ public class GameGuardQuery implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GAME_GUARD_QUERY.writeId(packet); - packet.writeD(0x27533DD9); packet.writeD(0x2E72A51D); packet.writeD(0x2017038B); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index b0c011b696..037b2e6b6b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -35,10 +35,8 @@ public class GetItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ITEM.writeId(packet); - packet.writeD(_playerId); packet.writeD(_item.getObjectId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java index f8c6126c87..5f4d7bf3ca 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java @@ -50,7 +50,6 @@ public class GetOffVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_OFF_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_x); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java index ffa8d5f310..77d1e6ba28 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java @@ -45,7 +45,6 @@ public class GetOnVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ON_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java index e5dcb9ded6..b1f5b588f9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java @@ -44,14 +44,13 @@ public class GmViewQuestInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_QUEST_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeH(_questList.size()); // quest count - for (Quest quest : _questList) { final QuestState qs = _player.getQuestState(quest.getName()); packet.writeD(quest.getId()); packet.writeD(qs == null ? 0 : qs.getCond()); } - packet.writeH(0x00); // some size + packet.writeH(0); // some size // for size; ddQQ return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 395487097c..4309e2d74f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -51,7 +51,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeQ(_player.getAdena()); // activeChar current amount of Adena packet.writeD(3); // available equip slot packet.writeD(_hennaEquipList.size()); - for (Henna henna : _hennaEquipList) { // Player must have at least one dye in inventory @@ -62,8 +61,8 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); // item Id of the dye packet.writeQ(henna.getWearCount()); // amount of dyes required packet.writeQ(henna.getWearFee()); // amount of Adena required - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not - packet.writeD(0x00); // TODO: Find me! + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // meet the requirement or not + packet.writeD(0); // TODO: Find me! } } return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 30dc837721..b84d2283e8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -51,7 +51,6 @@ public class HennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON @@ -65,9 +64,8 @@ public class HennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); } - final Henna premium = _player.getHenna(4); if (premium != null) { @@ -77,16 +75,15 @@ public class HennaInfo implements IClientOutgoingPacket final long currentTime = Chronos.currentTimeMillis(); duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000; } - packet.writeD(premium.getDyeId()); packet.writeD(duration); // Premium Slot Dye Time Left - packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 1 : 0); } else { - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid } return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index cf3d83263f..5b77709720 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -40,12 +40,11 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_ITEM_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getWearCount()); // total amount of dye require packet.writeQ(_henna.getWearFee()); // total amount of Adena require to draw symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to draw or not 0 is false and 1 is true + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to draw or not 0 is false and 1 is true packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() + _player.getHennaValue(BaseStat.INT)); // equip INT @@ -63,7 +62,7 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket packet.writeH(_player.getLUC() + _player.getHennaValue(BaseStat.LUC)); // equip LUC packet.writeD(_player.getCHA()); // current CHA packet.writeH(_player.getCHA() + _player.getHennaValue(BaseStat.CHA)); // equip CHA - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index cb1379ac29..fc93d02a73 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -40,12 +40,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getCancelCount()); // total amount of dye require packet.writeQ(_henna.getCancelFee()); // total amount of Adena require to remove symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to remove or not + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to remove or not packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() - _player.getHennaValue(BaseStat.INT)); // equip INT @@ -63,7 +62,7 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket packet.writeH(_player.getLUC() - _player.getHennaValue(BaseStat.LUC)); // equip LUC packet.writeD(_player.getCHA()); // current CHA packet.writeH(_player.getCHA() - _player.getHennaValue(BaseStat.CHA)); // equip CHA - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 844fad86c7..452d354ac4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -39,7 +39,7 @@ public class HennaRemoveList implements IClientOutgoingPacket OutgoingPackets.HENNA_UNEQUIP_LIST.writeId(packet); packet.writeQ(_player.getAdena()); final boolean premiumSlotEnabled = _player.getHenna(4) != null; - packet.writeD(premiumSlotEnabled ? 0x04 : 0x03); // seems to be max size + packet.writeD(premiumSlotEnabled ? 4 : 3); // seems to be max size packet.writeD((premiumSlotEnabled ? 4 : 3) - _player.getHennaEmptySlots()); // slots used for (Henna henna : _player.getHennaList()) { @@ -49,8 +49,8 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); packet.writeQ(henna.getCancelCount()); packet.writeQ(henna.getCancelFee()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index 650261e010..9399a1626e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -62,14 +62,12 @@ public interface IClientOutgoingPacket extends IOutgoingPacket Inventory.PAPERDOLL_BROOCH_JEWEL5, Inventory.PAPERDOLL_BROOCH_JEWEL6 }; - int[] PAPERDOLL_ORDER_AUGMENT = new int[] { Inventory.PAPERDOLL_RHAND, Inventory.PAPERDOLL_LHAND, Inventory.PAPERDOLL_RHAND }; - int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 0c54e810f0..3378827f34 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -46,7 +46,6 @@ public class InventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index 8735b315b6..7912558f00 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -47,8 +47,7 @@ public class ItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.ITEM_LIST.writeId(packet); - - packet.writeH(_showWindow ? 0x01 : 0x00); + packet.writeH(_showWindow ? 1 : 0); packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java index b32b4df4a3..c3b9918230 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java @@ -32,9 +32,8 @@ public class JoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PARTY.writeId(packet); - packet.writeD(_response); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java index 65e06efeb7..f347f7efcd 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java @@ -32,7 +32,6 @@ public class JoinPledge implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PLEDGE.writeId(packet); - packet.writeD(_pledgeId); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index 96f6d7c34d..996622b9e9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -35,17 +35,16 @@ public class KeyPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VERSION_CHECK.writeId(packet); - packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok for (int i = 0; i < 8; i++) { packet.writeC(_key[i]); // key } - packet.writeD(0x01); + packet.writeD(1); packet.writeD(Config.SERVER_ID); // server id - packet.writeC(0x01); - packet.writeD(0x00); // obfuscation key - packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 0x01 : 0x00); // isClassic + packet.writeC(1); + packet.writeD(0); // obfuscation key + packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 1 : 0); // isClassic return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java index 484c10f0c4..62424fd03a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java @@ -40,7 +40,6 @@ public class L2FriendSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_SAY.writeId(packet); - packet.writeD(0); // ?? packet.writeS(_receiver); packet.writeS(_sender); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java index b875edb772..790d599b5b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java @@ -32,11 +32,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ListPartyWaiting implements IClientOutgoingPacket { + private static final int NUM_PER_PAGE = 64; + private final List _rooms = new LinkedList<>(); private final int _size; - private static final int NUM_PER_PAGE = 64; - public ListPartyWaiting(PartyMatchingRoomLevelType type, int location, int page, int requestorLevel) { final List rooms = MatchingRoomManager.getInstance().getPartyMathchingRooms(location, type, requestorLevel); @@ -57,7 +57,6 @@ public class ListPartyWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_PARTY_WATING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java index 4f8f9adc64..bb0ac61dbd 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java @@ -54,7 +54,6 @@ public class LoginFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LOGIN_FAIL.writeId(packet); - packet.writeD(_success); packet.writeD(_reason); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java index 18a522c315..6743e3e66f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java @@ -32,7 +32,6 @@ public class MagicSkillCanceld implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_CANCELED.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java index d56de10079..7ab29cc1a8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java @@ -66,7 +66,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // MagicSkillUse castingType packet.writeD(_objectId); packet.writeD(_skillId); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java index 3df8463279..a86626cfa6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java @@ -84,7 +84,6 @@ public class MagicSkillUse implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_USE.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // Casting bar type: 0 - default, 1 - default up, 2 - blue, 3 - green, 4 - red. packet.writeD(_creature.getObjectId()); packet.writeD(_target.getObjectId()); @@ -111,7 +110,7 @@ public class MagicSkillUse implements IClientOutgoingPacket packet.writeD(_target.getX()); packet.writeD(_target.getY()); packet.writeD(_target.getZ()); - packet.writeD(_actionId >= 0 ? 0x01 : 0x00); // 1 when ID from RequestActionUse is used + packet.writeD(_actionId >= 0 ? 1 : 0); // 1 when ID from RequestActionUse is used packet.writeD(_actionId >= 0 ? _actionId : 0); // ID from RequestActionUse. Used to set cooldown on summon skills. return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java index 6b710c692e..12e2488f24 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java @@ -37,11 +37,9 @@ public class ManagePledgePower implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet); - packet.writeD(_rank); packet.writeD(_action); packet.writeD(_clan.getRankPrivs(_rank).getBitmask()); - return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 95f4b6f201..4e2ab3f00b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -42,11 +42,9 @@ public class MonRaceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MON_RACE_INFO.writeId(packet); - packet.writeD(_unknown1); packet.writeD(_unknown2); - packet.writeD(0x08); - + packet.writeD(8); for (int i = 0; i < 8; i++) { packet.writeD(_monsters[i].getObjectId()); // npcObjectID @@ -68,7 +66,7 @@ public class MonRaceInfo implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java index 0093b3edc9..e6386921ff 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java @@ -45,13 +45,10 @@ public class MoveToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_xDst); packet.writeD(_yDst); packet.writeD(_zDst); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java index b1fb3ea003..59103c6c4c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java @@ -48,7 +48,6 @@ public class MoveToLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java index 30ff3c96af..aa261f924f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java @@ -50,11 +50,9 @@ public class MoveToPawn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_PAWN.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetId); packet.writeD(_distance); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index d9901a9961..b06a839efd 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -58,17 +58,15 @@ public class MultiSellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.MULTI_SELL_LIST.writeId(packet); - - packet.writeC(0x00); // Helios + packet.writeC(0); // Helios packet.writeD(_list.getId()); // list id - packet.writeC(0x00); // GOD Unknown + packet.writeC(0); // GOD Unknown packet.writeD(1 + (_index / PAGE_SIZE)); // page started from 1 - packet.writeD(_finished ? 0x01 : 0x00); // finished + packet.writeD(_finished ? 1 : 0); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window - packet.writeD(0x20); // Helios - Always 32 - + packet.writeC(_list.isChanceMultisell() ? 1 : 0); // new multisell window + packet.writeD(32); // Helios - Always 32 while (_size-- > 0) { ItemInfo itemEnchantment = _list.getItemEnchantment(_index); @@ -85,19 +83,15 @@ public class MultiSellList extends AbstractItemPacket } } } - packet.writeD(_index); // Entry ID. Start from 1. packet.writeC(entry.isStackable() ? 1 : 0); - // Those values will be passed down to MultiSellChoose packet. packet.writeH(itemEnchantment != null ? itemEnchantment.getEnchantLevel() : 0); // enchant level writeItemAugment(packet, itemEnchantment); writeItemElemental(packet, itemEnchantment); writeItemEnsoulOptions(packet, itemEnchantment); - packet.writeH(entry.getProducts().size()); packet.writeH(entry.getIngredients().size()); - for (ItemChanceHolder product : entry.getProducts()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(product.getId()); @@ -121,7 +115,6 @@ public class MultiSellList extends AbstractItemPacket writeItemElemental(packet, displayItemEnchantment); writeItemEnsoulOptions(packet, displayItemEnchantment); } - for (ItemChanceHolder ingredient : entry.getIngredients()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(ingredient.getId()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java index 5482659004..29265f5734 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java @@ -45,10 +45,9 @@ public class MyTargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MY_TARGET_SELECTED.writeId(packet); - packet.writeD(_objectId); packet.writeH(_color); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java index 1901ad1297..166c5c1e00 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java @@ -36,7 +36,6 @@ public class NewCharacterSuccess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NEW_CHARACTER_SUCCESS.writeId(packet); - packet.writeD(_chars.size()); for (PlayerTemplate chr : _chars) { @@ -44,31 +43,24 @@ public class NewCharacterSuccess implements IClientOutgoingPacket { continue; } - // TODO: Unhardcode these packet.writeD(chr.getRace().ordinal()); packet.writeD(chr.getClassId().getId()); - packet.writeD(99); packet.writeD(chr.getBaseSTR()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseDEX()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseCON()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseINT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseWIT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseMEN()); packet.writeD(1); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java index be1605f679..6061ea26ef 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java @@ -38,7 +38,6 @@ public class NicknameChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NICK_NAME_CHANGED.writeId(packet); - packet.writeD(_objectId); packet.writeS(_title); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index f9cd107e2c..3e4837b4a4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -54,24 +54,20 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public NpcHtmlMessage(int npcObjId, int itemId) { super(npcObjId); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } public NpcHtmlMessage(int npcObjId, int itemId, String html) { super(npcObjId, html); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } @@ -79,11 +75,10 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java index 61f195e35d..05489103cb 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java @@ -47,10 +47,8 @@ public class NpcInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -58,7 +56,6 @@ public class NpcInfo extends AbstractMaskPacket private int _clanId = 0; private int _statusMask = 0; private final Set _abnormalVisualEffects; - private String[] _localisation; public void setLang(String lang) @@ -101,112 +98,90 @@ public class NpcInfo extends AbstractMaskPacket { addComponentType(NpcInfoType.HEADING); } - if ((npc.getStat().getPAtkSpd() > 0) || (npc.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (npc.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((npc.getLeftHandItem() > 0) || (npc.getRightHandItem() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (npc.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (npc.getDisplayEffect() > 0) { addComponentType(NpcInfoType.DISPLAY_EFFECT); } - if (npc.isInsideZone(ZoneId.WATER) || npc.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (npc.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (npc.getCloneObjId() > 0) { addComponentType(NpcInfoType.CLONE); } - if (npc.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (npc.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (npc.getCurrentHp() <= npc.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (npc.getCurrentMp() <= npc.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (npc.getTemplate().isUsingServerSideName()) { addComponentType(NpcInfoType.NAME); } - if (npc.getTemplate().isUsingServerSideTitle() || (npc.isMonster() && (Config.SHOW_NPC_LEVEL || Config.SHOW_NPC_AGGRESSION)) || npc.isChampion() || npc.isTrap()) { addComponentType(NpcInfoType.TITLE); } - if (npc.getNameString() != null) { addComponentType(NpcInfoType.NAME_NPCSTRINGID); } - if (npc.getTitleString() != null) { addComponentType(NpcInfoType.TITLE_NPCSTRINGID); } - if (_npc.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (!_abnormalVisualEffects.isEmpty() || npc.isInvisible()) { addComponentType(NpcInfoType.ABNORMALS); } - if (npc.getEnchantEffect() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (npc.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (npc.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (npc.getClanId() > 0) { final Clan clan = ClanTable.getInstance().getClan(npc.getClanId()); @@ -220,14 +195,11 @@ public class NpcInfo extends AbstractMaskPacket addComponentType(NpcInfoType.CLAN); } } - addComponentType(NpcInfoType.COLOR_EFFECT); - if (npc.getPvpFlag() > 0) { addComponentType(NpcInfoType.PVP_FLAG); } - // TODO: Confirm me if (npc.isInCombat()) { @@ -245,8 +217,7 @@ public class NpcInfo extends AbstractMaskPacket { _statusMask |= 0x08; } - - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -296,27 +267,23 @@ public class NpcInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO.writeId(packet); - packet.writeD(_npc.getObjectId()); - packet.writeC(_npc.isShowSummonAnimation() ? 0x02 : 0x00); // // 0=teleported 1=default 2=summoned + packet.writeC(_npc.isShowSummonAnimation() ? 2 : 0); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 0x01 : 0x00); + packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { String title = _npc.getTitle(); - // Localisation related. if ((_localisation != null) && !_localisation[1].equals("")) { @@ -329,10 +296,8 @@ public class NpcInfo extends AbstractMaskPacket title = title.replace(NpcData.getInstance().getTemplate(_npc.getId()).getTitle(), _localisation[1]); } } - packet.writeS(title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -351,7 +316,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -366,20 +331,20 @@ public class NpcInfo extends AbstractMaskPacket if (containsMask(NpcInfoType.EQUIPPED)) { packet.writeD(_npc.getRightHandItem()); - packet.writeD(0x00); // Armor id? + packet.writeD(0); // Armor id? packet.writeD(_npc.getLeftHandItem()); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_npc.isDead() ? 0x00 : 0x01); + packet.writeC(_npc.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); + packet.writeC(_npc.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 0x01 : _npc.isFlying() ? 0x02 : 0x00); + packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -391,7 +356,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_npc.isFlying() ? 0x01 : 0x00); + packet.writeD(_npc.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { @@ -427,12 +392,12 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(0x00); // 2 - do some animation on spawn + packet.writeC(0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -464,12 +429,10 @@ public class NpcInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java index c95a8e5274..923e9cebad 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class NpcInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_npc.getObjectId()); packet.writeD(_npc.getTransformationDisplayId()); - final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size()); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java index a294edc57a..2a0ba41eeb 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java @@ -38,7 +38,6 @@ public class NpcQuestHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NPC_QUEST_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_questId); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java index d3328ade97..fc6d0d4a3a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java @@ -106,7 +106,6 @@ public class NpcSay implements IClientOutgoingPacket { _parameters = new ArrayList<>(); } - for (String item : params) { if ((item != null) && (item.length() > 0)) @@ -127,11 +126,9 @@ public class NpcSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_SAY.writeId(packet); - packet.writeD(_objectId); packet.writeD(_textType.getClientId()); packet.writeD(_npcId); - // Localisation related. if (_lang != null) { @@ -147,7 +144,6 @@ public class NpcSay implements IClientOutgoingPacket } } } - packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java index 356e3f48a9..ac61f9d247 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java @@ -33,11 +33,10 @@ public class ObservationMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_START.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me packet.writeD(0xc0); // TODO: Find me return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java index 5c0a0766b3..896ccea02b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java @@ -33,7 +33,6 @@ public class ObservationReturn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_END.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java index c2f7ab404f..173772c870 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java @@ -37,7 +37,6 @@ public class OnEventTrigger implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EVENT_TRIGGER.writeId(packet); - packet.writeD(_emitterId); packet.writeC(_enabled); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index d499719f31..70a51b2b0d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -44,7 +44,6 @@ public class PackageSendableList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet); - packet.writeD(_objectId); packet.writeQ(_adena); packet.writeD(_items.size()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java index a53f589386..e24d63f717 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java @@ -39,7 +39,6 @@ public class PackageToList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_TO_LIST.writeId(packet); - packet.writeD(_players.size()); for (Entry entry : _players.entrySet()) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 655c7abcd1..44b23b37f4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -55,7 +55,6 @@ public class PartyMemberPosition implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); - packet.writeD(locations.size()); for (Entry entry : locations.entrySet()) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java index 9e275ec246..c9d3595037 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java @@ -36,7 +36,6 @@ public class PartyRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java index b9c7d06769..8c97cac6b5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java @@ -36,12 +36,10 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ADD.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); // c3 packet.writeD(_party.getDistributionType().getId()); // c3 packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); - packet.writeD((int) _member.getCurrentCp()); // c4 packet.writeD(_member.getMaxCp()); // c4 packet.writeD((int) _member.getCurrentHp()); @@ -51,7 +49,7 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket packet.writeD(_member.getVitalityPoints()); packet.writeC(_member.getLevel()); packet.writeH(_member.getClassId().getId()); - packet.writeC(0x00); + packet.writeC(0); packet.writeH(_member.getRace().ordinal()); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java index 65d0c60c2e..5ad91f5463 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java @@ -37,21 +37,17 @@ public class PartySmallWindowAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ALL.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); packet.writeC(_party.getDistributionType().getId()); packet.writeC(_party.getMemberCount() - 1); - for (Player member : _party.getMembers()) { if ((member != null) && (member != _exclude)) { packet.writeD(member.getObjectId()); packet.writeS(member.getName()); - packet.writeD((int) member.getCurrentCp()); // c4 packet.writeD(member.getMaxCp()); // c4 - packet.writeD((int) member.getCurrentHp()); packet.writeD(member.getMaxHp()); packet.writeD((int) member.getCurrentMp()); @@ -59,7 +55,7 @@ public class PartySmallWindowAll implements IClientOutgoingPacket packet.writeD(member.getVitalityPoints()); packet.writeC(member.getLevel()); packet.writeH(member.getClassId().getId()); - packet.writeC(0x01); // Unk + packet.writeC(1); // Unk packet.writeH(member.getRace().ordinal()); final Summon pet = member.getPet(); packet.writeD(member.getServitors().size() + (pet != null ? 1 : 0)); // Summon size, one only atm diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java index 94a8a5a2ce..09ce132af4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java @@ -33,7 +33,6 @@ public class PartySmallWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_DELETE.writeId(packet); - packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java index c53c6c7779..e9ea2efbbe 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java @@ -42,7 +42,6 @@ public class PartySmallWindowUpdate extends AbstractMaskPacket _summon.getStat().getExp()) { packet.writeQ(_summon.getStat().getExp()); // 0% absolute value @@ -160,9 +148,7 @@ public class PetInfo implements IClientOutgoingPacket { packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value } - packet.writeQ(_summon.getExpForNextLevel()); // 100% absoulte value - packet.writeD(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight packet.writeD(_summon.getMaxLoad()); // max weight it can carry packet.writeD(_summon.getPAtk()); // patk @@ -178,25 +164,20 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD((int) _summon.getStat().getMoveSpeed()); // speed packet.writeD(_summon.getPAtkSpd()); // atkspeed packet.writeD(_summon.getMAtkSpd()); // casting speed - packet.writeC(0); // TODO: Check me, might be ride status packet.writeC(_summon.getTeam().getId()); // Confirmed packet.writeC(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed packet.writeC(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed - - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. - + packet.writeD(0); // TODO: Find me + packet.writeD(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. packet.writeC(_summon.getOwner().getSummonPoints()); // Used Summon Points packet.writeC(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points - final Set aves = _summon.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeH(aves.size()); // Confirmed for (AbnormalVisualEffect ave : aves) { packet.writeH(ave.getClientId()); // Confirmed } - packet.writeC(_statusMask); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 5b43daa74b..1f60ec39d1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -46,7 +46,6 @@ public class PetInventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.PET_INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index e4cf35779f..16dc83b7ed 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -35,7 +35,6 @@ public class PetItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java index fdb00ddbb1..913f65d470 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java @@ -38,7 +38,6 @@ public class PetStatusShow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_SHOW.writeId(packet); - packet.writeD(_summonType); packet.writeD(_summonObjectId); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 25c2c74292..823a8c405a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -52,7 +52,6 @@ public class PetStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_UPDATE.writeId(packet); - packet.writeD(_summon.getSummonType()); packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getX()); @@ -69,7 +68,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket packet.writeQ(_summon.getStat().getExp()); packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value packet.writeQ(_summon.getExpForNextLevel()); // 100% absolute value - packet.writeD(0x01); // TODO: Find me! + packet.writeD(1); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java index 4bc3570779..0898b01f67 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java @@ -63,7 +63,6 @@ public class PlaySound implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLAY_SOUND.writeId(packet); - packet.writeD(_unknown1); // unknown 0 for quest and ship; packet.writeS(_soundFile); packet.writeD(_unknown3); // unknown 0 for quest; 1 for ship; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java index fbe57d4aaf..5108fe7e1b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java @@ -44,7 +44,6 @@ public class PledgeCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java index aa11b1213e..6805f64d7c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java @@ -34,7 +34,6 @@ public class PledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_INFO.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getId()); packet.writeS(_clan.getName()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java index 72f2c71838..193ee17589 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java @@ -36,12 +36,10 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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 - // clan or subpledge name if (_member.getPledgeType() != 0) { @@ -51,7 +49,6 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket { packet.writeS(_member.getClan().getName()); } - packet.writeS(_member.getApprenticeOrSponsorName()); // name of this member's apprentice/sponsor return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java index eefd482979..6aa5067c8f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java @@ -36,7 +36,6 @@ public class PledgeReceivePowerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_POWER_INFO.writeId(packet); - packet.writeD(_member.getPowerGrade()); // power grade packet.writeS(_member.getName()); packet.writeD(_member.getClan().getRankPrivs(_member.getPowerGrade()).getBitmask()); // privileges diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 818c38a076..01f71eea17 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -40,8 +40,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_SUB_PLEDGE_CREATED.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); packet.writeD(_subPledge.getId()); packet.writeS(_subPledge.getName()); packet.writeS(getLeaderName()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java index 4d0efeb82a..7649947064 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java @@ -43,7 +43,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(packet); - packet.writeD(_tab); // page packet.writeD(_clanList.size()); for (ClanWar clanWar : _clanList) @@ -53,7 +52,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket { continue; } - packet.writeS(clan.getName()); packet.writeD(clanWar.getState().ordinal()); // type: 0 = Declaration, 1 = Blood Declaration, 2 = In War, 3 = Victory, 4 = Defeat, 5 = Tie, 6 = Error packet.writeD(clanWar.getRemainingTime()); // Time if friends to start remaining diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java index 2cbbdbf046..80d10fcb66 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java @@ -34,26 +34,25 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_INFO_UPDATE.writeId(packet); - // sending empty data so client will ask all the info in response ;) packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getLevel()); // clan level packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); // castle state ? + packet.writeD(0); // castle state ? packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); // clan reputation score - packet.writeD(0x00); // ? - packet.writeD(0x00); // ? + packet.writeD(0); // ? + packet.writeD(0); // ? packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); // c5 packet.writeD(_clan.getAllyCrestId()); // c5 packet.writeD(_clan.isAtWar() ? 1 : 0); // c5 - packet.writeD(0x00); // TODO: Find me! - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java index ae26e50dbb..2fa9f26d4a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java @@ -51,12 +51,11 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ADD.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); - packet.writeD(0x00); - packet.writeD(0x01); + packet.writeD(0); + packet.writeD(1); packet.writeD(_isOnline); // 1 = online 0 = offline packet.writeD(_pledgeType); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index c5ea7b284b..a1be315cf4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -41,7 +41,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket { _clan = clan; _pledge = pledge; - _pledgeId = _pledge == null ? 0x00 : _pledge.getId(); + _pledgeId = _pledge == null ? 0 : _pledge.getId(); _leaderName = pledge == null ? clan.getLeaderName() : CharNameTable.getInstance().getNameById(pledge.getLeaderId()); _name = pledge == null ? clan.getName() : pledge.getName(); _members = _clan.getMembers(); @@ -65,31 +65,28 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(packet); - - packet.writeD(_isSubPledge ? 0x00 : 0x01); + packet.writeD(_isSubPledge ? 0 : 1); packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_pledgeId); packet.writeS(_name); packet.writeS(_leaderName); - packet.writeD(_clan.getCrestId()); // crest id .. is used again packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); // 0 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(0); // 0 packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.isAtWar() ? 1 : 0); // new c3 - packet.writeD(0x00); // Territory castle ID + packet.writeD(0); // Territory castle ID packet.writeD(_clan.getSubPledgeMembersCount(_pledgeId)); - for (ClanMember m : _members) { if (m.getPledgeType() != _pledgeId) @@ -107,8 +104,8 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket } else { - packet.writeD(0x01); // no visible effect - packet.writeD(0x01); // packet.writeD(1); + packet.writeD(1); // no visible effect + packet.writeD(1); // packet.writeD(1); } packet.writeD(m.isOnline() ? m.getObjectId() : 0); // objectId = online 0 = offline packet.writeD(m.getSponsor() != 0 ? 1 : 0); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java index 0fd387e419..154bcc610d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java @@ -32,7 +32,6 @@ public class PledgeShowMemberListDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_DELETE.writeId(packet); - packet.writeS(_player); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java index c61f412ed0..7b8c7c516b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java @@ -66,7 +66,6 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index 4e89797e45..09f70ea024 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -62,14 +62,14 @@ public class PledgeSkillList implements IClientOutgoingPacket { packet.writeD(sk.getDisplayId()); packet.writeH(sk.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } for (SubPledgeSkill sk : _subSkills) { packet.writeD(sk._subType); // Clan Sub-unit types packet.writeD(sk._skillId); packet.writeH(sk._skillLevel); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java index f3b8d4c26c..a94601294f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java @@ -37,7 +37,6 @@ public class PledgeSkillListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST_ADD.writeId(packet); - packet.writeD(_id); packet.writeD(_level); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java index 9e1b4843ac..5f32f2bf54 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java @@ -33,15 +33,14 @@ public class PledgeStatusChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_STATUS_CHANGED.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getLeaderId()); packet.writeD(_clan.getId()); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getAllyId()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.getCrestLargeId()); - packet.writeD(0x00); // pledge type ? + packet.writeD(0); // pledge type ? return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java index 5b56d0b28d..41d0f9f7d8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java @@ -44,12 +44,10 @@ public class PrivateStoreListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_LIST.writeId(packet); - packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); // Viewer's item count? + packet.writeD(0); // Viewer's item count? packet.writeD(_items.size()); - int slotNumber = 0; for (TradeItem item : _items) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 67b6ba8d94..d72050283e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -43,11 +43,10 @@ public class PrivateStoreListSell extends AbstractItemPacket else { OutgoingPackets.PRIVATE_STORE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index bb462b6cd2..5e95f8b9b8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -43,17 +43,14 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MANAGE_LIST.writeId(packet); - packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(_itemList.size()); // inventory items for potential buy for (Item item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(_buyList.size()); // count for all items already added for buy for (TradeItem item : _buyList) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index 400307eb79..94ff06a790 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -45,18 +45,15 @@ public class PrivateStoreManageListSell extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MANAGE_LIST.writeId(packet); - packet.writeD(_objId); packet.writeD(_packageSale ? 1 : 0); // Package sell packet.writeQ(_playerAdena); - packet.writeD(_itemList.size()); // for potential sells for (TradeItem item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(_sellList.size()); // count for any items already added for sell for (TradeItem item : _sellList) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java index 8a5b9eef92..0d7bcbea16 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgBuy implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java index b00bd2add2..8fdb5701b8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgSell implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java index c3958367e8..5ddaa46ba0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java @@ -40,7 +40,6 @@ public class RadarControl implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RADAR_CONTROL.writeId(packet); - packet.writeD(_showRadar); packet.writeD(_type); // maybe type packet.writeD(_x); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java index 3918894601..5d67413b6f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java @@ -43,10 +43,8 @@ public class RecipeBookItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_BOOK_ITEM_LIST.writeId(packet); - - packet.writeD(_isDwarvenCraft ? 0x00 : 0x01); // 0 = Dwarven - 1 = Common + packet.writeD(_isDwarvenCraft ? 0 : 1); // 0 = Dwarven - 1 = Common packet.writeD(_maxMp); - if (_recipes == null) { packet.writeD(0); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 59ec218c84..9f460fe896 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -55,11 +55,10 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeD((int) _player.getCurrentMp()); packet.writeD(_player.getMaxMp()); packet.writeD(_success ? 1 : 0); // item creation success/failed - packet.writeC(0x00); - packet.writeQ(0x00); + packet.writeC(0); + packet.writeQ(0); return true; } - PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java index 4474a37c03..f4db5be9df 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java @@ -35,15 +35,14 @@ public class RecipeShopItemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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); - packet.writeQ(0x00); - packet.writeC(0x00); // Trigger offering window if 1 - packet.writeQ(0x00); + packet.writeQ(0); + packet.writeC(0); // Trigger offering window if 1 + packet.writeQ(0); return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java index 75e45f5877..38b0b8ea4e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java @@ -43,7 +43,6 @@ public class RecipeShopManageList implements IClientOutgoingPacket { _recipes = _seller.getCommonRecipeBook(); } - if (_seller.hasManufactureShop()) { final Iterator it = _seller.getManufactureItems().values().iterator(); @@ -63,11 +62,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MANAGE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD((int) _seller.getAdena()); - packet.writeD(_isDwarven ? 0x00 : 0x01); - + packet.writeD(_isDwarven ? 0 : 1); if (_recipes == null) { packet.writeD(0); @@ -83,10 +80,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket packet.writeD(count); } } - if (!_seller.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -94,7 +90,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket for (ManufactureItem item : _seller.getManufactureItems().values()) { packet.writeD(item.getRecipeId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeQ(item.getCost()); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java index c025b5e4ed..2b9bc5b6e7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java @@ -33,7 +33,6 @@ public class RecipeShopMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MSG.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeS(_player.getStoreName()); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java index be8ae1181e..8b3cb42f47 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java @@ -36,14 +36,13 @@ public class RecipeShopSellList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_SELL_LIST.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD((int) _manufacturer.getCurrentMp()); // Creator's MP packet.writeD(_manufacturer.getMaxMp()); // Creator's MP packet.writeQ(_buyer.getAdena()); // Buyer Adena if (!_manufacturer.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -51,7 +50,7 @@ public class RecipeShopSellList implements IClientOutgoingPacket for (ManufactureItem temp : _manufacturer.getManufactureItems().values()) { packet.writeD(temp.getRecipeId()); - packet.writeD(0x00); // unknown + packet.writeD(0); // unknown packet.writeQ(temp.getCost()); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 74700e29b0..269e14d50b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -88,7 +88,6 @@ public class RelationChanged implements IClientOutgoingPacket { return; } - final Relation r = new Relation(); r._objId = activeChar.getObjectId(); r._relation = relation; @@ -102,7 +101,6 @@ public class RelationChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RELATION_CHANGED.writeId(packet); - packet.writeC(_mask); if (_multi == null) { @@ -122,7 +120,6 @@ public class RelationChanged implements IClientOutgoingPacket private void writeRelation(PacketWriter packet, Relation relation) { packet.writeD(relation._objId); - if ((_mask & SEND_DEFAULT) != SEND_DEFAULT) { packet.writeD(relation._relation); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java index b4e9dc25c5..4477cfb705 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java @@ -35,7 +35,6 @@ public class RequestEnchant implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java index 4ef15fb74c..7a0a6cbe58 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java @@ -33,7 +33,6 @@ public class Revive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.REVIVE.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java index 9c409601e3..b9ddf7733f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java @@ -42,7 +42,6 @@ public class Ride implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RIDE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_mounted); packet.writeD(_rideType); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 813ce03f4d..13ef62f55f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -49,11 +49,9 @@ public class SellListProcure implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SELL_LIST_PROCURE.writeId(packet); - packet.writeQ(_money); // money - packet.writeD(0x00); // lease ? + packet.writeD(0); // lease ? packet.writeH(_sellList.size()); // list size - for (Entry entry : _sellList.entrySet()) { final Item item = entry.getKey(); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java index baa37a8507..75b5b07854 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java @@ -39,12 +39,10 @@ public class SendMacroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MACRO_LIST.writeId(packet); - packet.writeC(_updateType.getId()); - packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0x00); // modified, created or deleted macro's id + packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0); // modified, created or deleted macro's id packet.writeC(_count); // count of Macros packet.writeC(_macro != null ? 1 : 0); // unknown - if ((_macro != null) && (_updateType != MacroUpdateType.DELETE)) { packet.writeD(_macro.getId()); // Macro ID @@ -52,9 +50,7 @@ public class SendMacroList implements IClientOutgoingPacket packet.writeS(_macro.getDescr()); // Desc packet.writeS(_macro.getAcronym()); // acronym packet.writeD(_macro.getIcon()); // icon - packet.writeC(_macro.getCommands().size()); // count - int i = 1; for (MacroCmd cmd : _macro.getCommands()) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java index 47fada25be..21622b5f19 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java @@ -32,7 +32,6 @@ public class SendTradeRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_REQUEST.writeId(packet); - packet.writeD(_senderId); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java index 69aa749406..1513a0e3d1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java @@ -55,7 +55,6 @@ public class ServerObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SERVER_OBJECT_INFO.writeId(packet); - packet.writeD(_activeChar.getObjectId()); packet.writeD(_displayId + 1000000); packet.writeS(_name); // name @@ -70,8 +69,8 @@ public class ServerObjectInfo implements IClientOutgoingPacket packet.writeF(_collisionHeight); packet.writeD((int) (_isAttackable ? _activeChar.getCurrentHp() : 0)); packet.writeD(_isAttackable ? _activeChar.getMaxHp() : 0); - packet.writeD(0x01); // object type - packet.writeD(0x00); // special effects + packet.writeD(1); // object type + packet.writeD(0); // special effects return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java index 88b370ad8b..0164e5c4a2 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java @@ -34,7 +34,6 @@ public class SetSummonRemainTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SET_SUMMON_REMAIN_TIME.writeId(packet); - packet.writeD(_maxTime); packet.writeD(_remainingTime); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java index db28b72acf..016f5a0c9a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java @@ -38,7 +38,6 @@ public class ShopPreviewInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_INFO.writeId(packet); - packet.writeD(Inventory.PAPERDOLL_TOTALSLOTS); // Slots packet.writeD(getFromList(Inventory.PAPERDOLL_UNDER)); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index df50db952f..a55186f551 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -51,11 +51,9 @@ public class ShopPreviewList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_LIST.writeId(packet); - packet.writeD(5056); packet.writeQ(_money); // current money packet.writeD(_listId); - int newlength = 0; for (Product product : _list) { @@ -65,23 +63,20 @@ public class ShopPreviewList implements IClientOutgoingPacket } } packet.writeH(newlength); - for (Product product : _list) { if ((product.getItem().getCrystalType().getLevel() <= _expertise) && product.getItem().isEquipable()) { packet.writeD(product.getItemId()); packet.writeH(product.getItem().getType2()); // item type2 - if (product.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { packet.writeQ(product.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } else { - packet.writeQ(0x00); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand + packet.writeQ(0); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } - packet.writeQ(Config.WEAR_PRICE); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 298301ed0d..b13080ff28 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -40,7 +40,6 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_BUFF_STATUS_UPDATE.writeId(packet); - packet.writeD(_skillId); packet.writeH(_skillLevel); packet.writeH(_skillSubLevel); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index c6a67fb97c..b8624ce4cd 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -33,7 +33,6 @@ public class ShortCutInit implements IClientOutgoingPacket { return; } - _shortCuts = player.getAllShortCuts(); } @@ -41,24 +40,22 @@ public class ShortCutInit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); packet.writeD(sc.getSlot() + (sc.getPage() * 12)); - switch (sc.getType()) { case ITEM: { packet.writeD(sc.getId()); - packet.writeD(0x01); // Enabled or not + packet.writeD(1); // Enabled or not packet.writeD(sc.getSharedReuseGroup()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeQ(0x00); // Augment id - packet.writeD(0x00); // Visual id + packet.writeD(0); + packet.writeD(0); + packet.writeQ(0); // Augment id + packet.writeD(0); // Visual id break; } case SKILL: @@ -67,8 +64,8 @@ public class ShortCutInit implements IClientOutgoingPacket packet.writeH(sc.getLevel()); packet.writeH(sc.getSubLevel()); packet.writeD(sc.getSharedReuseGroup()); - packet.writeC(0x00); // C5 - packet.writeD(0x01); // C6 + packet.writeC(0); // C5 + packet.writeD(1); // C6 break; } case ACTION: @@ -77,7 +74,7 @@ public class ShortCutInit implements IClientOutgoingPacket case BOOKMARK: { packet.writeD(sc.getId()); - packet.writeD(0x01); // C6 + packet.writeD(1); // C6 } } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java index 43d61af661..f099eab47e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java @@ -37,7 +37,6 @@ public class ShortCutRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_REGISTER.writeId(packet); - packet.writeD(_shortcut.getType().ordinal()); packet.writeD(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client switch (_shortcut.getType()) @@ -47,10 +46,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeD(_shortcut.getId()); packet.writeD(_shortcut.getCharacterType()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeD(0x00); // unknown - packet.writeD(0x00); // unknown - packet.writeD(0x00); // item augment id - packet.writeD(0x00); // TODO: Find me, item visual id ? + packet.writeD(0); // unknown + packet.writeD(0); // unknown + packet.writeD(0); // item augment id + packet.writeD(0); // TODO: Find me, item visual id ? break; } case SKILL: @@ -59,10 +58,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeH(_shortcut.getLevel()); packet.writeH(_shortcut.getSubLevel()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeC(0x00); // C5 + packet.writeC(0); // C5 packet.writeD(_shortcut.getCharacterType()); - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me + packet.writeD(0); // TODO: Find me break; } case ACTION: diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java index d6f71b5f70..cfae3b3fad 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java @@ -54,7 +54,6 @@ public class ShowBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - packet.writeC(_showBoard); // c4 1 to show community 00 to hide packet.writeS("bypass _bbshome"); // top packet.writeS("bypass _bbsgetfav"); // favorite diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java index 4b62a7001b..4d62e99d7a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java @@ -32,7 +32,6 @@ public class ShowCalculator implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_CALC.writeId(packet); - packet.writeD(_calculatorId); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java index 55f58d5375..4574762467 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java @@ -32,9 +32,8 @@ public class ShowMiniMap implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_MINIMAP.writeId(packet); - packet.writeD(_mapId); - packet.writeC(0x00); // Seven Signs state + packet.writeC(0); // Seven Signs state return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java index 303eab4e8a..97100d09d2 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java @@ -34,7 +34,6 @@ public class ShowPCCafeCouponShowUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_PCCAFE_COUPON_SHOW_UI.writeId(packet); - return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java index d86958e586..0a0f3ae861 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java @@ -35,7 +35,6 @@ public class ShowXMasSeal implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_XMAS_SEAL.writeId(packet); - packet.writeD(_item); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java index 66eccc7fbf..1baa030c4d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java @@ -28,9 +28,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = ca
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Attackers Clans?
* d = Number of Attackers Clans
* { //repeats
@@ -58,11 +58,10 @@ public class SiegeAttackerList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _castle.getSiege().getAttackerClans().size(); if (size > 0) { @@ -76,12 +75,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -90,8 +88,8 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index 5d5c831f14..8afd1f38ce 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -29,9 +29,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = 0xcb
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Defending Clans?
* d = Number of Defending Clans
* { //repeats
@@ -60,16 +60,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // Unknown - packet.writeD(0x01); // Unknown - packet.writeD(0x00); // Unknown - + packet.writeD(0); // Unknown + packet.writeD(1); // Unknown + packet.writeD(0); // Unknown final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0); packet.writeD(size); packet.writeD(size); - // Add owners final Clan ownerClan = _castle.getOwner(); if (ownerClan != null) @@ -78,14 +75,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket packet.writeS(ownerClan.getName()); packet.writeS(ownerClan.getLeaderName()); packet.writeD(ownerClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.OWNER.ordinal()); packet.writeD(ownerClan.getAllyId()); packet.writeS(ownerClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(ownerClan.getAllyCrestId()); } - // List of confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans()) { @@ -94,19 +90,17 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(defendingClan.getAllyCrestId()); } - // List of not confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans()) { @@ -115,12 +109,11 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER_PENDING.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 0a3fe46cb7..dfeefdaecf 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -59,13 +59,11 @@ public class SiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_INFO.writeId(packet); - if (_castle != null) { packet.writeD(_castle.getResidenceId()); - final int ownerId = _castle.getOwnerId(); - packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 0x01 : 0x00); + packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0); packet.writeD(ownerId); if (ownerId > 0) { @@ -89,7 +87,6 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { @@ -97,7 +94,7 @@ public class SiegeInfo implements IClientOutgoingPacket cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis()); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(Config.SIEGE_HOUR_LIST.size()); for (int hour : Config.SIEGE_HOUR_LIST) { @@ -108,7 +105,7 @@ public class SiegeInfo implements IClientOutgoingPacket else { packet.writeD((int) (_castle.getSiegeDate().getTimeInMillis() / 1000)); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index d11b3817c0..3c4c475339 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -51,12 +51,11 @@ public class SkillCoolTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SKILL_COOL_TIME.writeId(packet); - packet.writeD(_skillReuseTimeStamps.size()); for (TimeStamp ts : _skillReuseTimeStamps) { packet.writeD(ts.getSkillId()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD((int) ts.getReuse() / 1000); packet.writeD((int) Math.max(ts.getStamp() - _currentTime, 0) / 1000); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index de54232b51..ed4615c403 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -41,10 +41,9 @@ public class Snoop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SNOOP.writeId(packet); - packet.writeD(_convoId); packet.writeS(_name); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_type.getClientId()); packet.writeS(_speaker); packet.writeS(_msg); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java index 37827bdf6c..52f15519a5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java @@ -37,10 +37,9 @@ public class SocialAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SOCIAL_ACTION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_actionId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index c2fedd99c0..f2b0fadabd 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -33,16 +33,15 @@ public class SpawnItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPAWN_ITEM.writeId(packet); - packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeD(_item.isStackable() ? 0x01 : 0x00); + packet.writeD(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java index ccae75b850..04f3ad716c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java @@ -110,7 +110,6 @@ public class SpecialCamera implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPECIAL_CAMERA.writeId(packet); - packet.writeD(_id); packet.writeD(_force); packet.writeD(_angle1); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java index cdd3821740..281756e793 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java @@ -34,7 +34,6 @@ public class StartPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_PLEDGE_WAR.writeId(packet); - packet.writeS(_playerName); packet.writeS(_pledgeName); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java index 48b4238eea..27fb4f606b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java @@ -38,7 +38,6 @@ public class StartRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_side); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java index b4f421df36..067bdeb082 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java @@ -72,7 +72,6 @@ public class StaticObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATIC_OBJECT.writeId(packet); - packet.writeD(_staticObjectId); packet.writeD(_objectId); packet.writeD(_type); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index 928b54aa48..40836e4af8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -46,7 +46,6 @@ public class StatusUpdate implements IClientOutgoingPacket public void addUpdate(StatusUpdateType type, int level) { _updates.put(type, level); - if (_isPlayable) { switch (type) @@ -75,10 +74,9 @@ public class StatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATUS_UPDATE.writeId(packet); - packet.writeD(_objectId); // casterId - packet.writeD(_isVisible ? _casterObjectId : 0x00); - packet.writeC(_isVisible ? 0x01 : 0x00); + packet.writeD(_isVisible ? _casterObjectId : 0); + packet.writeC(_isVisible ? 1 : 0); packet.writeC(_updates.size()); for (Entry entry : _updates.entrySet()) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java index 9919307366..cf2b71df5a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java @@ -53,7 +53,6 @@ public class StopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java index 50fdc3fe4c..78fdb5d70c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java @@ -43,7 +43,6 @@ public class StopMoveInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java index 9c828c3962..b254cad8b1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java @@ -34,7 +34,6 @@ public class StopPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java index b0392de226..ca69cd5346 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java @@ -36,7 +36,6 @@ public class StopRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FINISH_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_speed); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index c1feb37b2f..2d92796c75 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -43,10 +43,8 @@ public class SummonInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class SummonInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class SummonInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,11 +154,9 @@ public class SummonInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - // Show red aura? - // if (_statusMask != 0) + // if (_statusMask != 0x00) // { // addComponentType(NpcInfoType.VISUAL_STATE); // } @@ -229,28 +206,24 @@ public class SummonInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.SUMMON_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -269,7 +242,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -285,19 +258,19 @@ public class SummonInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -309,20 +282,20 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -346,12 +319,12 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -381,12 +354,10 @@ public class SummonInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java index 864462f76f..6f88551204 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java @@ -34,7 +34,6 @@ public class SurrenderPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SURRENDER_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 746b2da3f7..b509d599db 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -161,7 +161,6 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } - _params[_paramIndex++] = param; } @@ -267,7 +266,6 @@ public class SystemMessage implements IClientOutgoingPacket { return addString(item.getName()); } - append(new SMParam(TYPE_ITEM_NAME, id)); return this; } @@ -389,7 +387,6 @@ public class SystemMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SYSTEM_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -402,13 +399,12 @@ public class SystemMessage implements IClientOutgoingPacket params[i] = _params[i].getValue(); } packet.writeH(SystemMessageId.S1_2.getId()); - packet.writeC(0x01); + packet.writeC(1); packet.writeC(TYPE_TEXT); packet.writeS(sml.getLocalisation(params)); return true; } } - packet.writeH(getId()); packet.writeC(_params.length); for (SMParam param : _params) @@ -418,9 +414,7 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } - packet.writeC(param.getType()); - switch (param.getType()) { case TYPE_ELEMENT_NAME: diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java index a91da07e77..d357efbb0e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java @@ -47,13 +47,12 @@ public class TargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_SELECTED.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java index 3dadd249f6..3d7208c06f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java @@ -42,12 +42,11 @@ public class TargetUnselected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_UNSELECTED.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index 943b5078b6..13f9b9565a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -41,14 +41,13 @@ public class TeleportToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TELEPORT_TO_LOCATION.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // Fade 0, Instant 1. + packet.writeD(0); // Fade 0, Instant 1. packet.writeD(_heading); - packet.writeD(0x00); // Unknown. + packet.writeD(0); // Unknown. return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java index cb82f2da59..8d09576d9d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java @@ -32,7 +32,6 @@ public class TradeDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_DONE.writeId(packet); - packet.writeD(_num); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index 470ce757db..0635e50548 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -56,7 +56,6 @@ public class TradeStart extends AbstractItemPacket { _mask |= 0x08; } - // Does not shows level if (_partner.isGM()) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java index 0b92812a6f..aec0ace924 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java @@ -39,7 +39,6 @@ public class TradeUpdate extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_UPDATE.writeId(packet); - packet.writeH(1); packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2); writeItem(packet, _item); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java index c7102ca385..728020c0b1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java @@ -32,7 +32,6 @@ public class TutorialEnableClientEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_ENABLE_CLIENT_EVENT.writeId(packet); - packet.writeD(_eventId); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java index 92ac75afcf..7cc33a0f80 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java @@ -48,7 +48,6 @@ public class TutorialShowHtml extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_HTML.writeId(packet); - packet.writeD(_type); packet.writeS(getHtml()); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java index 75a57be38b..2ee62835db 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java @@ -37,7 +37,6 @@ public class TutorialShowQuestionMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_QUESTION_MARK.writeId(packet); - packet.writeC(_markType); packet.writeD(_markId); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index c6f498d462..4f3ecb6b25 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -34,7 +34,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class UserInfo extends AbstractMaskPacket { private Player _player; - private int _relation; private int _runSpd; private int _walkSpd; @@ -48,14 +47,12 @@ public class UserInfo extends AbstractMaskPacket private int _enchantLevel; private int _armorEnchant; private String _title; - private final byte[] _masks = new byte[] { (byte) 0x00, (byte) 0x00, (byte) 0x00 }; - private int _initSize = 5; public UserInfo(Player player) @@ -79,6 +76,7 @@ public class UserInfo extends AbstractMaskPacket _enchantLevel = player.getInventory().getWeaponEnchant(); _armorEnchant = player.getInventory().getArmorMinEnchant(); _title = player.getTitle(); + if (player.isGM() && player.isInvisible()) { _title = "[Invisible]"; @@ -134,29 +132,25 @@ public class UserInfo extends AbstractMaskPacket } OutgoingPackets.USER_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_initSize); packet.writeH(23); packet.writeB(_masks); - if (containsMask(UserInfoType.RELATION)) { packet.writeD(_relation); } - if (containsMask(UserInfoType.BASIC_INFO)) { packet.writeH(16 + (_player.getAppearance().getVisibleName().length() * 2)); packet.writeString(_player.getName()); - packet.writeC(_player.isGM() ? 0x01 : 0x00); + packet.writeC(_player.isGM() ? 1 : 0); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } - if (containsMask(UserInfoType.BASE_STATS)) { packet.writeH(18); @@ -169,7 +163,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getLUC()); packet.writeH(_player.getCHA()); } - if (containsMask(UserInfoType.MAX_HPCPMP)) { packet.writeH(14); @@ -177,7 +170,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMaxMp()); packet.writeD(_player.getMaxCp()); } - if (containsMask(UserInfoType.CURRENT_HPMPCP_EXP_SP)) { packet.writeH(38); @@ -188,23 +180,20 @@ public class UserInfo extends AbstractMaskPacket packet.writeQ(_player.getExp()); packet.writeF((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel()))); } - if (containsMask(UserInfoType.ENCHANTLEVEL)) { packet.writeH(4); packet.writeC(_enchantLevel); packet.writeC(_armorEnchant); } - if (containsMask(UserInfoType.APPAREANCE)) { packet.writeH(15); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); } - if (containsMask(UserInfoType.STATUS)) { packet.writeH(6); @@ -213,7 +202,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.hasDwarvenCraft() || (_player.getSkillLevel(248) > 0) ? 1 : 0); packet.writeC(_player.getAbilityPointsUsed()); } - if (containsMask(UserInfoType.STATS)) { packet.writeH(56); @@ -232,7 +220,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); } - if (containsMask(UserInfoType.ELEMENTALS)) { packet.writeH(14); @@ -243,7 +230,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getDefenseElementValue(AttributeType.HOLY)); packet.writeH(_player.getDefenseElementValue(AttributeType.DARK)); } - if (containsMask(UserInfoType.POSITION)) { packet.writeH(18); @@ -252,7 +238,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getZ()); packet.writeD(_player.isInVehicle() ? _player.getVehicle().getObjectId() : 0); } - if (containsMask(UserInfoType.SPEED)) { packet.writeH(18); @@ -265,21 +250,18 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_flyRunSpd); packet.writeH(_flyWalkSpd); } - if (containsMask(UserInfoType.MULTIPLIER)) { packet.writeH(18); packet.writeF(_moveMultiplier); packet.writeF(_player.getAttackSpeedMultiplier()); } - if (containsMask(UserInfoType.COL_RADIUS_HEIGHT)) { packet.writeH(18); packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); } - if (containsMask(UserInfoType.ATK_ELEMENTAL)) { packet.writeH(5); @@ -287,7 +269,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); } - if (containsMask(UserInfoType.CLAN)) { packet.writeH(32 + (_title.length() * 2)); @@ -297,12 +278,11 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getClanCrestLargeId()); packet.writeD(_player.getClanCrestId()); packet.writeD(_player.getClanPrivileges().getBitmask()); - packet.writeC(_player.isClanLeader() ? 0x01 : 0x00); + packet.writeC(_player.isClanLeader() ? 1 : 0); packet.writeD(_player.getAllyId()); packet.writeD(_player.getAllyCrestId()); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); } - if (containsMask(UserInfoType.SOCIAL)) { packet.writeH(22); @@ -316,59 +296,52 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); } - if (containsMask(UserInfoType.VITA_FAME)) { packet.writeH(15); packet.writeD(_player.getVitalityPoints()); - packet.writeC(0x00); // Vita Bonus + packet.writeC(0); // Vita Bonus packet.writeD(_player.getFame()); packet.writeD(_player.getRaidbossPoints()); } - if (containsMask(UserInfoType.SLOTS)) { packet.writeH(9); packet.writeC(_player.getInventory().getTalismanSlots()); // Confirmed packet.writeC(_player.getInventory().getBroochJewelSlots()); // Confirmed packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeC(0x00); // (1 = Red, 2 = White, 3 = White Pink) dotted ring on the floor - packet.writeC(0x00); - packet.writeC(0x00); - packet.writeC(0x00); + packet.writeC(0); // (1 = Red, 2 = White, 3 = White Pink) dotted ring on the floor + packet.writeC(0); + packet.writeC(0); + packet.writeC(0); } - if (containsMask(UserInfoType.MOVEMENTS)) { packet.writeH(4); packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); - packet.writeC(_player.isRunning() ? 0x01 : 0x00); + packet.writeC(_player.isRunning() ? 1 : 0); } - if (containsMask(UserInfoType.COLOR)) { packet.writeH(10); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); } - if (containsMask(UserInfoType.INVENTORY_LIMIT)) { packet.writeH(9); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); packet.writeH(_player.getInventoryLimit()); packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); } - if (containsMask(UserInfoType.TRUE_HERO)) { packet.writeH(9); - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeC(_player.isTrueHero() ? 100 : 0x00); + packet.writeD(0); + packet.writeH(0); + packet.writeC(_player.isTrueHero() ? 100 : 0); } - return true; } @@ -385,7 +358,6 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x10; // Party leader } } - if (clan != null) { relation |= 0x20; // Clan member @@ -394,12 +366,10 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x40; // Clan leader } } - if (player.isInSiege()) { relation |= 0x80; // In siege } - return relation; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java index 283bcf1614..90c416726a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java @@ -36,7 +36,6 @@ public class ValidateLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java index 4d8f9683d0..83f72bf981 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java @@ -40,7 +40,6 @@ public class ValidateLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java index b684e70bdc..71367cd26d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java @@ -36,7 +36,6 @@ public class VehicleCheckLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_CHECK_LOCATION.writeId(packet); - packet.writeD(_boat.getObjectId()); packet.writeD(_boat.getX()); packet.writeD(_boat.getY()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java index a4a5780f30..5b565c08b7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java @@ -46,7 +46,6 @@ public class VehicleDeparture implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_DEPARTURE.writeId(packet); - packet.writeD(_objId); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java index ec611028bf..4a995a6352 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java @@ -44,7 +44,6 @@ public class VehicleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java index 207a6fd899..bf629dcbbc 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java @@ -42,7 +42,6 @@ public class VehicleStarted implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_START.writeId(packet); - packet.writeD(_objectId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 455305ce79..76b391afc6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -30,6 +30,7 @@ public class WareHouseDepositList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; public static final int FREIGHT = 1; + private final long _playerAdena; private final int _warehouseSize; private final List _items = new ArrayList<>(); @@ -49,7 +50,6 @@ public class WareHouseDepositList extends AbstractItemPacket _whType = type; _playerAdena = player.getAdena(); _warehouseSize = player.getActiveWarehouse() != null ? player.getActiveWarehouse().getSize() : 0; - final boolean isPrivate = _whType == PRIVATE; for (Item temp : player.getInventory().getAvailableItems(true, isPrivate, false)) { @@ -68,19 +68,15 @@ public class WareHouseDepositList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.WAREHOUSE_DEPOSIT_LIST.writeId(packet); - packet.writeH(_whType); packet.writeQ(_playerAdena); packet.writeD(_warehouseSize); packet.writeH(_itemsStackable.size()); - for (int itemId : _itemsStackable) { packet.writeD(itemId); } - packet.writeH(_items.size()); - for (Item item : _items) { writeItem(packet, item); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 6f57005e47..785f0a0849 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -32,6 +32,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private Player _player; private long _playerAdena; private final int _invSize; @@ -58,7 +59,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } - _items = _player.getActiveWarehouse().getItems(); for (Item item : _items) { @@ -73,7 +73,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.WAREHOUSE_WITHDRAW_LIST.writeId(packet); - packet.writeH(_whType); packet.writeQ(_playerAdena); packet.writeH(_items.size()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java index 6eda785411..dcb824c3f6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java @@ -62,7 +62,6 @@ public class ExAcquireAPSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_AP_SKILL_LIST.writeId(packet); - packet.writeD(_enable ? 1 : 0); packet.writeQ(Config.ABILITY_POINTS_RESET_ADENA); packet.writeQ(_price); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java index f9af89e4db..ff296bf632 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java @@ -35,7 +35,6 @@ public class ExCloseAPListWnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_AP_LIST_WND.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java index d72baf2a44..69c47ce99f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java @@ -35,7 +35,6 @@ public class ExShowAPListWnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AP_LIST_WND.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java index 5f2dd05f3b..aea1476fb2 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java @@ -35,8 +35,7 @@ public class ExDivideAdenaCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_CANCEL.writeId(packet); - - packet.writeC(0x00); // TODO: Find me + packet.writeC(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java index 6af912cebf..de4e955aba 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java @@ -46,9 +46,8 @@ public class ExDivideAdenaDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_DONE.writeId(packet); - - packet.writeC(_isPartyLeader ? 0x01 : 0x00); - packet.writeC(_isCCLeader ? 0x01 : 0x00); + packet.writeC(_isPartyLeader ? 1 : 0); + packet.writeC(_isCCLeader ? 1 : 0); packet.writeD(_memberCount); packet.writeQ(_distributedAdenaCount); packet.writeQ(_adenaCount); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java index ab8a7471d6..32f99abfdc 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java @@ -38,8 +38,7 @@ public class ExAlchemyConversion implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_CONVERSION.writeId(packet); - - packet.writeC((_successCount == 0) && (_failureCount == 0) ? 0x01 : 0x00); + packet.writeC((_successCount == 0) && (_failureCount == 0) ? 1 : 0); packet.writeD(_successCount); packet.writeD(_failureCount); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java index be4a2a57e6..cb3cf4b3e0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java @@ -47,7 +47,6 @@ public class ExTryMixCube implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TRY_MIX_CUBE.writeId(packet); - packet.writeC(_type.ordinal()); packet.writeD(_items.size()); for (AlchemyResult holder : _items) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index 549def456e..84b5fead76 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -43,7 +43,6 @@ public class ExChooseShapeShiftingItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_SHAPE_SHIFTING_ITEM.writeId(packet); - packet.writeD(_targetType != null ? _targetType.ordinal() : 0); packet.writeD(_type != null ? _type.ordinal() : 0); packet.writeD(_itemId); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java index 33fb439aa5..ba55887a1a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java @@ -45,7 +45,6 @@ public class ExCuriousHouseMemberUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_UPDATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_maxHp); packet.writeD(_maxCp); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java index 8ad3659725..be2d29d864 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPacket { - public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0x00); - public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(0x01); + public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0); + public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(1); private final int _result; @@ -39,7 +39,6 @@ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPa public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_EXTRACTION_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java index ec82cc14f3..e84d7a7255 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; public static final ExPutShapeShiftingTargetItemResult FAILED = new ExPutShapeShiftingTargetItemResult(RESULT_FAILED, 0); @@ -43,7 +43,6 @@ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_resultId); packet.writeQ(_price); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java index f4d3118cc4..038eae0042 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExShapeShiftingResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; - public static final int RESULT_CLOSE = 0x02; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; + public static final int RESULT_CLOSE = 2; public static final ExShapeShiftingResult FAILED = new ExShapeShiftingResult(RESULT_FAILED, 0, 0); public static final ExShapeShiftingResult CLOSE = new ExShapeShiftingResult(RESULT_CLOSE, 0, 0); @@ -47,7 +47,6 @@ public class ExShapeShiftingResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHAPE_SHIFTING_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_targetItemId); packet.writeD(_extractItemId); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java index eaf0d209fd..4b48b09002 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java @@ -38,7 +38,7 @@ public class ExConfirmVipAttendanceCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CONFIRM_VIP_ATTENDANCE_CHECK.writeId(packet); - packet.writeC(_available ? 0x01 : 0x00); // can receive reward today? 1 else 0 + packet.writeC(_available ? 1 : 0); // can receive reward today? 1 else 0 packet.writeC(_index); // active reward index packet.writeD(0); packet.writeD(0); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java index 9d61fe68d6..dd94df023f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java @@ -45,10 +45,10 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket OutgoingPackets.EX_VIP_ATTENDANCE_ITEM_LIST.writeId(packet); packet.writeC(_available ? _index + 1 : _index); // index to receive? packet.writeC(_index); // last received index? - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeC(0x01); - packet.writeC(_available ? 0x01 : 0x00); // player can receive reward today? + packet.writeD(0); + packet.writeD(0); + packet.writeC(1); + packet.writeC(_available ? 1 : 0); // player can receive reward today? packet.writeC(250); packet.writeC(AttendanceRewardData.getInstance().getRewardsCount()); // reward size int rewardCounter = 0; @@ -57,11 +57,11 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket rewardCounter++; packet.writeD(reward.getId()); packet.writeQ(reward.getCount()); - packet.writeC(0x01); // is unknown? - packet.writeC((rewardCounter % 7) == 0 ? 0x01 : 0x00); // is last in row? + packet.writeC(1); // is unknown? + packet.writeC((rewardCounter % 7) == 0 ? 1 : 0); // is last in row? } - packet.writeC(0x00); - packet.writeD(0x00); + packet.writeC(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java index 7f1d6d60d1..73f93335ef 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java @@ -43,7 +43,6 @@ public class ExCuriousHouseMemberList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_LIST.writeId(packet); - packet.writeD(_id); packet.writeD(_maxPlayers); packet.writeD(_players.size()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java index b71caa5f14..5d9b34db61 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java @@ -37,7 +37,6 @@ public class ExCuriousHouseRemainTime implements IClientOutgoingPacket { OutgoingPackets.EX_CURIOUS_HOUSE_REMAIN_TIME.writeId(packet); packet.writeD(_time); - return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java index 4c3ae253ea..c79b68becc 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java @@ -39,7 +39,6 @@ public class ExResponseCommissionBuyInfo extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_INFO.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java index ddfa8b6db1..c1d29735b8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java @@ -40,7 +40,6 @@ public class ExResponseCommissionBuyItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_ITEM.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java index aa4bbbde24..01e4782408 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java @@ -39,7 +39,6 @@ public class ExResponseCommissionDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_DELETE.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java index e7e3c39816..b915574175 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java @@ -55,7 +55,6 @@ public class ExResponseCommissionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_INFO.writeId(packet); - packet.writeD(_result); packet.writeD(_itemId); packet.writeQ(_presetPricePerUnit); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 876a24c7ad..89000dd57f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -39,7 +39,6 @@ public class ExResponseCommissionItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_ITEM_LIST.writeId(packet); - packet.writeD(_items.size()); for (Item itemInstance : _items) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java index 4963393b42..a012b3ab30 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java @@ -64,7 +64,6 @@ public class ExResponseCommissionList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_LIST.writeId(packet); - packet.writeD(_replyType.getClientId()); switch (_replyType) { @@ -73,13 +72,11 @@ public class ExResponseCommissionList extends AbstractItemPacket { packet.writeD((int) Instant.now().getEpochSecond()); packet.writeD(_chunkId); - int chunkSize = _items.size() - _listIndexStart; if (chunkSize > MAX_CHUNK_SIZE) { chunkSize = MAX_CHUNK_SIZE; } - packet.writeD(chunkSize); for (int i = _listIndexStart; i < (_listIndexStart + chunkSize); i++) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java index b1b0a97d7a..183547af06 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java @@ -39,7 +39,6 @@ public class ExResponseCommissionRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_REGISTER.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java index 74d8a95587..b68386e4ed 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java @@ -35,8 +35,7 @@ public class ExShowCommission implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_COMMISSION.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java index 0c267ecf34..11b1ff1e0a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExEnchantFail implements IClientOutgoingPacket { public static final ExEnchantFail STATIC_PACKET = new ExEnchantFail(0, 0); + private final int _itemOne; private final int _itemTwo; @@ -39,7 +40,6 @@ public class ExEnchantFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_FAIL.writeId(packet); - packet.writeD(_itemOne); packet.writeD(_itemTwo); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java index 71ba811ed5..87d29a8e7c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java @@ -36,7 +36,6 @@ public class ExEnchantSucess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SUCESS.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java index eb4eb8b26c..ec67d50fb6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java @@ -39,7 +39,6 @@ public class ExGetCrystalizingEstimation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - packet.writeD(_items.size()); for (ItemChanceHolder holder : _items) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java index 33554a7050..96b250046c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java @@ -39,7 +39,7 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket OutgoingPackets.EX_CONNECTED_TIME_AND_GETTABLE_REWARD.writeId(packet); for (int i = 0; i < 16; i++) // TODO : Find what the hell it is { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index d4910c376d..5dac65c6c9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -49,7 +49,6 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket } OutgoingPackets.EX_ONE_DAY_RECEIVE_REWARD_LIST.writeId(packet); - packet.writeC(0x23); packet.writeD(_player.getClassId().getId()); packet.writeD(LocalDate.now().getDayOfWeek().ordinal()); // Day of week @@ -58,7 +57,7 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket { packet.writeH(reward.getId()); packet.writeC(reward.getStatus(_player)); - packet.writeC(reward.getRequiredCompletions() > 0 ? 0x01 : 0x00); + packet.writeC(reward.getRequiredCompletions() > 0 ? 1 : 0); packet.writeD(reward.getProgress(_player)); packet.writeD(reward.getRequiredCompletions()); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java index 586d77c13f..2fb9bb65a1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java @@ -40,11 +40,9 @@ public class ExFactionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FACTION_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_openDialog ? 1 : 0); packet.writeD(Faction.values().length); - for (Faction faction : Faction.values()) { packet.writeC(faction.getId()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java index fa605b548a..a99ad7f4e3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java @@ -52,7 +52,7 @@ public class ExFishingStart implements IClientOutgoingPacket packet.writeD(_baitLocation.getX()); packet.writeD(_baitLocation.getY()); packet.writeD(_baitLocation.getZ()); - packet.writeC(0x01); // 0 = newbie, 1 = normal, 2 = night + packet.writeC(1); // 0 = newbie, 1 = normal, 2 = night return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java index 046ad04cb6..74501fe7ff 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java @@ -49,7 +49,6 @@ public class ExUserInfoFishing implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_FISHING.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_isFishing ? 1 : 0); if (_baitLocation == null) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index dc0e3e05bc..336a384bcc 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -47,9 +47,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FRIEND_DETAIL_INFO.writeId(packet); - packet.writeD(_objectId); - if (_friend == null) { packet.writeS(_name); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java index 0d4bb47ff0..a90b7b6083 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java @@ -33,8 +33,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x00); + packet.writeC(0); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java index 9add9c9caa..d24139644c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java @@ -49,7 +49,6 @@ public class FriendAddRequestResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_charId); packet.writeS(_charName); @@ -57,7 +56,7 @@ public class FriendAddRequestResult implements IClientOutgoingPacket packet.writeD(_charObjectId); packet.writeD(_charLevel); packet.writeD(_charClassId); - packet.writeH(0x00); // Always 0 on retail + packet.writeH(0); // Always 0 on retail return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java index a135944662..13a7d01967 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java @@ -86,12 +86,10 @@ public class FriendList implements IClientOutgoingPacket } continue; } - if (player1.isOnline()) { online = true; } - classid = player1.getClassId().getId(); level = player1.getLevel(); _info.add(new FriendInfo(objId, name, online, classid, level)); @@ -102,14 +100,13 @@ public class FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._classid); packet.writeD(info._level); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java index 07c23f9fd2..1bb4142e34 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java @@ -38,7 +38,6 @@ public class FriendRemove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_REMOVE.writeId(packet); - packet.writeD(_responce); packet.writeS(_charName); return true; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java index e8dbddcd63..a3990c0879 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java @@ -52,7 +52,6 @@ public class FriendStatus implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_STATUS.writeId(packet); - packet.writeD(_type); packet.writeS(_name); switch (_type) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java index 8752104e06..78da5850b8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java @@ -50,7 +50,6 @@ public class L2Friend implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND.writeId(packet); - packet.writeD(_action ? 1 : 3); // 1-add 3-remove packet.writeD(_objid); packet.writeS(_name); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java index b69a253635..e50693cb11 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java @@ -81,17 +81,16 @@ public class L2FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._level); packet.writeD(info._classId); - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java index 677c09091f..706c179a9c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java @@ -37,7 +37,6 @@ public class ExMentorAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_ADD.writeId(packet); - packet.writeS(_mentor.getName()); packet.writeD(_mentor.getActiveClass()); packet.writeD(_mentor.getLevel()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java index 4722a9cab3..18c1cdeedf 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java @@ -64,9 +64,8 @@ public class ExMentorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_LIST.writeId(packet); - packet.writeD(_type); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mentees.size()); for (Mentee mentee : _mentees) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java index d739dd94b7..2283920b98 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ListMenteeWaiting implements IClientOutgoingPacket { private static final int PLAYERS_PER_PAGE = 64; + private final List _possibleCandiates = new ArrayList<>(); private final int _page; @@ -51,18 +52,15 @@ public class ListMenteeWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_MENTEE_WAITING.writeId(packet); - - packet.writeD(0x01); // always 1 in retail + packet.writeD(1); // always 1 in retail if (_possibleCandiates.isEmpty()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } - packet.writeD(_possibleCandiates.size()); packet.writeD(_possibleCandiates.size() % PLAYERS_PER_PAGE); - for (Player player : _possibleCandiates) { if ((1 <= (PLAYERS_PER_PAGE * _page)) && (1 > (PLAYERS_PER_PAGE * (_page - 1)))) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java index ead46c2174..eaf44d3181 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java @@ -51,7 +51,6 @@ public class ExPledgeBonusList implements IClientOutgoingPacket packet.writeD(0); return; } - packet.writeD(bonus.getSkillReward().getSkillId()); break; } @@ -63,7 +62,6 @@ public class ExPledgeBonusList implements IClientOutgoingPacket packet.writeD(0); return; } - packet.writeD(bonus.getItemReward().getId()); break; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java index af3c790bc6..cfedfaa438 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java @@ -50,7 +50,6 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Player: " + _player + " attempting to write to a null clan!"); return false; } - final ClanRewardBonus highestMembersOnlineBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.MEMBERS_ONLINE); final ClanRewardBonus highestHuntingBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.HUNTING_MONSTERS); final ClanRewardBonus membersOnlineBonus = ClanRewardType.MEMBERS_ONLINE.getAvailableBonus(clan); @@ -75,23 +74,20 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Couldn't find item reward for highest available hunting bonus!!"); return false; } - // General OP Code OutgoingPackets.EX_PLEDGE_BONUS_OPEN.writeId(packet); - // Members online bonus packet.writeD(highestMembersOnlineBonus.getRequiredAmount()); packet.writeD(clan.getMaxOnlineMembers()); - packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0x00); - packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 0x01 : 0x00); - + packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0); + packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 1 : 0); // Hunting bonus packet.writeD(highestHuntingBonus.getRequiredAmount()); packet.writeD(clan.getHuntingPoints()); - packet.writeD(huntingBonus != null ? highestHuntingBonus.getItemReward().getId() : 0x00); - packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 0x01 : 0x00); + packet.writeD(huntingBonus != null ? highestHuntingBonus.getItemReward().getId() : 0); + packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 1 : 0); return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index fb735b8925..e75426e598 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -69,7 +69,6 @@ public class ExBRBuyProduct implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUY_PRODUCT.writeId(packet); - packet.writeD(_reply); return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java index 742b3eba9d..91a186b81d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java @@ -39,10 +39,9 @@ public class ExBRGamePoint implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_GAME_POINT.writeId(packet); - packet.writeD(_charId); packet.writeQ(_charPoints); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java index 50f21df46a..e36f2ff502 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java @@ -45,7 +45,6 @@ public class ExBRProductInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_INFO.writeId(packet); - packet.writeD(_item.getBrId()); packet.writeD(_item.getPrice()); packet.writeD(_item.getItems().size()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java index dc851ffd43..0f042ba043 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java @@ -45,9 +45,8 @@ public class ExBRProductList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); // Adena - packet.writeQ(0x00); // Hero coins + packet.writeQ(0); // Hero coins packet.writeC(_type); // Type 0 - Home, 1 - History, 2 - Favorites packet.writeD(_primeList.size()); for (PrimeShopGroup brItem : _primeList) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java index 2463589c81..c09b3e899d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java @@ -47,18 +47,15 @@ public class ExFlyMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_mapId); - packet.writeD(_locations.size()); for (SayuneEntry loc : _locations) { packet.writeD(loc.getId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(loc.getX()); packet.writeD(loc.getY()); packet.writeD(loc.getZ()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java index 03fc6b580d..70b3fb25d2 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java @@ -47,16 +47,13 @@ public class ExFlyMoveBroadcast implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE_BROADCAST.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); packet.writeD(_mapId); - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD(_currentLoc.getX()); packet.writeD(_currentLoc.getY()); packet.writeD(_currentLoc.getZ()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java index cfe11a27e0..49e5d86910 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java @@ -35,7 +35,6 @@ public class ExNotifyFlyMoveStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_FLY_MOVE_START.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java index d5640a47ef..0efa37ae8c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java @@ -51,7 +51,6 @@ public class ExMoveToLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_SUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_targetX); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java index 0cbe2c3e02..a0314c39aa 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java @@ -46,7 +46,6 @@ public class ExShuttleGetOff implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_OFF.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_x); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java index 5211bef5ba..061bcafed9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java @@ -43,7 +43,6 @@ public class ExShuttleGetOn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_ON.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java index 97d54a9019..c8aee1fde7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java @@ -43,7 +43,6 @@ public class ExShuttleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHUTTLE_INFO.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD(_shuttle.getX()); packet.writeD(_shuttle.getY()); @@ -60,8 +59,8 @@ public class ExShuttleInfo implements IClientOutgoingPacket packet.writeD(loc.getY()); packet.writeD(loc.getZ()); } - packet.writeD(stop.isDoorOpen() ? 0x01 : 0x00); - packet.writeD(stop.hasDoorChanged() ? 0x01 : 0x00); + packet.writeD(stop.isDoorOpen() ? 1 : 0); + packet.writeD(stop.hasDoorChanged() ? 1 : 0); } return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java index 6ba38f29a1..28b33b998e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java @@ -43,7 +43,6 @@ public class ExShuttleMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_MOVE.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD((int) _shuttle.getStat().getMoveSpeed()); packet.writeD((int) _shuttle.getStat().getRotationSpeed()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java index bf2b6ea6eb..6c31189d6a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java @@ -44,7 +44,6 @@ public class ExStopMoveInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_SHUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java index f7f6849732..8492f42a6e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java @@ -44,7 +44,6 @@ public class ExValidateLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_SHUTTLE.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java index 1d59c6d002..e7654ed911 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java @@ -60,7 +60,7 @@ public class AccountKicked implements IOutgoingPacket { OutgoingPackets.ACCOUNT_KICKED.writeId(packet); packet.writeD(_reason.getCode()); - return true; } } + diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 2e3a1f6163..1fe813e393 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: response + * Format: d d: response */ public class GGAuth implements IOutgoingPacket { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/network/serverpackets/Init.java index 4b3f71f30e..d725f45ca2 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/network/serverpackets/Init.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/network/serverpackets/Init.java @@ -52,7 +52,6 @@ public class Init implements IOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.INIT.writeId(packet); - packet.writeD(_sessionId); // session id packet.writeD(0x0000c621); // protocol revision diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index 8c534554a8..f4dcd22b00 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: the failure reason + * Format: d d: the failure reason */ public class LoginFail implements IOutgoingPacket { diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index c700328f3d..f8b05abb47 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -529,7 +529,7 @@ public class Lindvior extends AbstractNpcAI for (Location loc : CONTROL_GENERATOR_SPAWNS) { guard = (FriendlyNpc) addSpawn(NPC_GENERATOR, loc, true); - guard.setDisplayEffect(0x01); + guard.setDisplayEffect(1); guard.setScriptValue(i++); _generatorSpawn.add(guard); } @@ -685,7 +685,7 @@ public class Lindvior extends AbstractNpcAI if (!hasFlag(_activeMask, 1 << index)) { _activeMask |= 1 << index; - npc.setDisplayEffect(0x02); + npc.setDisplayEffect(2); sendEventTrigger(true, GENERATOR_TRIGERS[index]); _zoneLair.getPlayersInside().stream().forEach(p -> p.broadcastPacket(new Earthquake(p.getX(), p.getY(), p.getZ(), 20, 10))); if (hasFlag(_activeMask, 0xf)) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/BaseRecievePacket.java index c682cb741d..a6ed15ce32 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/BaseRecievePacket.java @@ -73,7 +73,7 @@ public abstract class BaseRecievePacket try { result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE); - result = result.substring(0, result.indexOf(0x00)); + result = result.substring(0, result.indexOf(0)); _off += (result.length() * 2) + 2; } catch (Exception e) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/BaseSendablePacket.java index a9d918de4c..8fa8491cbf 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/commons/network/BaseSendablePacket.java @@ -117,16 +117,16 @@ public abstract class BaseSendablePacket public byte[] getBytes() { // if (this instanceof Init) - // writeD(0x00); // reserve for XOR initial key + // writeD(0); // reserve for XOR initial key - writeD(0x00); // reserve for checksum + writeD(0); // reserve for checksum final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++) { - writeC(0x00); + writeC(0); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/AttackType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/AttackType.java index 6064b10ed7..e9983f15e3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/AttackType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/AttackType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum AttackType { - MISSED(0x01), - BLOCKED(0x02), - CRITICAL(0x04), - SHOT_USED(0x08); + MISSED(1), + BLOCKED(2), + CRITICAL(4), + SHOT_USED(8); private final int _mask; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/GroupType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/GroupType.java index 954aaace8b..916a14fd05 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/GroupType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/GroupType.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum GroupType implements IUpdateTypeComponent { - NONE(0x01), - PARTY(0x02), - COMMAND_CHANNEL(0x04); + NONE(1), + PARTY(2), + COMMAND_CHANNEL(4); private int _mask; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/ItemListType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/ItemListType.java index 2d38c8f5b1..c80234439f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/ItemListType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/ItemListType.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum ItemListType implements IUpdateTypeComponent { - AUGMENT_BONUS(0x01), - ELEMENTAL_ATTRIBUTE(0x02), - ENCHANT_EFFECT(0x04), - VISUAL_ID(0x08), - SOUL_CRYSTAL(0x10); + AUGMENT_BONUS(1), + ELEMENTAL_ATTRIBUTE(2), + ENCHANT_EFFECT(4), + VISUAL_ID(8), + SOUL_CRYSTAL(16); private final int _mask; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java index b3d08596c6..29403b783d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum MacroUpdateType { - ADD(0x01), - LIST(0x01), - MODIFY(0x02), - DELETE(0x00); + ADD(1), + LIST(1), + MODIFY(2), + DELETE(0); private final int _id; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java index 86c6159869..7776721c0f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java @@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum PartySmallWindowUpdateType implements IUpdateTypeComponent { - CURRENT_CP(0x01), - MAX_CP(0x02), - CURRENT_HP(0x04), - MAX_HP(0x08), - CURRENT_MP(0x10), - MAX_MP(0x20), - LEVEL(0x40), - CLASS_ID(0x80), - PARTY_SUBSTITUTE(0x100), - VITALITY_POINTS(0x200); + CURRENT_CP(1), + MAX_CP(2), + CURRENT_HP(4), + MAX_HP(8), + CURRENT_MP(16), + MAX_MP(32), + LEVEL(64), + CLASS_ID(128), + PARTY_SUBSTITUTE(256), + VITALITY_POINTS(512); private final int _mask; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 00bb331778..667ce7f17c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.Broadcast; import org.l2jmobius.gameserver.util.Util; /** - * Fromat:(ch) dddddc + * Format:(ch) dddddc * @author -Wooden- */ public class RequestExMagicSkillUseGround implements IClientIncomingPacket diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java index ec60042793..6054868de7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java @@ -39,7 +39,6 @@ public class AbnormalStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ABNORMAL_STATUS_UPDATE.writeId(packet); - packet.writeH(_effects.size()); for (BuffInfo info : _effects) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 1b8ddb2042..bec794bef3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -44,7 +44,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; } @@ -60,7 +59,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; setHtml(html); } @@ -77,13 +75,11 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } - if (!html.contains(""; return; } - _html = html; } @@ -96,7 +92,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } - setHtml(content); return true; } @@ -138,12 +133,10 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { player.clearHtmlActions(getScope()); } - if (_disabledValidation) { return; } - if (player != null) { Util.buildHtmlActionCache(player, getScope(), _npcObjId, _html); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 9964cd1f64..b4b72650cf 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -110,12 +110,10 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket= 0) || (item.getAttributeDefence(AttributeType.FIRE) > 0) || (item.getAttributeDefence(AttributeType.WATER) > 0) || (item.getAttributeDefence(AttributeType.WIND) > 0) || (item.getAttributeDefence(AttributeType.EARTH) > 0) || (item.getAttributeDefence(AttributeType.HOLY) > 0) || (item.getAttributeDefence(AttributeType.DARK) > 0)) { mask |= ItemListType.ELEMENTAL_ATTRIBUTE.getMask(); } - if (item.getEnchantOptions() != null) { for (int id : item.getEnchantOptions()) @@ -127,17 +125,14 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket 0) { mask |= ItemListType.VISUAL_ID.getMask(); } - if (((item.getSoulCrystalOptions() != null) && !item.getSoulCrystalOptions().isEmpty()) || ((item.getSoulCrystalSpecialOptions() != null) && !item.getSoulCrystalSpecialOptions().isEmpty())) { mask |= ItemListType.SOUL_CRYSTAL.getMask(); } - return mask; } @@ -205,7 +200,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); packet.writeC(removeSkills.size()); for (Skill removed : removeSkills) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java index 8fa6259f64..6451dffd02 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ActionFailed implements IClientOutgoingPacket { public static final ActionFailed STATIC_PACKET = new ActionFailed(); - private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); + private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); static { for (SkillCastingType castingType : SkillCastingType.values()) @@ -57,7 +57,6 @@ public class ActionFailed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ACTION_FAIL.writeId(packet); - packet.writeD(_castingType); // MagicSkillUse castingType return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java index 6e868368c9..30ce58da60 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java @@ -44,9 +44,8 @@ public class AgitDecoInfo implements IClientOutgoingPacket { continue; } - packet.writeC(_residense.hasFunction(type) ? 0x01 : 0x00); + packet.writeC(_residense.hasFunction(type) ? 1 : 0); } - // Unknown packet.writeD(0); // TODO: Find me! packet.writeD(0); // TODO: Find me! diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java index 6cb71fc985..4683fb30f0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java @@ -44,7 +44,6 @@ public class AllianceInfo implements IClientOutgoingPacket _name = leader.getAllyName(); _leaderC = leader.getName(); _leaderP = leader.getLeaderName(); - final Collection allies = ClanTable.getInstance().getClanAllies(allianceId); _allies = new ClanInfo[allies.size()]; int idx = 0; @@ -57,7 +56,6 @@ public class AllianceInfo implements IClientOutgoingPacket total += ci.getTotal(); online += ci.getOnline(); } - _total = total; _online = online; } @@ -66,18 +64,16 @@ public class AllianceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_INFO.writeId(packet); - packet.writeS(_name); packet.writeD(_total); packet.writeD(_online); packet.writeS(_leaderC); packet.writeS(_leaderP); - packet.writeD(_allies.length); for (ClanInfo aci : _allies) { packet.writeS(aci.getClan().getName()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(aci.getClan().getLevel()); packet.writeS(aci.getClan().getLeaderName()); packet.writeD(aci.getTotal()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java index f9d08f6600..186fd12e81 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java @@ -44,7 +44,6 @@ public class AllyCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java index 6218f1717f..1ae4653f91 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java @@ -38,7 +38,6 @@ public class AskJoinAlly implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_ALLIANCE.writeId(packet); - packet.writeD(_requestorObjId); packet.writeS(null); // Ally Name ? packet.writeS(null); // TODO: Find me! diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java index a66bb3cd33..b9cfbe81b9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java @@ -39,7 +39,6 @@ public class AskJoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_PARTY.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 05c420ff59..227ab571be 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -45,7 +45,6 @@ public class Attack implements IClientOutgoingPacket _attackerObjId = attacker.getObjectId(); _attackerLoc = new Location(attacker); _targetLoc = new Location(target); - final Player player = attacker.getActingPlayer(); if (player == null) { @@ -111,7 +110,6 @@ public class Attack implements IClientOutgoingPacket final Iterator it = _hits.iterator(); final Hit firstHit = it.next(); OutgoingPackets.ATTACK.writeId(packet); - packet.writeD(_attackerObjId); packet.writeD(firstHit.getTargetId()); packet.writeD(_soulshotVisualSubstitute); // Ertheia @@ -121,13 +119,11 @@ public class Attack implements IClientOutgoingPacket packet.writeD(_attackerLoc.getX()); packet.writeD(_attackerLoc.getY()); packet.writeD(_attackerLoc.getZ()); - packet.writeH(_hits.size() - 1); while (it.hasNext()) { writeHit(packet, it.next()); } - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java index bd6878eb42..8b85fe85e3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java @@ -35,7 +35,6 @@ public class AutoAttackStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_START.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java index e767d1877a..a294b1e212 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java @@ -35,7 +35,6 @@ public class AutoAttackStop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_STOP.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java index 3f329415df..0c79677eae 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java @@ -38,7 +38,6 @@ public class BlockListPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BLOCK_LIST.writeId(packet); - packet.writeD(_playersId.size()); for (int playerId : _playersId) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index f610cdc6aa..d95f0543b9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -45,8 +45,7 @@ public class BuyList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x00); // Type BUY + packet.writeD(0); // Type BUY packet.writeQ(_money); // current money packet.writeD(_listId); packet.writeD(_inventorySlots); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index cd25af908d..7cb2bf4425 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -50,36 +50,34 @@ public class BuyListSeed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BUY_LIST_SEED.writeId(packet); - packet.writeQ(_money); // current money - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeD(_manorId); // manor id - if (!_list.isEmpty()) { packet.writeH(_list.size()); // list length for (SeedProduction s : _list) { - packet.writeC(0x00); // mask item 0 to print minimal item information + packet.writeC(0); // mask item 0 to print minimal item information packet.writeD(s.getId()); // ObjectId packet.writeD(s.getId()); // ItemId packet.writeC(0xFF); // T1 packet.writeQ(s.getAmount()); // Quantity - packet.writeC(0x05); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item - packet.writeC(0x00); // Filler (always 0) - packet.writeH(0x00); // Equipped : 00-No, 01-yes - packet.writeQ(0x00); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand - packet.writeH(0x00); // Enchant level (pet level shown in control item) + packet.writeC(5); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item + packet.writeC(0); // Filler (always 0) + packet.writeH(0); // Equipped : 00-No, 01-yes + packet.writeQ(0); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand + packet.writeH(0); // Enchant level (pet level shown in control item) packet.writeD(-1); packet.writeD(-9999); - packet.writeC(0x01); // GOD Item enabled = 1 disabled (red) = 0 + packet.writeC(1); // GOD Item enabled = 1 disabled (red) = 0 packet.writeQ(s.getPrice()); // price } _list.clear(); } else { - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java index 3a7b67af23..f3dc872dca 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java @@ -32,8 +32,7 @@ public class CSShowComBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - - packet.writeC(0x01); // c4 1 to show community 00 to hide + packet.writeC(1); // c4 1 to show community 00 to hide packet.writeB(_html); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java index eacc27aa07..b18dac4cc3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java @@ -36,7 +36,6 @@ public class CameraMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CAMERA_MODE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java index 1682f5bc62..adea754676 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java @@ -39,7 +39,6 @@ public class ChairSit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAIR_SIT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_staticObjectId); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java index 2bc31a285a..de141fa067 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java @@ -38,7 +38,6 @@ public class ChangeMoveType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_MOVE_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_running ? RUN : WALK); packet.writeD(0); // c2 diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index 73277d923d..fbe5e39e2e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -22,17 +22,17 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ChangeWaitType implements IClientOutgoingPacket { + public static final int WT_SITTING = 0; + public static final int WT_STANDING = 1; + public static final int WT_START_FAKEDEATH = 2; + public static final int WT_STOP_FAKEDEATH = 3; + private final int _objectId; private final int _moveType; private final int _x; private final int _y; private final int _z; - public static final int WT_SITTING = 0; - public static final int WT_STANDING = 1; - public static final int WT_START_FAKEDEATH = 2; - public static final int WT_STOP_FAKEDEATH = 3; - public ChangeWaitType(Creature creature, int newMoveType) { _objectId = creature.getObjectId(); @@ -46,7 +46,6 @@ public class ChangeWaitType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_WAIT_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_moveType); packet.writeD(_x); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index 41180bac50..aa2e7b2eaa 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -30,7 +30,6 @@ public class CharCreateFail implements IClientOutgoingPacket public static final int REASON_CREATE_NOT_ALLOWED = 0x05; // "Characters cannot be created from this server." public static final int REASON_CHOOSE_ANOTHER_SVR = 0x06; // "Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please // choose another server." - private final int _error; public CharCreateFail(int errorCode) @@ -42,7 +41,6 @@ public class CharCreateFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index f0e99885ad..768617e558 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -31,8 +31,7 @@ public class CharCreateOk implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_SUCCESS.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index bed289ca0a..1674eef343 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -33,7 +33,6 @@ public class CharDeleteFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_DELETE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index c3f775a8d3..e9ca7cefa6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -33,6 +33,22 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { + private static final int[] PAPERDOLL_ORDER = new int[] + { + Inventory.PAPERDOLL_UNDER, + Inventory.PAPERDOLL_HEAD, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_LHAND, + Inventory.PAPERDOLL_GLOVES, + Inventory.PAPERDOLL_CHEST, + Inventory.PAPERDOLL_LEGS, + Inventory.PAPERDOLL_FEET, + Inventory.PAPERDOLL_CLOAK, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_HAIR, + Inventory.PAPERDOLL_HAIR2 + }; + private final Player _player; private final Clan _clan; private int _objId; @@ -55,22 +71,6 @@ public class CharInfo implements IClientOutgoingPacket private int _vehicleId = 0; private final boolean _gmSeeInvis; - private static final int[] PAPERDOLL_ORDER = new int[] - { - Inventory.PAPERDOLL_UNDER, - Inventory.PAPERDOLL_HEAD, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_LHAND, - Inventory.PAPERDOLL_GLOVES, - Inventory.PAPERDOLL_CHEST, - Inventory.PAPERDOLL_LEGS, - Inventory.PAPERDOLL_FEET, - Inventory.PAPERDOLL_CLOAK, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_HAIR, - Inventory.PAPERDOLL_HAIR2 - }; - public CharInfo(Player player, boolean gmSeeInvis) { _player = player; @@ -119,16 +119,15 @@ public class CharInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); // Confirmed packet.writeD(_y); // Confirmed packet.writeD(_z); // Confirmed packet.writeD(_vehicleId); // Confirmed packet.writeD(_objId); // Confirmed packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed - packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) @@ -152,10 +151,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.getPvpFlag()); packet.writeD(_player.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -166,53 +163,40 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); - packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeS(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle()); - packet.writeD(_player.getAppearance().getVisibleClanId()); packet.writeD(_player.getAppearance().getVisibleClanCrestId()); packet.writeD(_player.getAppearance().getVisibleAllyId()); packet.writeD(_player.getAppearance().getVisibleAllyCrestId()); - - packet.writeC(_player.isSitting() ? 0x00 : 0x01); // Confirmed - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // Confirmed - packet.writeC(_player.isInCombat() ? 0x01 : 0x00); // Confirmed - - packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 0x01 : 0x00); // Confirmed - - packet.writeC(_player.isInvisible() ? 0x01 : 0x00); - + packet.writeC(_player.isSitting() ? 0 : 1); // Confirmed + packet.writeC(_player.isRunning() ? 1 : 0); // Confirmed + packet.writeC(_player.isInCombat() ? 1 : 0); // Confirmed + packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 1 : 0); // Confirmed + packet.writeC(_player.isInvisible() ? 1 : 0); packet.writeC(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount packet.writeC(_player.getPrivateStoreType().getId()); // Confirmed packet.writeH(_player.getCubics().size()); // Confirmed _player.getCubics().keySet().forEach(packet::writeH); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); // Confirmed packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); packet.writeH(_player.getRecomHave()); // Confirmed packet.writeD(_player.getMountNpcId() == 0 ? 0 : _player.getMountNpcId() + 1000000); - packet.writeD(_player.getClassId().getId()); // Confirmed - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeC(_player.isMounted() ? 0 : _enchantLevel); // Confirmed - packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeD(_player.getClanCrestLargeId()); packet.writeC(_player.getNobleLevel()); // Confirmed packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed - final ILocational baitLocation = _player.getFishing().getBaitLocation(); if (baitLocation != null) { @@ -228,29 +212,21 @@ public class CharInfo implements IClientOutgoingPacket } packet.writeD(_player.getAppearance().getNameColor()); // Confirmed - packet.writeD(_heading); // Confirmed - packet.writeC(_player.getPledgeClass()); packet.writeH(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); // Confirmed - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - - packet.writeC(0x00); // nPvPRestrainStatus - + packet.writeC(0); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentHp())); // Confirmed packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - - packet.writeC(0x00); // cBRLectureMark + packet.writeC(0); // cBRLectureMark final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed @@ -262,8 +238,9 @@ public class CharInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } + packet.writeC(_player.isTrueHero() ? 100 : 0); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); // Hair accessory + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); // Hair accessory packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 7187b73184..11f5f4df52 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -40,17 +40,16 @@ public class CharSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTED.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getTitle()); packet.writeD(_sessionId); packet.writeD(_player.getClanId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x01); // active ?? + packet.writeD(1); // active ?? packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -62,25 +61,20 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_player.getReputation()); packet.writeD(_player.getPkKills()); packet.writeD(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_player.getClassId().getId()); - packet.writeB(new byte[16]); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeB(new byte[28]); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 32fa8610ca..84daad43be 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -44,10 +44,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { private static final Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); - private final String _loginName; - private final int _sessionId; - private int _activeId; - private final List _characterPackages; private static final int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { @@ -62,6 +58,11 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_HAIR2, }; + private final String _loginName; + private final int _sessionId; + private int _activeId; + private final List _characterPackages; + /** * Constructor for CharSelectionInfo. * @param loginName @@ -92,16 +93,13 @@ public class CharSelectionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.size(); packet.writeD(size); // Created character count - packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) - packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 0x01 : 0x00); // if 1 can't create new char - packet.writeC(0x01); // 0=can't play, 1=can play free until level 85, 2=100% free play - packet.writeD(0x02); // if 1, Korean client - packet.writeC(0x00); // Balthus Knights, if 1 suggests premium account - + packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 1 : 0); // if 1 can't create new char + packet.writeC(1); // 0=can't play, 1=can play free until level 85, 2=100% free play + packet.writeD(2); // if 1, Korean client + packet.writeC(0); // Balthus Knights, if 1 suggests premium account long lastAccess = 0; if (_activeId == -1) { @@ -114,7 +112,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - for (int i = 0; i < size; i++) { final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); @@ -122,90 +119,73 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name packet.writeD(_sessionId); // Account ID - packet.writeD(0x00); // Clan ID - packet.writeD(0x00); // Builder level - + packet.writeD(0); // Clan ID + packet.writeD(0); // Builder level packet.writeD(charInfoPackage.getSex()); // Sex packet.writeD(charInfoPackage.getRace()); // Race packet.writeD(charInfoPackage.getBaseClassId()); - - packet.writeD(0x01); // GameServerName - + packet.writeD(1); // GameServerName packet.writeD(charInfoPackage.getX()); packet.writeD(charInfoPackage.getY()); packet.writeD(charInfoPackage.getZ()); packet.writeF(charInfoPackage.getCurrentHp()); packet.writeF(charInfoPackage.getCurrentMp()); - packet.writeQ(charInfoPackage.getSp()); packet.writeQ(charInfoPackage.getExp()); packet.writeF((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel()))); // High // Five packet.writeD(charInfoPackage.getLevel()); - packet.writeD(charInfoPackage.getReputation()); packet.writeD(charInfoPackage.getPkKills()); packet.writeD(charInfoPackage.getPvPKills()); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); // Ertheia - packet.writeD(0x00); // Ertheia - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); // Ertheia + packet.writeD(0); // Ertheia for (int slot : getPaperdollOrder()) { packet.writeD(charInfoPackage.getPaperdollItemId(slot)); } - for (int slot : getPaperdollOrderVisualId()) { packet.writeD(charInfoPackage.getPaperdollItemVisualId(slot)); } - packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_CHEST)); // Upper Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_LEGS)); // Lower Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_HEAD)); // Headgear enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_GLOVES)); // Gloves enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_FEET)); // Boots enchant level - packet.writeD(charInfoPackage.getHairStyle()); packet.writeD(charInfoPackage.getHairColor()); packet.writeD(charInfoPackage.getFace()); - packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); - packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption1Id() : 0); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption2Id() : 0); - // packet.writeD(charInfoPackage.getTransformId()); // Used to display Transformations - packet.writeD(0x00); // Currently on retail when you are on character select you don't see your transformation. - - packet.writeD(0x00); // Pet NpcId - packet.writeD(0x00); // Pet level - packet.writeD(0x00); // Pet Food - packet.writeD(0x00); // Pet Food Level - packet.writeF(0x00); // Current pet HP - packet.writeF(0x00); // Current pet MP - + packet.writeD(0); // Currently on retail when you are on character select you don't see your transformation. + packet.writeD(0); // Pet NpcId + packet.writeD(0); // Pet level + packet.writeD(0); // Pet Food + packet.writeD(0); // Pet Food Level + packet.writeF(0); // Current pet HP + packet.writeF(0); // Current pet MP packet.writeD(charInfoPackage.getVitalityPoints()); // Vitality packet.writeD((int) Config.RATE_VITALITY_EXP_MULTIPLIER * 100); // Vitality Percent packet.writeD(charInfoPackage.getVitalityItemsUsed()); // Remaining vitality item uses - packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0x00 : 0x01); // Char is active or not - packet.writeC(charInfoPackage.isNoble() ? 0x01 : 0x00); - packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 0x01 : 0x00); // Hero glow - packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 0x01 : 0x00); // Show hair accessory if enabled + packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0 : 1); // Char is active or not + packet.writeC(charInfoPackage.isNoble() ? 1 : 0); + packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 1 : 0); // Hero glow + packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 1 : 0); // Show hair accessory if enabled } return true; } @@ -214,7 +194,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); - try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate")) { @@ -227,7 +206,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (charInfopackage != null) { characterList.add(charInfopackage); - final Player player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { @@ -241,7 +219,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return characterList; } @@ -283,7 +260,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { clan.removeClanMember(objectId, 0); } - GameClient.deleteCharByObjId(objectId); return null; } @@ -302,20 +278,16 @@ public class CharSelectionInfo implements IClientOutgoingPacket charInfopackage.setHairStyle(chardata.getInt("hairstyle")); charInfopackage.setHairColor(chardata.getInt("haircolor")); charInfopackage.setSex(chardata.getInt("sex")); - charInfopackage.setExp(chardata.getLong("exp")); charInfopackage.setSp(chardata.getLong("sp")); charInfopackage.setVitalityPoints(chardata.getInt("vitality_points")); charInfopackage.setClanId(chardata.getInt("clanid")); - charInfopackage.setRace(chardata.getInt("race")); - final int baseClassId = chardata.getInt("base_class"); final int activeClassId = chardata.getInt("classid"); charInfopackage.setX(chardata.getInt("x")); charInfopackage.setY(chardata.getInt("y")); charInfopackage.setZ(chardata.getInt("z")); - final int faction = chardata.getInt("faction"); if (faction == 1) { @@ -325,7 +297,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setEvil(); } - if (Config.MULTILANG_ENABLE) { String lang = chardata.getString("language"); @@ -335,22 +306,18 @@ public class CharSelectionInfo implements IClientOutgoingPacket } charInfopackage.setHtmlPrefix("data/lang/" + lang + "/"); } - // if is in subclass, load subclass exp, sp, level info if (baseClassId != activeClassId) { loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId); } - charInfopackage.setClassId(activeClassId); - // Get the augmentation id for equipped weapon int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); if (weaponObjId < 1) { weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); } - if (weaponObjId > 0) { try (Connection con = DatabaseFactory.getConnection(); @@ -376,7 +343,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } - // Check if the base class is set to zero and also doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly. if ((baseClassId == 0) && (activeClassId > 0)) { @@ -386,7 +352,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setBaseClassId(baseClassId); } - charInfopackage.setDeleteTimer(deletetime); charInfopackage.setLastAccess(chardata.getLong("lastAccess")); charInfopackage.setNoble(chardata.getInt("nobless") == 1); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java index 847e24db87..d59df7911a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java @@ -32,7 +32,6 @@ public class ChooseInventoryItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHOOSE_INVENTORY_ITEM.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java index 12a3940521..ac66c2fa0f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java @@ -32,7 +32,6 @@ public class ClientSetTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CLIENT_SET_TIME.writeId(packet); - packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // time in client minutes packet.writeD(6); // constant to match the server time( this determines the speed of the client clock) return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java index 195824578b..5fdb62f544 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java @@ -68,7 +68,6 @@ public class ConfirmDlg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CONFIRM_DLG.writeId(packet); - final SMParam[] params = _systemMessage.getParams(); packet.writeD(_systemMessage.getId()); packet.writeD(params.length); @@ -130,7 +129,6 @@ public class ConfirmDlg implements IClientOutgoingPacket } } } - packet.writeD(_time); packet.writeD(_requesterId); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 2a98428740..85d5630327 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -71,7 +71,6 @@ public class CreatureSay implements IClientOutgoingPacket _mask |= 0x08; } } - // Does not shows level if (sender.isGM()) { @@ -123,7 +122,6 @@ public class CreatureSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_sender == null ? 0 : _sender.getObjectId()); packet.writeD(_chatType.getClientId()); if (_senderName != null) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index dfc40d995f..a307b06e4b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -38,9 +38,8 @@ public class DeleteObject implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DELETE_OBJECT.writeId(packet); - packet.writeD(_objectId); - packet.writeC(0x00); // c2 + packet.writeC(0); // c2 return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java index 982c8f3311..3b5917e55b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java @@ -50,7 +50,6 @@ public class Dice implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DICE.writeId(packet); - packet.writeD(_objectId); // object id of player packet.writeD(_itemId); // item id of dice (spade) 4625,4626,4627,4628 packet.writeD(_number); // number rolled diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 3d741a86a6..ebc93d0fc4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -68,7 +68,6 @@ public class Die implements IClientOutgoingPacket siegeClan = fort.getSiege().getAttackerClan(clan); isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan); } - _toVillage = creature.canRevive() && !creature.isPendingRevive(); _toClanHall = (clan != null) && (clan.getHideoutId() > 0); _toCastle = ((clan != null) && (clan.getCastleId() > 0)) || isInCastleDefense; @@ -76,7 +75,6 @@ public class Die implements IClientOutgoingPacket _useFeather = creature.getAccessLevel().allowFixedRes() || creature.getInventory().haveItemForSelfResurrection(); _toFortress = ((clan != null) && (clan.getFortId() > 0)) || isInFortDefense; } - _isSweepable = creature.isAttackable() && creature.isSweepActive(); } @@ -91,7 +89,6 @@ public class Die implements IClientOutgoingPacket { _items = new ArrayList<>(8); } - if (_items.size() < 8) { _items.add(itemId); @@ -116,20 +113,18 @@ public class Die implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DIE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_toVillage ? 0x01 : 0x00); - packet.writeD(_toClanHall ? 0x01 : 0x00); - packet.writeD(_toCastle ? 0x01 : 0x00); - packet.writeD(_toOutpost ? 0x01 : 0x00); - packet.writeD(_isSweepable ? 0x01 : 0x00); - packet.writeD(_useFeather ? 0x01 : 0x00); - packet.writeD(_toFortress ? 0x01 : 0x00); - packet.writeD(0x00); // Disables use Feather button for X seconds - packet.writeD(0x00); // Adventure's Song - packet.writeC(_hideAnimation ? 0x01 : 0x00); - - packet.writeD(_itemsEnabled ? 0x01 : 0x00); + packet.writeD(_toVillage ? 1 : 0); + packet.writeD(_toClanHall ? 1 : 0); + packet.writeD(_toCastle ? 1 : 0); + packet.writeD(_toOutpost ? 1 : 0); + packet.writeD(_isSweepable ? 1 : 0); + packet.writeD(_useFeather ? 1 : 0); + packet.writeD(_toFortress ? 1 : 0); + packet.writeD(0); // Disables use Feather button for X seconds + packet.writeD(0); // Adventure's Song + packet.writeC(_hideAnimation ? 1 : 0); + packet.writeD(_itemsEnabled ? 1 : 0); packet.writeD(getItems().size()); getItems().forEach(packet::writeD); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java index 15404f9dee..5837faec19 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java @@ -33,7 +33,6 @@ public class DoorInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_INFO.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.getId()); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java index 54f8742a73..14d41afee7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java @@ -33,7 +33,6 @@ public class DoorStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_STATUS_UPDATE.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.isOpen() ? 0 : 1); packet.writeD(_door.getDamage()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index b12458e719..3035890956 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -40,20 +40,17 @@ public class DropItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DROP_ITEM.writeId(packet); - packet.writeD(_objectId); packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeC(_item.isStackable() ? 0x01 : 0x00); + packet.writeC(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - - packet.writeC(0x00); - // packet.writeD(0x01); if above C == true (1) then packet.readD() + packet.writeC(0); + // packet.writeD(1); if above C == true (1) then packet.readD() packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java index 631c43ba0c..99bd80d97e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java @@ -62,13 +62,12 @@ public class Earthquake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EARTHQUAKE.writeId(packet); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_intensity); packet.writeD(_duration); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index db168592f1..335ea9dced 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -58,7 +58,6 @@ public class EnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_crystal); packet.writeQ(_count); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java index 837be1f5e3..169410245b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java @@ -41,7 +41,6 @@ public class EtcStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ETC_STATUS_UPDATE.writeId(packet); - packet.writeC(_player.getCharges()); // 1-7 increase force, level packet.writeD(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%) packet.writeC(_player.getExpertiseWeaponPenalty()); // Weapon Grade Penalty [1-4] diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java index 5dca90f960..9f8d576148 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java @@ -24,13 +24,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class Ex2ndPasswordAck implements IClientOutgoingPacket { + // TODO: Enum + public static final int SUCCESS = 0; + public static final int WRONG_PATTERN = 1; + private final int _status; private final int _response; - // TODO: Enum - public static final int SUCCESS = 0x00; - public static final int WRONG_PATTERN = 0x01; - public Ex2ndPasswordAck(int status, int response) { _status = status; @@ -41,10 +41,9 @@ public class Ex2ndPasswordAck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_ACK.writeId(packet); - packet.writeC(_status); - packet.writeD(_response == WRONG_PATTERN ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(_response == WRONG_PATTERN ? 1 : 0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java index 48bde5161d..c86b5185d0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordCheck implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_NEW = 0x00; - public static final int PASSWORD_PROMPT = 0x01; - public static final int PASSWORD_OK = 0x02; + public static final int PASSWORD_NEW = 0; + public static final int PASSWORD_PROMPT = 1; + public static final int PASSWORD_OK = 2; private final int _windowType; @@ -40,9 +40,8 @@ public class Ex2ndPasswordCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_CHECK.writeId(packet); - packet.writeD(_windowType); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java index 1abf50ab01..f6731bf18f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordVerify implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_OK = 0x00; - public static final int PASSWORD_WRONG = 0x01; - public static final int PASSWORD_BAN = 0x02; + public static final int PASSWORD_OK = 0; + public static final int PASSWORD_WRONG = 1; + public static final int PASSWORD_BAN = 2; private final int _wrongTentatives; private final int _mode; @@ -42,7 +42,6 @@ public class Ex2ndPasswordVerify implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_VERIFY.writeId(packet); - packet.writeD(_mode); packet.writeD(_wrongTentatives); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java index 8f3d5ec764..528988ab5f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java @@ -45,10 +45,8 @@ public class ExAbnormalStatusUpdateFromTarget implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ABNORMAL_STATUS_UPDATE_FROM_TARGET.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeH(_effects.size()); - for (BuffInfo info : _effects) { packet.writeD(info.getSkill().getDisplayId()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java index c4b9cd8356..f3abd6ec5c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java @@ -41,7 +41,6 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRABLE_SKILL_LIST_BY_CLASS.writeId(packet); - packet.writeH(_type.getId()); packet.writeH(_learnable.size()); for (SkillLearn skill : _learnable) @@ -54,7 +53,7 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket packet.writeC(skill.getRequiredItems().size()); if (_type == AcquireSkillType.SUBPLEDGE) { - packet.writeH(0x00); + packet.writeH(0); } } return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java index fd0e2fc97c..8555bb6e86 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java @@ -61,7 +61,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_SKILL_INFO.writeId(packet); - packet.writeD(_id); packet.writeD(_level); packet.writeQ(_spCost); @@ -73,7 +72,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket packet.writeD(holder.getId()); packet.writeQ(holder.getCount()); } - packet.writeD(_skillRem.size()); for (Skill skill : _skillRem) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java index 29793f4d6c..ff8c526ec4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java @@ -36,7 +36,6 @@ public class ExAdenaInvenCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ADENA_INVEN_COUNT.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeH(_player.getInventory().getSize()); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java index 2aa2d85bc5..5ef11e0f1e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java @@ -50,13 +50,11 @@ public class ExAirShipInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_INFO.writeId(packet); - packet.writeD(_ship.getObjectId()); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(_captain); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); @@ -73,14 +71,13 @@ public class ExAirShipInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - packet.writeD(_ship.getFuel()); packet.writeD(_ship.getMaxFuel()); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java index 4cfc76bfba..8b37f4fc0a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java @@ -42,7 +42,6 @@ public class ExAirShipStopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_airShipId); packet.writeD(_playerId); packet.writeD(_x); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java index 33c57712da..52958f931b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java @@ -37,12 +37,10 @@ public class ExAirShipTeleportList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_TELEPORT_LIST.writeId(packet); - packet.writeD(_dockId); if (_teleports != null) { packet.writeD(_teleports.length); - for (int i = 0; i < _teleports.length; i++) { packet.writeD(i - 1); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java index 392b228f0d..7918022c72 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java @@ -50,13 +50,12 @@ public class ExAlchemySkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_SKILL_LIST.writeId(packet); - packet.writeD(_skills.size()); for (Skill skill : _skills) { packet.writeD(skill.getId()); packet.writeD(skill.getLevel()); - packet.writeQ(0x00); // Always 0 on Naia, SP i guess? + packet.writeQ(0); // Always 0 on Naia, SP i guess? packet.writeC(skill.getId() == CommonSkill.ALCHEMY_CUBE.getId() ? 0 : 1); // This is type in flash, visible or not } return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java index 3bfadd2650..ed7f8d4255 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java @@ -47,12 +47,10 @@ public class ExAlterSkillRequest implements IClientOutgoingPacket { return true; } - OutgoingPackets.EX_ALTER_SKILL_REQUEST.writeId(packet); packet.writeD(_nextSkillId); packet.writeD(_currentSkillId); packet.writeD(_alterTime); - if (_alterTime > 0) { _player.setAlterSkillActive(true); @@ -62,7 +60,6 @@ public class ExAlterSkillRequest implements IClientOutgoingPacket _player.setAlterSkillActive(false); }, _alterTime * 1000); } - return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java index 3d7ee12a81..1990e1e701 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java @@ -37,7 +37,6 @@ public class ExAskCoupleAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_COUPLE_ACTION.writeId(packet); - packet.writeD(_actionId); packet.writeD(_objectId); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java index 61cabedd98..45615daf5a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java @@ -39,9 +39,8 @@ public class ExAskJoinMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_MPCC.writeId(packet); - packet.writeS(_requestorName); // name of CCLeader - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java index 17fa9d028f..908022ff7e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java @@ -38,7 +38,6 @@ public class ExAskJoinPartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_PARTY_ROOM.writeId(packet); - packet.writeS(_charName); packet.writeS(_roomName); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java index 2a6b958dc9..1551840013 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java @@ -38,7 +38,6 @@ public class ExAskModifyPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_MODIFY_PARTY_LOOTING.writeId(packet); - packet.writeS(_requestor); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java index 958e7c3d06..fa62c8a207 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java @@ -45,7 +45,6 @@ public class ExAttributeEnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ATTRIBUTE_ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeC(_isWeapon); packet.writeH(_type); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java index 1a3a1ef3fe..3d65055b3c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java @@ -41,9 +41,8 @@ public class ExAutoSoulShot implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AUTO_SOUL_SHOT.writeId(packet); - packet.writeD(_itemId); - packet.writeD(_enable ? 0x01 : 0x00); + packet.writeD(_enable ? 1 : 0); packet.writeD(_type); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java index 8680c6bd7a..a8137347ec 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java @@ -37,8 +37,7 @@ public class ExBaseAttributeCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASE_ATTRIBUTE_CANCEL_RESULT.writeId(packet); - - packet.writeD(0x01); // result + packet.writeD(1); // result packet.writeD(_objId); packet.writeD(_attribute); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java index acbad69599..27f7fb5a63 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java @@ -75,7 +75,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 1149, 1150, 1151, 1152, 1153, 1154, 1155 }; - public static final int[] DEFAULT_ACTION_LIST = { 0, 1, 2, 3, @@ -145,7 +144,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 5012, 5013, 5014, 5015 }; //@formatter:on - public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST); private final int[] _actionIds; @@ -159,7 +157,6 @@ public class ExBasicActionList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASIC_ACTION_LIST.writeId(packet); - packet.writeD(_actionIds.length); for (int _actionId : _actionIds) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java index 4c4fac8c91..d32dca4d21 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java @@ -34,13 +34,14 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBeautyItemList implements IClientOutgoingPacket { - private int _colorCount; - private final BeautyData _beautyData; - private final Map> _colorData = new HashMap<>(); private static final int HAIR_TYPE = 0; private static final int FACE_TYPE = 1; private static final int COLOR_TYPE = 2; + private int _colorCount; + private final BeautyData _beautyData; + private final Map> _colorData = new HashMap<>(); + public ExBeautyItemList(Player player) { _beautyData = BeautyShopData.getInstance().getBeautyData(player.getRace(), player.getAppearance().getSexType()); @@ -60,7 +61,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BEAUTY_ITEM_LIST.writeId(packet); - packet.writeD(HAIR_TYPE); packet.writeD(_beautyData.getHairList().size()); for (BeautyItem hair : _beautyData.getHairList().values()) @@ -72,7 +72,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(hair.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(FACE_TYPE); packet.writeD(_beautyData.getFaceList().size()); for (BeautyItem face : _beautyData.getFaceList().values()) @@ -84,7 +83,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(face.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(COLOR_TYPE); packet.writeD(_colorCount); for (Entry> entry : _colorData.entrySet()) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java index 1825236886..6d4c45cb2b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java @@ -34,7 +34,6 @@ public class ExBirthdayPopup implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_BIRTH_DAY.writeId(packet); - return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java index 7d2f17e697..43e525f05f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java @@ -26,6 +26,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBrBroadcastEventState implements IClientOutgoingPacket { + public static final int APRIL_FOOLS = 20090401; + public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) + public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) + public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) + public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) + private final int _eventId; private final int _eventState; private int _param0; @@ -36,12 +42,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket private String _param5; private String _param6; - public static final int APRIL_FOOLS = 20090401; - public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) - public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) - public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) - public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) - public ExBrBroadcastEventState(int eventId, int eventState) { _eventId = eventId; @@ -65,7 +65,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BROADCAST_EVENT_STATE.writeId(packet); - packet.writeD(_eventId); packet.writeD(_eventState); packet.writeD(_param0); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java index 1fd7ec663a..c0683c8797 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java @@ -44,7 +44,6 @@ public class ExBrBuffEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUFF_EVENT_STATE.writeId(packet); - packet.writeD(_type); packet.writeD(_value); packet.writeD(_state); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java index 943aae8a62..8e009d7b09 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java @@ -43,7 +43,6 @@ public class ExBrLoadEventTopRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_LOAD_EVENT_TOP_RANKERS.writeId(packet); - packet.writeD(_eventId); packet.writeD(_day); packet.writeD(_count); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java index 6a98c01654..9105e39efe 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java @@ -36,9 +36,8 @@ public class ExBrPremiumState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PREMIUM_STATE.writeId(packet); - packet.writeD(_player.getObjectId()); - packet.writeC(_player.hasPremiumStatus() ? 0x01 : 0x00); + packet.writeC(_player.hasPremiumStatus() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 381dd859ad..567cfc70f9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -59,10 +59,8 @@ public class ExBuySellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x01); // Type SELL + packet.writeD(1); // Type SELL packet.writeD(_inventorySlots); - if ((_sellList != null)) { packet.writeH(_sellList.size()); @@ -74,9 +72,8 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - if ((_refundList != null) && !_refundList.isEmpty()) { packet.writeH(_refundList.size()); @@ -90,10 +87,9 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - - packet.writeC(_done ? 0x01 : 0x00); + packet.writeC(_done ? 1 : 0); return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java index 2b43c0ce4b..e0ec81e0e7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java @@ -39,7 +39,6 @@ public class ExCastleState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CASTLE_STATE.writeId(packet); - packet.writeD(_castleId); packet.writeD(_castleSide.ordinal()); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java index b7f90d261b..a8196c7a83 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java @@ -52,7 +52,6 @@ public class ExChangeClientEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_CLIENT_EFFECT_INFO.writeId(packet); - packet.writeD(_type); packet.writeD(_key); packet.writeD(_value); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java index 472abc88df..eea59162ee 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java @@ -37,7 +37,6 @@ public class ExChangeNpcState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NPC_STATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java index 8cdcb4460d..45f2805517 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java @@ -49,7 +49,6 @@ public class ExChangePostState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_POST_STATE.writeId(packet); - packet.writeD(_receivedBoard ? 1 : 0); packet.writeD(_changedMsgIds.length); for (int postId : _changedMsgIds) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java index fc58ec9a2e..d765ab54e0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java @@ -35,7 +35,6 @@ public class ExChangeToAwakenedClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_TO_AWAKENED_CLASS.writeId(packet); - packet.writeD(_classId); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index f51a3eb3ae..1e9b8e9dc8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -47,7 +47,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket throw new IllegalArgumentException("Undefined Atribute item: " + stone); } _level = ElementalAttributeData.getInstance().getMaxElementLevel(_itemId); - // Register only items that can be put an attribute stone/crystal for (Item item : player.getInventory().getItems()) { @@ -62,7 +61,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_INVENTORY_ATTRIBUTE_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeQ(_count); packet.writeD(_atribute == AttributeType.FIRE ? 1 : 0); // Fire diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java index a272d85469..238882cd11 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java @@ -35,7 +35,6 @@ public class ExCloseMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java index d2ecd70952..877bca760a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java @@ -34,7 +34,6 @@ public class ExClosePartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_PARTY_ROOM.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java index 27c112776b..1d02c972b5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java @@ -54,7 +54,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLOSSEUM_FENCE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_clientState); packet.writeD(_x); @@ -62,7 +61,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_width); packet.writeD(_length); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java index 766d3619ad..b72bef93e8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java @@ -37,9 +37,8 @@ public class ExConfirmAddingContact implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AGIT_AUCTION_CMD.writeId(packet); - packet.writeS(_charName); - packet.writeD(_added ? 0x01 : 0x00); + packet.writeD(_added ? 1 : 0); return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java index beded32254..c832d507ed 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameAddPlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x01); - + packet.writeD(1); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java index 5f36f730d0..847ea93e6a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java @@ -45,9 +45,7 @@ public class ExCubeGameChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java index 66abbf4b75..a2f2e61ded 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java @@ -43,12 +43,10 @@ public class ExCubeGameChangeTeam implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x05); - + packet.writeD(5); packet.writeD(_player.getObjectId()); - packet.writeD(_fromRedTeam ? 0x01 : 0x00); - packet.writeD(_fromRedTeam ? 0x00 : 0x01); + packet.writeD(_fromRedTeam ? 1 : 0); + packet.writeD(_fromRedTeam ? 0 : 1); return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java index 5273b2099a..136b439283 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java @@ -39,9 +39,7 @@ public class ExCubeGameChangeTimeToStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x03); - + packet.writeD(3); packet.writeD(_seconds); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java index f81a302941..9bdba49029 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java @@ -35,7 +35,6 @@ public class ExCubeGameCloseUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0xffffffff); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java index 259a0e9407..3177e7a488 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java @@ -40,11 +40,9 @@ public class ExCubeGameEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x01); - - packet.writeD(_isRedTeamWin ? 0x01 : 0x00); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(1); + packet.writeD(_isRedTeamWin ? 1 : 0); + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java index 4d89e621ce..8b96bb545f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java @@ -55,14 +55,11 @@ public class ExCubeGameExtendedChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeD(_playerPoints); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java index e5a00f1ab7..c084789f13 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameRemovePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java index 00be884d2f..35a3f289d1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java @@ -35,8 +35,7 @@ public class ExCubeGameRequestReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x04); + packet.writeD(4); return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java index 1bc89e0c32..8b755dd3cc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java @@ -30,7 +30,6 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket // Players Lists private final List _bluePlayers; private final List _redPlayers; - // Common Values private final int _roomNumber; @@ -51,12 +50,9 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_roomNumber); packet.writeD(0xffffffff); - packet.writeD(_bluePlayers.size()); for (Player player : _bluePlayers) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java index 2f2c092c08..d000112787 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java @@ -31,7 +31,6 @@ public class ExCursedWeaponList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet); - final Set ids = CursedWeaponsManager.getInstance().getCursedWeaponsIds(); packet.writeD(ids.size()); ids.forEach(packet::writeD); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java index 2f60a1b80c..5bc7ff3238 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java @@ -39,7 +39,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet); - if (!_cursedWeaponInfo.isEmpty()) { packet.writeD(_cursedWeaponInfo.size()); @@ -47,7 +46,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { packet.writeD(w.id); packet.writeD(w.activated); - packet.writeD(w.pos.getX()); packet.writeD(w.pos.getY()); packet.writeD(w.pos.getZ()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java index f475a02b28..0456fb9dae 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java @@ -34,7 +34,6 @@ public class ExDissmissMPCCRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DISSMISS_MPCC_ROOM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java index 258010f717..c731b7c7a9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java @@ -37,7 +37,6 @@ public class ExDuelAskStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_ASK_START.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDuel); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java index 043c82c0db..e9a31bee57 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java @@ -38,7 +38,6 @@ public class ExDuelEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_END.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java index 264409b3d6..e1fa1cea88 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java @@ -38,7 +38,6 @@ public class ExDuelReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_READY.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java index 488aafcb7d..ecdd528a16 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java @@ -38,7 +38,6 @@ public class ExDuelStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_START.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java index 7df040c5e7..5ed0c09675 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java @@ -36,7 +36,6 @@ public class ExDuelUpdateUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_UPDATE_USER_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeD(_player.getClassId().getId()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 7ab055a3d8..f58c0573a8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExEnchantSkillInfo implements IClientOutgoingPacket { private final Set _routes; - private final int _skillId; private final int _skillLevel; private final int _skillSubLevel; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 41368a8efb..e4ee350e64 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -50,7 +50,6 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_INFO_DETAIL.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java index 5cedcd6284..1d32f0d725 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java @@ -43,7 +43,6 @@ public class ExEnchantSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_LIST.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skills.size()); for (Skill skill : _skills) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java index 6ab5e869f2..853d74039f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java @@ -38,7 +38,6 @@ public class ExEnchantSkillResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_RESULT.writeId(packet); - packet.writeD(_enchanted ? 1 : 0); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java index 7b7d2d008d..410bf16510 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java @@ -42,7 +42,6 @@ public class ExEventMatchMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_EVENT_MATCH_MESSAGE.writeId(packet); - packet.writeC(_type); packet.writeS(_message); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java index 7264e90233..1946758bf5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java @@ -37,11 +37,9 @@ public class ExGetBookMarkInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOOK_MARK_INFO.writeId(packet); - - packet.writeD(0x00); // Dummy + packet.writeD(0); // Dummy packet.writeD(_player.getBookMarkSlot()); packet.writeD(_player.getTeleportBookmarks().size()); - for (TeleportBookmark tpbm : _player.getTeleportBookmarks()) { packet.writeD(tpbm.getId()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java index 36e7bb81af..201e8eb49b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java @@ -42,15 +42,14 @@ public class ExGetBossRecord implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOSS_RECORD.writeId(packet); - packet.writeD(_ranking); packet.writeD(_totalPoints); if (_bossRecordInfo == null) { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } else { @@ -59,7 +58,7 @@ public class ExGetBossRecord implements IClientOutgoingPacket { packet.writeD(entry.getKey()); packet.writeD(entry.getValue()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? } } return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java index ea0a5f8b18..85ccad0758 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java @@ -41,7 +41,6 @@ public class ExGetOffAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_OFF_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_x); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java index f8e16a4191..9a02e49223 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java @@ -39,7 +39,6 @@ public class ExGetOnAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_ON_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java index 51197344a5..704b3212a1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExGetPremiumItemList implements IClientOutgoingPacket { private final Player _player; - private final Map _map; public ExGetPremiumItemList(Player player) @@ -43,7 +42,6 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_PREMIUM_ITEM_LIST.writeId(packet); - packet.writeD(_map.size()); for (Entry entry : _map.entrySet()) { @@ -51,7 +49,7 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket packet.writeQ(entry.getKey()); packet.writeD(item.getItemId()); packet.writeQ(item.getCount()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeS(item.getSender()); } return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index a005fa8ad8..0200bdee08 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -40,7 +40,6 @@ public class ExHeroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HERO_LIST.writeId(packet); - packet.writeD(_heroList.size()); for (StatSet hero : _heroList.values()) { @@ -51,7 +50,7 @@ public class ExHeroList implements IClientOutgoingPacket packet.writeS(hero.getString(Hero.ALLY_NAME, "")); packet.writeD(hero.getInt(Hero.ALLY_CREST, 0)); packet.writeD(hero.getInt(Hero.COUNT)); - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index d5b5430142..0baca7cd86 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -48,8 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); - - packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade + packet.writeC(_hide ? 0 : 1); // Grand Crusade packet.writeD(_currentTemplateId); packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java index 81db66b88f..323c0cdf1e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java @@ -35,7 +35,6 @@ public class ExIsCharNameCreatable implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_IS_CHAR_NAME_CREATABLE.writeId(packet); - packet.writeD(_allowed); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java index ecc751eab3..45def9e0be 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java @@ -38,7 +38,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { throw new NullPointerException(); } - if (currentAuction.getAuctionState() != ItemAuctionState.STARTED) { _timeRemaining = 0; @@ -47,7 +46,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { _timeRemaining = (int) (currentAuction.getFinishingTimeRemaining() / 1000); // in seconds } - _refresh = refresh; _currentAuction = currentAuction; _nextAuction = nextAuction; @@ -57,16 +55,12 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_AUCTION_INFO.writeId(packet); - - packet.writeC(_refresh ? 0x00 : 0x01); + packet.writeC(_refresh ? 0 : 1); packet.writeD(_currentAuction.getInstanceId()); - final ItemAuctionBid highestBid = _currentAuction.getHighestBid(); packet.writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid()); - packet.writeD(_timeRemaining); writeItem(packet, _currentAuction.getItemInfo()); - if (_nextAuction != null) { packet.writeQ(_nextAuction.getAuctionInitBid()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java index f66c77509f..e40ebdb90b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java @@ -44,7 +44,6 @@ public class ExItemAuctionStatus implements IClientOutgoingPacket _x = spawn.getX(); _y = spawn.getY(); _z = spawn.getZ(); - final ItemAuctionInstance manager = ItemAuctionManager.getInstance().getManagerInstance(AUCTION_MANAGER); if (manager != null) { @@ -64,7 +63,7 @@ public class ExItemAuctionStatus implements IClientOutgoingPacket packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); + packet.writeD(0); packet.writeH(_status); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java index 53ad8abd58..1c5e38cbab 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListMpccWaiting implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _rooms = new LinkedList<>(); @@ -53,7 +54,6 @@ public class ExListMpccWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_MPCC_WAITING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 78f2fec636..eafea24fa6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _players = new LinkedList<>(); @@ -60,7 +61,6 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(packet); - packet.writeD(_size); packet.writeD(_players.size()); for (Player player : _players) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java index 786c616875..c8723a9fc0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java @@ -46,7 +46,6 @@ public class ExMPCCPartyInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCPARTY_INFO_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_LeaderOID); packet.writeD(_memberCount); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java index 4bf07f0133..08259e4e6c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java @@ -37,7 +37,6 @@ public class ExMPCCPartymasterList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_PARTYMASTER_LIST.writeId(packet); - packet.writeD(_leadersName.size()); _leadersName.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java index abbdc8fe76..f021ef5f1f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java @@ -36,7 +36,6 @@ public class ExMPCCRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java index 154e156270..2eec590cb4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java @@ -41,7 +41,6 @@ public class ExMPCCRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java index 06e3027bfc..a0e9d0a4b0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java @@ -37,7 +37,6 @@ public class ExMPCCShowPartyMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCSHOW_PARTY_MEMBER_INFO.writeId(packet); - packet.writeD(_party.getMemberCount()); for (Player pc : _party.getMembers()) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java index e454a746f3..771b2f22cb 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java @@ -49,7 +49,6 @@ public class ExMagicAttackInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAGIC_ATTACK_INFO.writeId(packet); - packet.writeD(_caster); packet.writeD(_target); packet.writeD(_type); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java index 9cfbeb5aee..1aaa5b6520 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java @@ -35,7 +35,6 @@ public class ExMailArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAIL_ARRIVED.writeId(packet); - return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java index 983ff22b92..48156c0600 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java @@ -44,7 +44,6 @@ public class ExManageMpccRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MANAGE_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java index f710c006e8..9d7d14211e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java @@ -45,7 +45,6 @@ public class ExMoveToLocationAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_objId); packet.writeD(_tx); packet.writeD(_ty); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java index 3e3bdc9fed..87e44b51cd 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java @@ -43,7 +43,6 @@ public class ExMoveToLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java index 7ab0d1c7da..3c1902892a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java @@ -40,11 +40,9 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet); - packet.writeS(_channel.getLeader().getName()); - packet.writeD(0x00); // Channel loot 0 or 1 + packet.writeD(0); // Channel loot 0 or 1 packet.writeD(_channel.getMemberCount()); - packet.writeD(_channel.getParties().size()); for (Party p : _channel.getParties()) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java index 1536bd5f9b..f2a32bb6e8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java @@ -43,7 +43,6 @@ public class ExNeedToChangeName implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEED_TO_CHANGE_NAME.writeId(packet); - packet.writeD(_type); packet.writeD(_subType); packet.writeS(_name); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java index be9bec8559..d18b4606b3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java @@ -35,7 +35,6 @@ public class ExNevitAdventEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CHANNELING_EFFECT.writeId(packet); - packet.writeD(_timeLeft); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java index 3a0367c178..09f6250f51 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java @@ -35,7 +35,6 @@ public class ExNevitAdventPointInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_AGATHION_ENERGY_INFO.writeId(packet); - packet.writeD(_points); // 72 = 1%, max 7200 = 100% return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java index 88fdaae499..ef220d86de 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java @@ -37,9 +37,8 @@ public class ExNevitAdventTimeChange implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - // state 0 - pause 1 - started - packet.writeC(_paused ? 0x00 : 0x01); + packet.writeC(_paused ? 0 : 1); // left time in ms max is 16000 its 4m and state is automatically changed to quit packet.writeD(_time); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java index fccdf510cc..4025bf78fa 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java @@ -34,7 +34,6 @@ public class ExNewSkillToLearnByLevelUp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEW_SKILL_TO_LEARN_BY_LEVEL_UP.writeId(packet); - return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java index 324c18a517..f2ce8614dc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java @@ -43,8 +43,7 @@ public class ExNoticePostArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTICE_POST_ARRIVED.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java index afe3719d9b..050c7ccea5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java @@ -43,8 +43,7 @@ public class ExNoticePostSent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_WRITE_POST.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java index 5d98c20b09..e0bd08d39a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java @@ -30,7 +30,6 @@ public class ExNotifyPremiumItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_PREMIUM_ITEM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java index 6cb3724448..ba3c0cfeaa 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java @@ -34,7 +34,6 @@ public class ExOlympiadMatchEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MATCH_END.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java index 264d5aa484..7ffd5ed3bd 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java @@ -55,19 +55,15 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x00); // Type 0 = Match List, 1 = Match Result - + packet.writeD(0); // Type 0 = Match List, 1 = Match Result packet.writeD(_games.size()); - packet.writeD(0x00); - + packet.writeD(0); for (OlympiadGameTask curGame : _games) { final AbstractOlympiadGame game = curGame.getGame(); if (game != null) { packet.writeD(game.getStadiumId()); // Stadium Id (Arena 1 = 0) - if (game instanceof OlympiadGameNonClassed) { packet.writeD(1); @@ -80,8 +76,7 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket { packet.writeD(0); } - - packet.writeD(curGame.isRunning() ? 0x02 : 0x01); // (1 = Standby, 2 = Playing) + packet.writeD(curGame.isRunning() ? 2 : 1); // (1 = Standby, 2 = Playing) packet.writeS(game.getPlayerNames()[0]); // Player 1 Name packet.writeS(game.getPlayerNames()[1]); // Player 2 Name } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java index 712651603d..b387271fba 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java @@ -53,9 +53,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x01); // Type 0 = Match List, 1 = Match Result - + packet.writeD(1); // Type 0 = Match List, 1 = Match Result packet.writeD(_tie ? 1 : 0); // 0 - win, 1 - tie packet.writeS(_winnerList.get(0).getName()); packet.writeD(_winTeam); @@ -69,9 +67,8 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } - packet.writeD(_loseTeam); packet.writeD(_loserList.size()); for (OlympiadInfo info : _loserList) @@ -83,7 +80,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java index 34d81d1f53..712b9e06c6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java @@ -38,7 +38,6 @@ public class ExOlympiadMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MODE.writeId(packet); - packet.writeC(_mode); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java index ebea6c56f3..5b4f2c2523 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java @@ -53,7 +53,6 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_SPELLED_INFO.writeId(packet); - packet.writeD(_playerId); packet.writeD(_effects.size() + _effects2.size()); for (BuffInfo info : _effects) @@ -62,7 +61,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(info.getSkill().getDisplayId()); packet.writeH(info.getSkill().getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(info.getSkill().getAbnormalType().getClientId()); writeOptionalD(packet, info.getSkill().isAura() ? -1 : info.getTime()); } @@ -73,7 +72,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(skill.getDisplayId()); packet.writeH(skill.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(skill.getAbnormalType().getClientId()); packet.writeH(-1); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java index 18c34fe9de..ca473edfcf 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java @@ -76,7 +76,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_USER_INFO.writeId(packet); - if (_player != null) { packet.writeC(_player.getOlympiadSide()); @@ -91,7 +90,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket packet.writeS(_par.getName()); packet.writeD(_par.getBaseClass()); } - packet.writeD(_curHp); packet.writeD(_maxHp); packet.writeD(_curCp); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java index e84d0251bd..7ec64cc8c3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java @@ -35,7 +35,6 @@ public class ExOpenMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OPEN_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java index 90349cc1a2..5661dc9f57 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java @@ -56,7 +56,6 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PCCAFE_POINT_INFO.writeId(packet); - packet.writeD(_points); // num points packet.writeD(_mAddPoint); // points inc display packet.writeC(_mPeriodType); // period(0=don't show window,1=acquisition,2=use points) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java index f7e8b4a99a..248a2f7d98 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_ADD.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java index 832bee0012..1f452f4bae 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_DELETE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_summon.getSummonType()); packet.writeD(_summon.getOwner().getObjectId()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java index 0646a67001..703694fa2f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_UPDATE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 0e3edb3ea7..e4c6b79ae0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -47,7 +47,6 @@ public class ExPartyRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2bffdec368..2ebf1dc7f0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -43,10 +43,8 @@ public class ExPetInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class ExPetInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class ExPetInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,9 +154,8 @@ public class ExPetInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -227,28 +205,24 @@ public class ExPetInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PET_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -267,7 +241,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -283,19 +257,19 @@ public class ExPetInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -307,20 +281,20 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -344,12 +318,12 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -379,12 +353,10 @@ public class ExPetInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java index 082f4c7662..0f72c05a3a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java @@ -34,7 +34,6 @@ public class ExPlayScene implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLAY_SCENE.writeId(packet); - return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java index e98d317e14..7e3803bdaa 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java @@ -36,7 +36,6 @@ public class ExPledgeCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_COUNT.writeId(packet); - packet.writeD(_count); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java index 838029e284..4084de3481 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java @@ -38,7 +38,6 @@ public class ExPledgeDraftListSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_DRAFT_LIST_SEARCH.writeId(packet); - packet.writeD(_pledgeRecruitList.size()); for (PledgeWaitingInfo prl : _pledgeRecruitList) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java index fb956e9996..44e34004ea 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java @@ -25,11 +25,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExPledgeEmblem implements IClientOutgoingPacket { + private static final int TOTAL_SIZE = 65664; + private final int _crestId; private final int _clanId; private final byte[] _data; private final int _chunkId; - private static final int TOTAL_SIZE = 65664; public ExPledgeEmblem(int crestId, byte[] chunkedData, int clanId, int chunkId) { @@ -43,7 +44,6 @@ public class ExPledgeEmblem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clanId); packet.writeD(_crestId); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java index ed19bf976b..b32f8c0645 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitApplyInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_APPLY_INFO.writeId(packet); - packet.writeD(_status.ordinal()); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java index fc98b7b6f7..af4af9c9c1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitBoardDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_DETAIL.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClanId()); packet.writeD(_pledgeRecruitInfo.getKarma()); packet.writeS(_pledgeRecruitInfo.getInformation()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index b4d48373a6..eda808e754 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -34,7 +34,6 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket private final int _clanOnCurrentPage; private final int _startIndex; private final int _endIndex; - static final int CLAN_PER_PAGE = 12; public ExPledgeRecruitBoardSearch(List clanList, int currentPage) @@ -51,11 +50,9 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_SEARCH.writeId(packet); - packet.writeD(_currentPage); packet.writeD(_totalNumberOfPage); packet.writeD(_clanOnCurrentPage); - for (int i = _startIndex; i < _endIndex; i++) { packet.writeD(_clanList.get(i).getClanId()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 4ae5ffe316..b1f139226d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -40,7 +40,6 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java index 77080a3820..5844f220ec 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java @@ -39,7 +39,6 @@ public class ExPledgeWaitingList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST.writeId(packet); - packet.writeD(pledgePlayerRecruitInfos.size()); for (PledgeApplicantInfo recruitInfo : pledgePlayerRecruitInfos.values()) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java index a9245c1309..6b88572057 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java @@ -30,7 +30,6 @@ public class ExPledgeWaitingListAlarm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_ALARM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java index 60997b3da0..28c3967119 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java @@ -40,7 +40,6 @@ public class ExPledgeWaitingListApplied implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_APPLIED.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClan().getId()); packet.writeS(_pledgeRecruitInfo.getClan().getName()); packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java index 66a06892c2..1f53d1bb38 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java @@ -36,7 +36,6 @@ public class ExPledgeWaitingUser implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_USER.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getPlayerId()); packet.writeS(_pledgeRecruitInfo.getMessage()); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java index 49bc9b0995..5f404779f5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java @@ -43,7 +43,6 @@ public class ExPrivateStoreSetWholeMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_objectId); packet.writeS(_msg); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java index cb5e8fbce9..ff996b5d0c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutCommissionResultForVariationMake implements IClientOutgoingPac public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_COMMISSION_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_gemstoneObjId); packet.writeD(_itemId); packet.writeQ(_gemstoneCount); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java index 81721e921f..098472b7ae 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantScrollItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SCROLL_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java index 871f377db2..ffea182a49 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java index c47a4bcff4..8016e128f4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java index c8b46be499..95c0c0e4e1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_INTENSIVE_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_refinerItemObjId); packet.writeD(_lifestoneItemId); packet.writeD(_gemstoneItemId); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 2128b2b19f..2970ca00a2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -41,13 +41,12 @@ public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_CANCEL.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); packet.writeD(_itemAug1); packet.writeD(_itemAug2); packet.writeQ(_price); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java index 80541e65cd..c25dd16b01 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java @@ -34,10 +34,9 @@ public class ExPutItemResultForVariationMake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index b739a94c55..c4d27d1728 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -48,7 +48,6 @@ public class ExQuestItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java index fe5eb74eb0..bc8896164d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java @@ -56,13 +56,12 @@ public class ExQuestNpcLogList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_NPC_LOG_LIST.writeId(packet); - packet.writeD(_questId); packet.writeC(_npcLogList.size()); for (NpcLogListHolder holder : _npcLogList) { packet.writeD(holder.isNpcString() ? holder.getId() : holder.getId() + 1000000); - packet.writeC(holder.isNpcString() ? 0x01 : 0x00); + packet.writeC(holder.isNpcString() ? 1 : 0); packet.writeD(holder.getCount()); } return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java index 62d622caff..60616b256d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java @@ -35,7 +35,6 @@ public class ExRedSky implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RED_SKY.writeId(packet); - packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java index ce40b1a792..163faff855 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java @@ -36,7 +36,6 @@ public class ExRegenMax implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REGEN_MAX.writeId(packet); - packet.writeD(1); packet.writeD(_time); packet.writeD(_tickInterval); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java index d864795cd6..a17525576b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java @@ -34,7 +34,6 @@ public class ExRemoveEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REMOVE_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 29d5eafeef..77458fd485 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -41,7 +41,6 @@ public class ExReplyPostItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_POST_ITEM_LIST.writeId(packet); - packet.writeD(_itemList.size()); for (Item item : _itemList) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 57ed88ac29..4e479e75a6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -56,7 +56,6 @@ public class ExReplyReceivedPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_RECEIVED_POST.writeId(packet); - packet.writeD(_msg.getMailType().ordinal()); // GOD if (_msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED) { @@ -76,11 +75,10 @@ public class ExReplyReceivedPost extends AbstractItemPacket } packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown packet.writeS(_msg.getSenderName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -92,9 +90,8 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeQ(_msg.getReqAdena()); packet.writeD(_msg.hasAttachments() ? 1 : 0); packet.writeD(_msg.isReturned() ? 1 : 0); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 75f6596194..ed490eae91 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -54,14 +54,12 @@ public class ExReplySentPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_SENT_POST.writeId(packet); - - packet.writeD(0x00); // GOD + packet.writeD(0); // GOD packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); packet.writeS(_msg.getReceiverName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -73,11 +71,11 @@ public class ExReplySentPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeQ(_msg.getReqAdena()); - packet.writeD(_msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(_msg.isReturned() ? 0x01 : 00); + packet.writeD(_msg.hasAttachments() ? 1 : 0); + packet.writeD(_msg.isReturned() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index cc4f7ce1d8..e6a3f9bca2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -35,7 +35,6 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java index 2634aa1cdd..60201b177f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java @@ -35,7 +35,6 @@ public class ExRequestHackShield implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REQUEST_HACK_SHIELD.writeId(packet); - return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java index c51ff31d0b..75e3b3a945 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java @@ -29,13 +29,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyList implements IClientOutgoingPacket { + public static final int SHOW_FACESHAPE = 1; + public static final int SHOW_HAIRSTYLE = 0; + private final Player _player; private final int _type; private final Map _beautyItem; - public static final int SHOW_FACESHAPE = 1; - public static final int SHOW_HAIRSTYLE = 0; - public ExResponseBeautyList(Player player, int type) { _player = player; @@ -54,7 +54,6 @@ public class ExResponseBeautyList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java index ca2ed360ab..4b19201833 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java @@ -25,16 +25,15 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket { + public static final int FAILURE = 0; + public static final int SUCCESS = 1; + public static final int CHANGE = 0; + public static final int RESTORE = 1; + private final Player _player; private final int _type; private final int _result; - public static final int FAILURE = 0; - public static final int SUCCESS = 1; - - public static final int CHANGE = 0; - public static final int RESTORE = 1; - public ExResponseBeautyRegistReset(Player player, int type, int result) { _player = player; @@ -46,7 +45,6 @@ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_REGIST_RESET.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java index 0e313ef3b7..c0922cfb04 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java @@ -36,10 +36,8 @@ public class ExResponseResetList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_RESET_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); - packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java index 01fe1945ef..a230033d67 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java @@ -37,7 +37,6 @@ public class ExRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ROTATION.writeId(packet); - packet.writeD(_charId); packet.writeD(_heading); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index c58ccfc233..2646a71e77 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -36,7 +36,6 @@ public class ExRpItemLink extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RP_ITEM_LINK.writeId(packet); - writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java index 04556bbed2..f0c6eba8e9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java @@ -34,7 +34,6 @@ public class ExSearchOrc implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEARCH_ORC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index 1e06cc2a3f..7a4dced122 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -38,7 +38,6 @@ public class ExSendManorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_MANOR_LIST.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java index b63c69f37e..2c25cc8bfc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java @@ -124,7 +124,6 @@ public class ExSendUIEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_UIEVENT.writeId(packet); - packet.writeD(_objectId); packet.writeD(_type); // 0 = show, 1 = hide (there is 2 = pause and 3 = resume also but they don't work well you can only pause count down and you cannot resume it because resume hides the counter). packet.writeD(0); // unknown diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java index 4378479707..716a3e8623 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java @@ -385,16 +385,13 @@ public class ExServerPrimitive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SERVER_PRIMITIVE.writeId(packet); - packet.writeS(_name); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(65535); // has to do something with display range and angle packet.writeD(65535); // has to do something with display range and angle - packet.writeD(_points.size() + _lines.size()); - for (Point point : _points) { packet.writeC(1); // Its the type in this case Point @@ -408,7 +405,6 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(point.getY()); packet.writeD(point.getZ()); } - for (Line line : _lines) { packet.writeC(2); // Its the type in this case Line diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java index fb32e199b2..51fb91b643 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java @@ -46,7 +46,6 @@ public class ExSetCompassZoneCode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_COMPASS_ZONE_CODE.writeId(packet); - packet.writeD(_zoneType); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java index 1d0fbae3a4..34dee8bda0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java @@ -38,7 +38,6 @@ public class ExSetPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_PARTY_LOOTING.writeId(packet); - packet.writeD(_result); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java index 7b14ec8412..4e491af9d1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java @@ -34,7 +34,6 @@ public class ExShowAdventurerGuideBook implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_ADVENTURER_GUIDE_BOOK.writeId(packet); - return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index 82554fdc5f..1f8df76083 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -39,7 +39,6 @@ public class ExShowAgitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AGIT_INFO.writeId(packet); - final Collection clanHalls = ClanHallData.getInstance().getClanHalls(); packet.writeD(clanHalls.size()); clanHalls.forEach(clanHall -> diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index dd11ee0150..51e6646ff5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -44,7 +44,6 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BASE_ATTRIBUTE_CANCEL_WINDOW.writeId(packet); - packet.writeD(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java index 14e55d39f3..e22345c4fd 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java @@ -25,13 +25,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExShowBeautyMenu implements IClientOutgoingPacket { - private final Player _player; - private final int _type; - // TODO: Enum public static final int MODIFY_APPEARANCE = 0; public static final int RESTORE_APPEARANCE = 1; + private final Player _player; + private final int _type; + public ExShowBeautyMenu(Player player, int type) { _player = player; @@ -42,7 +42,6 @@ public class ExShowBeautyMenu implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BEAUTY_MENU.writeId(packet); - packet.writeD(_type); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 15d011befc..b0d2b90494 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -41,7 +41,6 @@ public class ExShowCastleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CASTLE_INFO.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) @@ -65,8 +64,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } packet.writeD(castle.getTaxPercent(TaxType.BUY)); packet.writeD((int) (castle.getSiege().getSiegeDate().getTimeInMillis() / 1000)); - - packet.writeC(castle.getSiege().isInProgress() ? 0x01 : 0x00); // Grand Crusade + packet.writeC(castle.getSiege().isInProgress() ? 1 : 0); // Grand Crusade packet.writeC(castle.getSide().ordinal()); // Grand Crusade } return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java index aeb4079f3a..f9a6ebe0e7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java @@ -38,7 +38,6 @@ public class ExShowContactList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_SHOW_POST_FRIEND.writeId(packet); - packet.writeD(_contacts.size()); _contacts.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index a079ea3129..94b989b583 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -37,7 +37,6 @@ public class ExShowCropInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _crops = (nextPeriod && !manor.isManorApproved()) ? null : manor.getCropProcure(manorId, nextPeriod); } @@ -46,10 +45,9 @@ public class ExShowCropInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Crop Sales" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Crop Sales" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); + packet.writeD(0); if (_crops != null) { packet.writeD(_crops.size()); @@ -64,17 +62,17 @@ public class ExShowCropInfo implements IClientOutgoingPacket if (seed == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(seed.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(seed.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(seed.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index a1e06eb2bf..1c65dde1a6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -62,10 +62,8 @@ public class ExShowCropSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getCropId()); // crop id diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index ee9fa9fd37..b625a1e4e7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -39,7 +39,6 @@ public class ExShowFortressInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_INFO.writeId(packet); - final Collection forts = FortManager.getInstance().getForts(); packet.writeD(forts.size()); for (Fort fort : forts) @@ -47,7 +46,7 @@ public class ExShowFortressInfo implements IClientOutgoingPacket final Clan clan = fort.getOwnerClan(); packet.writeD(fort.getResidenceId()); packet.writeS(clan != null ? clan.getName() : ""); - packet.writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00); + packet.writeD(fort.getSiege().isInProgress() ? 1 : 0); // Time of possession packet.writeD(fort.getOwnedTime()); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index f389b26ed5..678ab43e96 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -42,11 +42,9 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_MAP_INFO.writeId(packet); - packet.writeD(_fortress.getResidenceId()); packet.writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status packet.writeD(_fortress.getFortSize()); // barracks count - final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId()); if ((commanders != null) && !commanders.isEmpty() && _fortress.getSiege().isInProgress()) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 27da99cf41..da186103ae 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -51,7 +51,6 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_SIEGE_INFO.writeId(packet); - packet.writeD(_fortId); // Fortress Id packet.writeD(_size); // Total Barracks Count if (_csize > 0) @@ -64,22 +63,22 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { case 0: { - packet.writeD(0x03); + packet.writeD(3); break; } case 1: { - packet.writeD(0x02); + packet.writeD(2); break; } case 2: { - packet.writeD(0x01); + packet.writeD(1); break; } case 3: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -92,27 +91,27 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket // TODO: once control room supported, update packet.writeD(0x0x) to support 5th room case 0: { - packet.writeD(0x05); + packet.writeD(5); break; } case 1: { - packet.writeD(0x04); + packet.writeD(4); break; } case 2: { - packet.writeD(0x03); + packet.writeD(3); break; } case 3: { - packet.writeD(0x02); + packet.writeD(2); break; } case 4: { - packet.writeD(0x01); + packet.writeD(1); break; } } @@ -124,7 +123,7 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { for (int i = 0; i < _size; i++) { - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java index 8bb38fd28c..bc1e679418 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java @@ -41,8 +41,7 @@ public class ExShowManorDefaultInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_MANOR_DEFAULT_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" and "Crop Sales" buttons + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" and "Crop Sales" buttons packet.writeD(_crops.size()); for (Seed crop : _crops) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 1d3312d668..d03ce2a5fd 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -52,10 +52,8 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet); - packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java index cf38d18c1c..f41999329f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java @@ -34,7 +34,6 @@ public class ExShowQuestInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_INFO.writeId(packet); - return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java index 70f31e318f..0fa64c401d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java @@ -37,7 +37,6 @@ public class ExShowQuestMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_MARK.writeId(packet); - packet.writeD(_questId); packet.writeD(_questState); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index ab85228caf..1a6ee00a10 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ExShowReceivedPostList implements IClientOutgoingPacket { - private final List _inbox; - private static final int MESSAGE_FEE = 100; private static final int MESSAGE_FEE_PER_SLOT = 1000; + private final List _inbox; + public ExShowReceivedPostList(int objectId) { _inbox = MailManager.getInstance().getInbox(objectId); @@ -45,7 +45,6 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { @@ -64,18 +63,18 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getSenderName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); + packet.writeD(msg.isUnread() ? 1 : 0); packet.writeD(((msg.getMailType() == MailType.COMMISSION_ITEM_SOLD) || (msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED)) ? 0 : 1); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(msg.isReturned() ? 0x01 : 0x00); - packet.writeD(0x00); // SysString in some case it seems + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(msg.isReturned() ? 1 : 0); + packet.writeD(0); // SysString in some case it seems } } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(MESSAGE_FEE); packet.writeD(MESSAGE_FEE_PER_SLOT); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java index 9679468789..deebb99c8f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java @@ -33,6 +33,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; */ public class ExShowScreenMessage implements IClientOutgoingPacket { + // Positions + public static final byte TOP_LEFT = 1; + public static final byte TOP_CENTER = 2; + public static final byte TOP_RIGHT = 3; + public static final byte MIDDLE_LEFT = 4; + public static final byte MIDDLE_CENTER = 5; + public static final byte MIDDLE_RIGHT = 6; + public static final byte BOTTOM_CENTER = 7; + public static final byte BOTTOM_RIGHT = 8; + private final int _type; private final int _sysMessageId; private final int _unk1; @@ -48,15 +58,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket private List _parameters; // Localisation related. private String _lang; - // Positions - public static final byte TOP_LEFT = 0x01; - public static final byte TOP_CENTER = 0x02; - public static final byte TOP_RIGHT = 0x03; - public static final byte MIDDLE_LEFT = 0x04; - public static final byte MIDDLE_CENTER = 0x05; - public static final byte MIDDLE_RIGHT = 0x06; - public static final byte BOTTOM_CENTER = 0x07; - public static final byte BOTTOM_RIGHT = 0x08; public void setLang(String lang) { @@ -265,7 +266,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SCREEN_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -284,9 +284,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(sml.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -308,9 +308,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -318,7 +318,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket } } } - packet.writeD(_type); packet.writeD(_sysMessageId); packet.writeD(_position); @@ -326,9 +325,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java index 29ab5d355f..6123b08991 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java @@ -37,7 +37,6 @@ public class ExShowSeedInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _seeds = (nextPeriod && !manor.isManorApproved()) ? null : manor.getSeedProduction(manorId, nextPeriod); } @@ -46,16 +45,14 @@ public class ExShowSeedInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown if (_seeds == null) { packet.writeD(0); return true; } - packet.writeD(_seeds.size()); for (SeedProduction seed : _seeds) { @@ -67,17 +64,17 @@ public class ExShowSeedInfo implements IClientOutgoingPacket if (s == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(s.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(s.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(s.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java index e628099700..eb6e686e10 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java @@ -32,13 +32,10 @@ public class ExShowSeedMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_MAP_INFO.writeId(packet); - packet.writeD(2); // seed count - // Seed of Destruction packet.writeD(1); // id 1? Grand Crusade packet.writeD(2770 + GraciaSeedsManager.getInstance().getSoDState()); // sys msg id - // Seed of Infinity packet.writeD(2); // id 2? Grand Crusade // Manager not implemented yet diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index c9bf485ee2..05c0401a7c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -62,10 +62,8 @@ public class ExShowSeedSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getSeedId()); // seed id diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 1994402da2..269bec5b97 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -47,7 +47,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _cropsItems.put(cropId, item); } } - for (CropProcure crop : CastleManorManager.getInstance().getCropProcure(_manorId, false)) { if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) @@ -61,7 +60,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_cropsItems.size()); // size for (Item item : _cropsItems.values()) @@ -70,9 +68,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket packet.writeD(item.getObjectId()); // Object id packet.writeD(item.getId()); // crop id packet.writeD(seed.getLevel()); // seed level - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(1)); // reward 1 id - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(2)); // reward 2 id if (_castleCrops.containsKey(item.getId())) { @@ -85,9 +83,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket else { packet.writeD(0xFFFFFFFF); // manor - packet.writeQ(0x00); // buy residual - packet.writeQ(0x00); // buy price - packet.writeC(0x00); // reward + packet.writeQ(0); // buy residual + packet.writeQ(0); // buy price + packet.writeC(0); // reward } packet.writeQ(item.getCount()); // my crops } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index db4bccc928..b61d5b2301 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -40,7 +40,6 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { @@ -50,17 +49,17 @@ public class ExShowSentPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getReceiverName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); - packet.writeD(0x01); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(msg.isUnread() ? 1 : 0); + packet.writeD(1); + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(0); } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java index 0e4e9fd2ef..0dca57f2f8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java @@ -48,7 +48,6 @@ public class ExShowTerritory implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TERRITORY.writeId(packet); - packet.writeD(_vertices.size()); packet.writeD(_minZ); packet.writeD(_maxZ); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java index 4e284f82c5..86e1009bbf 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java @@ -46,7 +46,6 @@ public class ExShowTrace implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TRACE.writeId(packet); - packet.writeH(0); // type broken in H5 packet.writeD(0); // time broken in H5 packet.writeH(_locations.size()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java index 3245767ed7..836a5c9624 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java @@ -44,7 +44,6 @@ public class ExShowUsm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_USM.writeId(packet); - packet.writeD(_videoId); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java index 4acdffa842..1f1a14c31b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java @@ -34,7 +34,6 @@ public class ExShowVariationCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_CANCEL_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java index 3a2298019e..9870424e26 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java @@ -35,7 +35,6 @@ public class ExShowVariationMakeWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_MAKE_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java index 169827bab3..86211c8d97 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java @@ -44,10 +44,9 @@ public class ExSpawnEmitter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SPAWN_EMITTER.writeId(packet); - packet.writeD(_npcObjectId); packet.writeD(_playerObjectId); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java index 620800c1c4..534549b4fe 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java @@ -36,7 +36,6 @@ public class ExStartScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_START_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java index 0bd990cf34..babac59129 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java index 0e2689d598..d3e67afe99 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipObjId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java index 44b064113f..f5b3e1340f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java @@ -36,7 +36,6 @@ public class ExStopScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index 0b1e077353..7c8def3864 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -66,7 +66,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket } OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet); - packet.writeD(_inventory); packet.writeD(_warehouse); packet.writeD(_freight); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java index 3293a5b557..57563ca2f9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java @@ -39,7 +39,6 @@ public class ExSubPledgeSkillAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUB_PLEDGET_SKILL_ADD.writeId(packet); - packet.writeD(_type); packet.writeD(_skillId); packet.writeD(_skillLevel); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java index d61dfa20ab..816d6f16a6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java @@ -97,7 +97,6 @@ public class ExSubjobInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUBJOB_INFO.writeId(packet); - packet.writeC(_type); packet.writeD(_currClassId); packet.writeD(_currRace); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java index 85616016c7..b7a152629d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java @@ -38,7 +38,6 @@ public class ExTacticalSign implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TACTICAL_SIGN.writeId(packet); - packet.writeD(_target.getObjectId()); packet.writeD(_tokenId); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java index 3486e6281d..9e03a8bd0a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java @@ -39,7 +39,6 @@ public class ExTeleportToLocationActivate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_TO_LOCATION_ACTIVATE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java index a214c53a0f..7bcddd964d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java @@ -27,6 +27,7 @@ public class ExUISetting implements IClientOutgoingPacket { public static final String UI_KEY_MAPPING_VAR = "UI_KEY_MAPPING"; public static final String SPLIT_VAR = " "; + private final byte[] _uiKeyMapping; public ExUISetting(Player player) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java index 187770cfc8..eff4285a8b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java @@ -37,7 +37,6 @@ public class ExUnReadMailCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_UN_READ_MAIL_COUNT.writeId(packet); - packet.writeD(_mailUnreadCount); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java index f992b3c937..e59c651371 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java @@ -41,7 +41,6 @@ public class ExUseSharedGroupItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USE_SHARED_GROUP_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeD(_grpId); packet.writeD(_remainingTime); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java index 474fcc5208..f49d451587 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class ExUserInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getTransformationId()); - final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); final boolean isInvisible = _player.isInvisible(); packet.writeD(abnormalVisualEffects.size() + (isInvisible ? 1 : 0)); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java index b841449ab3..1069a64e3e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java @@ -36,12 +36,9 @@ public class ExUserInfoCubic implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_CUBIC.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(_player.getCubics().size()); - _player.getCubics().keySet().forEach(packet::writeH); - packet.writeD(_player.getAgathionId()); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java index 048986d108..7a0d1bfd74 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java @@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExUserInfoEquipSlot extends AbstractMaskPacket { private final Player _player; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -63,11 +62,9 @@ public class ExUserInfoEquipSlot extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_EQUIP_SLOT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(InventorySlot.values().length); packet.writeB(_masks); - final PlayerInventory inventory = _player.getInventory(); for (InventorySlot slot : InventorySlot.values()) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java index 3eb1cf9578..d655e48843 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java @@ -36,7 +36,6 @@ public class ExUserInfoInvenWeight implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_INVEN_WEIGHT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java index 91e0e92338..16aa81e9c0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java @@ -44,7 +44,6 @@ public class ExValidateLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java index 727267c9d5..50cb4025e4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java @@ -35,7 +35,6 @@ public class ExVariationCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_CANCEL_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java index 5cdc1b8d0e..4fde190ae2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java @@ -32,14 +32,13 @@ public class ExVariationResult implements IClientOutgoingPacket { _option1 = option1; _option2 = option2; - _success = success ? 0x01 : 0x00; + _success = success ? 1 : 0; } @Override public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_RESULT.writeId(packet); - packet.writeD(_option1); packet.writeD(_option2); packet.writeD(_success); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java index db0acfd5ff..60fb57c0b3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java @@ -41,10 +41,9 @@ public class ExVitalityEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_EFFECT_INFO.writeId(packet); - packet.writeD(_points); packet.writeD(_vitalityBonus); // Vitality Bonus - packet.writeH(0x00); // Vitality additional bonus in % + packet.writeH(0); // Vitality additional bonus in % packet.writeH(_vitalityItemsRemaining); // How much vitality items remaining for use packet.writeH(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java index 3cd9d26602..9a401c2321 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java @@ -35,7 +35,6 @@ public class ExVitalityPointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_POINT_INFO.writeId(packet); - packet.writeD(_vitalityPoints); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java index 71baff96ea..c4c5539ca4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java @@ -45,7 +45,6 @@ public class ExVoteSystemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VOTE_SYSTEM_INFO.writeId(packet); - packet.writeD(_recomLeft); packet.writeD(_recomHave); packet.writeD(_bonusTime); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java index 21411f5abc..452b0dc43a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java @@ -37,7 +37,6 @@ public class ExWorldChatCnt implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_WORLD_CHAT_CNT.writeId(packet); - packet.writeD(_points); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java index 5f935fe0dc..dc9c2288f8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java @@ -79,19 +79,17 @@ public class FakePlayerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // vehicleId + packet.writeD(0); // vehicleId packet.writeD(_objId); packet.writeS(_npc.getName()); - packet.writeH(_npc.getRace().ordinal()); - packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 0x01 : 0x00); + packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 1 : 0); packet.writeD(_fpcHolder.getClassId()); - - packet.writeD(0x00); // Inventory.PAPERDOLL_UNDER + packet.writeD(0); // Inventory.PAPERDOLL_UNDER packet.writeD(_fpcHolder.getEquipHead()); packet.writeD(_fpcHolder.getEquipRHand()); packet.writeD(_fpcHolder.getEquipLHand()); @@ -103,28 +101,22 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_fpcHolder.getEquipRHand()); // dual hand packet.writeD(_fpcHolder.getEquipHair()); packet.writeD(_fpcHolder.getEquipHair2()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderAugument()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } - packet.writeC(_fpcHolder.getArmorEnchantLevel()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderVisualId()) { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeC(_npc.getScriptValue()); // getPvpFlag() packet.writeD(_npc.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -135,16 +127,12 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_npc.getCollisionRadius()); packet.writeF(_npc.getCollisionHeight()); - packet.writeD(_fpcHolder.getHair()); packet.writeD(_fpcHolder.getHairColor()); packet.writeD(_fpcHolder.getFace()); - packet.writeS(_npc.getTemplate().getTitle()); - if (_clan != null) { packet.writeD(_clan.getId()); @@ -154,71 +142,51 @@ public class FakePlayerInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - - packet.writeC(0x01); // isSitting() ? 0x00 : 0x01 (at some initial tests it worked) - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); - packet.writeC(_npc.isInCombat() ? 0x01 : 0x00); - - packet.writeC(_npc.isAlikeDead() ? 0x01 : 0x00); - - packet.writeC(_npc.isInvisible() ? 0x01 : 0x00); - - packet.writeC(0x00); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount - packet.writeC(0x00); // getPrivateStoreType().getId() - - packet.writeH(0x00); // getCubics().size() + packet.writeC(1); // isSitting() ? 0 : 1 (at some initial tests it worked) + packet.writeC(_npc.isRunning() ? 1 : 0); + packet.writeC(_npc.isInCombat() ? 1 : 0); + packet.writeC(_npc.isAlikeDead() ? 1 : 0); + packet.writeC(_npc.isInvisible() ? 1 : 0); + packet.writeC(0); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount + packet.writeC(0); // getPrivateStoreType().getId() + packet.writeH(0); // getCubics().size() // getCubics().keySet().forEach(packet::writeH); - packet.writeC(0x00); - + packet.writeC(0); packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : 0); packet.writeH(_fpcHolder.getRecommends()); - packet.writeD(0x00); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 - + packet.writeD(0); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 packet.writeD(_fpcHolder.getClassId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(_fpcHolder.getWeaponEnchantLevel()); // isMounted() ? 0 : _enchantLevel - packet.writeC(_npc.getTeam().getId()); - - packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0x00); + packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0); packet.writeC(_fpcHolder.getNobleLevel()); - packet.writeC(_fpcHolder.isHero() ? 0x01 : 0x00); - - packet.writeC(_fpcHolder.isFishing() ? 0x01 : 0x00); - + packet.writeC(_fpcHolder.isHero() ? 1 : 0); + packet.writeC(_fpcHolder.isFishing() ? 1 : 0); packet.writeD(_fpcHolder.getBaitLocationX()); packet.writeD(_fpcHolder.getBaitLocationY()); packet.writeD(_fpcHolder.getBaitLocationZ()); - packet.writeD(_fpcHolder.getNameColor()); - packet.writeD(_heading); - packet.writeC(_fpcHolder.getPledgeStatus()); - packet.writeH(0x00); // getPledgeType() - + packet.writeH(0); // getPledgeType() packet.writeD(_fpcHolder.getTitleColor()); - - packet.writeC(0x00); // isCursedWeaponEquipped - - packet.writeD(0x00); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 - packet.writeD(0x00); // getTransformationDisplayId() + packet.writeC(0); // isCursedWeaponEquipped + packet.writeD(0); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 + packet.writeD(0); // getTransformationDisplayId() packet.writeD(_fpcHolder.getAgathionId()); - - packet.writeC(0x00); - - packet.writeD(0x00); // getCurrentCp() + packet.writeC(0); + packet.writeD(0); // getCurrentCp() packet.writeD(_npc.getMaxHp()); packet.writeD((int) Math.round(_npc.getCurrentHp())); packet.writeD(_npc.getMaxMp()); packet.writeD((int) Math.round(_npc.getCurrentMp())); - - packet.writeC(0x00); + packet.writeC(0); final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) @@ -229,9 +197,9 @@ public class FakePlayerInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(0x00); // cocPlayer.getPosition() - packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 0x01 : 0x00); - packet.writeC(0x00); // Used Ability Points + packet.writeC(0); // cocPlayer.getPosition() + packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 1 : 0); + packet.writeC(0); // Used Ability Points return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java index ae088538da..03223c8a3e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java @@ -62,7 +62,6 @@ public class FlyToLocation implements IClientOutgoingPacket _destY = destY; _destZ = destZ; _type = type; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -82,7 +81,6 @@ public class FlyToLocation implements IClientOutgoingPacket _flySpeed = flySpeed; _flyDelay = flyDelay; _animationSpeed = animationSpeed; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -103,7 +101,6 @@ public class FlyToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FLY_TO_LOCATION.writeId(packet); - packet.writeD(_chaObjId); packet.writeD(_destX); packet.writeD(_destY); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java index 1e52b0ef72..471d70f791 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java @@ -35,8 +35,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x01); + packet.writeC(1); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 81a384642c..fb7572fc5d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -50,7 +50,6 @@ public class GMHennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GMHENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON @@ -64,19 +63,19 @@ public class GMHennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(0x01); + packet.writeD(1); } if (_player.getHenna(4) != null) { packet.writeD(_player.getHenna(4).getDyeId()); - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 1 : 0); } else { - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid } return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java index 38ca4c7be0..59bf0d9d93 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java @@ -38,7 +38,6 @@ public class GMHide implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_HIDE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index cb55430def..7da70fb85a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -50,7 +50,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -79,28 +78,24 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); packet.writeD(_player.getPkKills()); - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollObjectId(slot)); } - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); } - for (int slot : getPaperdollOrder()) { final VariationInstance augment = _player.getInventory().getPaperdollAugmentation(slot); packet.writeD(augment != null ? augment.getOption1Id() : 0); // Confirmed packet.writeD(augment != null ? augment.getOption2Id() : 0); // Confirmed } - packet.writeC(_player.getInventory().getTalismanSlots()); // CT2.3 packet.writeC(_player.getInventory().canEquipCloak() ? 1 : 0); // CT2.3 - packet.writeD(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeH(0); packet.writeD(_player.getPAtk()); packet.writeD(_player.getPAtkSpd()); packet.writeD(_player.getPDef()); @@ -108,18 +103,14 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAccuracy()); packet.writeD(_player.getCriticalHit()); packet.writeD(_player.getMAtk()); - packet.writeD(_player.getMAtkSpd()); packet.writeD(_player.getPAtkSpd()); - packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicEvasionRate()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name packet.writeD(_player.getReputation()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -135,8 +126,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeD(_player.isGM() ? 0x01 : 0x00); // builder level - + packet.writeD(_player.isGM() ? 1 : 0); // builder level packet.writeS(_player.getTitle()); packet.writeD(_player.getClanId()); // pledge id packet.writeD(_player.getClanCrestId()); // pledge crest id @@ -146,26 +136,19 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeC(_player.getCreateItemLevel() > 0 ? 1 : 0); packet.writeD(_player.getPkKills()); packet.writeD(_player.getPvpKills()); - packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); - - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeC(321); - packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window - packet.writeC(_player.getNobleLevel()); - packet.writeC(_player.isHero() ? 0x01 : 0x00); - + packet.writeC(_player.isHero() ? 1 : 0); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); - final AttributeType attackAttribute = _player.getAttackElement(); packet.writeH(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); @@ -175,8 +158,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket } packet.writeD(_player.getFame()); packet.writeD(_player.getVitalityPoints()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index f212539af7..41f151be6f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -55,10 +55,9 @@ public class GMViewItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_ITEM_LIST.writeId(packet); - packet.writeS(_playerName); packet.writeD(_limit); // inventory limit - packet.writeH(0x01); // show window ?? + packet.writeH(1); // show window ?? packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index 1d88596096..552b6e6168 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -37,14 +37,12 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_player.getName()); packet.writeD(_clan.getId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); @@ -52,15 +50,14 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 packet.writeD(_clan.getAllyCrestId()); // c2 packet.writeD(_clan.isAtWar() ? 1 : 0); // c3 - packet.writeD(0x00); // T3 Unknown - + packet.writeD(0); // T3 Unknown packet.writeD(_clan.getMembers().size()); for (ClanMember member : _clan.getMembers()) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java index 93af10e254..3c155ff816 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -38,10 +38,8 @@ public class GMViewSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_SKILL_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_skills.size()); - final boolean isDisabled = (_player.getClan() != null) && (_player.getClan().getReputationScore() < 0); for (Skill skill : _skills) { @@ -49,7 +47,7 @@ public class GMViewSkillInfo implements IClientOutgoingPacket packet.writeH(skill.getDisplayLevel()); packet.writeH(skill.getSubLevel()); packet.writeD(skill.getDisplayId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(isDisabled && skill.isClanSkill() ? 1 : 0); packet.writeC(skill.isEnchantable() ? 1 : 0); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java index d8c273f914..449271993b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java @@ -35,7 +35,6 @@ public class GameGuardQuery implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GAME_GUARD_QUERY.writeId(packet); - packet.writeD(0x27533DD9); packet.writeD(0x2E72A51D); packet.writeD(0x2017038B); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index b0c011b696..037b2e6b6b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -35,10 +35,8 @@ public class GetItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ITEM.writeId(packet); - packet.writeD(_playerId); packet.writeD(_item.getObjectId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java index f8c6126c87..5f4d7bf3ca 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java @@ -50,7 +50,6 @@ public class GetOffVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_OFF_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_x); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java index ffa8d5f310..77d1e6ba28 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java @@ -45,7 +45,6 @@ public class GetOnVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ON_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java index e5dcb9ded6..b1f5b588f9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java @@ -44,14 +44,13 @@ public class GmViewQuestInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_QUEST_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeH(_questList.size()); // quest count - for (Quest quest : _questList) { final QuestState qs = _player.getQuestState(quest.getName()); packet.writeD(quest.getId()); packet.writeD(qs == null ? 0 : qs.getCond()); } - packet.writeH(0x00); // some size + packet.writeH(0); // some size // for size; ddQQ return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 395487097c..4309e2d74f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -51,7 +51,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeQ(_player.getAdena()); // activeChar current amount of Adena packet.writeD(3); // available equip slot packet.writeD(_hennaEquipList.size()); - for (Henna henna : _hennaEquipList) { // Player must have at least one dye in inventory @@ -62,8 +61,8 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); // item Id of the dye packet.writeQ(henna.getWearCount()); // amount of dyes required packet.writeQ(henna.getWearFee()); // amount of Adena required - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not - packet.writeD(0x00); // TODO: Find me! + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // meet the requirement or not + packet.writeD(0); // TODO: Find me! } } return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 30dc837721..b84d2283e8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -51,7 +51,6 @@ public class HennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON @@ -65,9 +64,8 @@ public class HennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); } - final Henna premium = _player.getHenna(4); if (premium != null) { @@ -77,16 +75,15 @@ public class HennaInfo implements IClientOutgoingPacket final long currentTime = Chronos.currentTimeMillis(); duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000; } - packet.writeD(premium.getDyeId()); packet.writeD(duration); // Premium Slot Dye Time Left - packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 1 : 0); } else { - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid } return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index cf3d83263f..5b77709720 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -40,12 +40,11 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_ITEM_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getWearCount()); // total amount of dye require packet.writeQ(_henna.getWearFee()); // total amount of Adena require to draw symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to draw or not 0 is false and 1 is true + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to draw or not 0 is false and 1 is true packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() + _player.getHennaValue(BaseStat.INT)); // equip INT @@ -63,7 +62,7 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket packet.writeH(_player.getLUC() + _player.getHennaValue(BaseStat.LUC)); // equip LUC packet.writeD(_player.getCHA()); // current CHA packet.writeH(_player.getCHA() + _player.getHennaValue(BaseStat.CHA)); // equip CHA - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index cb1379ac29..fc93d02a73 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -40,12 +40,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getCancelCount()); // total amount of dye require packet.writeQ(_henna.getCancelFee()); // total amount of Adena require to remove symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to remove or not + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to remove or not packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() - _player.getHennaValue(BaseStat.INT)); // equip INT @@ -63,7 +62,7 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket packet.writeH(_player.getLUC() - _player.getHennaValue(BaseStat.LUC)); // equip LUC packet.writeD(_player.getCHA()); // current CHA packet.writeH(_player.getCHA() - _player.getHennaValue(BaseStat.CHA)); // equip CHA - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 844fad86c7..452d354ac4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -39,7 +39,7 @@ public class HennaRemoveList implements IClientOutgoingPacket OutgoingPackets.HENNA_UNEQUIP_LIST.writeId(packet); packet.writeQ(_player.getAdena()); final boolean premiumSlotEnabled = _player.getHenna(4) != null; - packet.writeD(premiumSlotEnabled ? 0x04 : 0x03); // seems to be max size + packet.writeD(premiumSlotEnabled ? 4 : 3); // seems to be max size packet.writeD((premiumSlotEnabled ? 4 : 3) - _player.getHennaEmptySlots()); // slots used for (Henna henna : _player.getHennaList()) { @@ -49,8 +49,8 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); packet.writeQ(henna.getCancelCount()); packet.writeQ(henna.getCancelFee()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index 650261e010..9399a1626e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -62,14 +62,12 @@ public interface IClientOutgoingPacket extends IOutgoingPacket Inventory.PAPERDOLL_BROOCH_JEWEL5, Inventory.PAPERDOLL_BROOCH_JEWEL6 }; - int[] PAPERDOLL_ORDER_AUGMENT = new int[] { Inventory.PAPERDOLL_RHAND, Inventory.PAPERDOLL_LHAND, Inventory.PAPERDOLL_RHAND }; - int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 0c54e810f0..3378827f34 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -46,7 +46,6 @@ public class InventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index 8735b315b6..7912558f00 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -47,8 +47,7 @@ public class ItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.ITEM_LIST.writeId(packet); - - packet.writeH(_showWindow ? 0x01 : 0x00); + packet.writeH(_showWindow ? 1 : 0); packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java index b32b4df4a3..c3b9918230 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java @@ -32,9 +32,8 @@ public class JoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PARTY.writeId(packet); - packet.writeD(_response); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java index 65e06efeb7..f347f7efcd 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java @@ -32,7 +32,6 @@ public class JoinPledge implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PLEDGE.writeId(packet); - packet.writeD(_pledgeId); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index 96f6d7c34d..996622b9e9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -35,17 +35,16 @@ public class KeyPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VERSION_CHECK.writeId(packet); - packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok for (int i = 0; i < 8; i++) { packet.writeC(_key[i]); // key } - packet.writeD(0x01); + packet.writeD(1); packet.writeD(Config.SERVER_ID); // server id - packet.writeC(0x01); - packet.writeD(0x00); // obfuscation key - packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 0x01 : 0x00); // isClassic + packet.writeC(1); + packet.writeD(0); // obfuscation key + packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 1 : 0); // isClassic return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java index 484c10f0c4..62424fd03a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java @@ -40,7 +40,6 @@ public class L2FriendSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_SAY.writeId(packet); - packet.writeD(0); // ?? packet.writeS(_receiver); packet.writeS(_sender); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java index b875edb772..790d599b5b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java @@ -32,11 +32,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ListPartyWaiting implements IClientOutgoingPacket { + private static final int NUM_PER_PAGE = 64; + private final List _rooms = new LinkedList<>(); private final int _size; - private static final int NUM_PER_PAGE = 64; - public ListPartyWaiting(PartyMatchingRoomLevelType type, int location, int page, int requestorLevel) { final List rooms = MatchingRoomManager.getInstance().getPartyMathchingRooms(location, type, requestorLevel); @@ -57,7 +57,6 @@ public class ListPartyWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_PARTY_WATING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java index 4f8f9adc64..bb0ac61dbd 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java @@ -54,7 +54,6 @@ public class LoginFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LOGIN_FAIL.writeId(packet); - packet.writeD(_success); packet.writeD(_reason); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java index 18a522c315..6743e3e66f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java @@ -32,7 +32,6 @@ public class MagicSkillCanceld implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_CANCELED.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java index d56de10079..7ab29cc1a8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java @@ -66,7 +66,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // MagicSkillUse castingType packet.writeD(_objectId); packet.writeD(_skillId); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java index 3df8463279..a86626cfa6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java @@ -84,7 +84,6 @@ public class MagicSkillUse implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_USE.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // Casting bar type: 0 - default, 1 - default up, 2 - blue, 3 - green, 4 - red. packet.writeD(_creature.getObjectId()); packet.writeD(_target.getObjectId()); @@ -111,7 +110,7 @@ public class MagicSkillUse implements IClientOutgoingPacket packet.writeD(_target.getX()); packet.writeD(_target.getY()); packet.writeD(_target.getZ()); - packet.writeD(_actionId >= 0 ? 0x01 : 0x00); // 1 when ID from RequestActionUse is used + packet.writeD(_actionId >= 0 ? 1 : 0); // 1 when ID from RequestActionUse is used packet.writeD(_actionId >= 0 ? _actionId : 0); // ID from RequestActionUse. Used to set cooldown on summon skills. return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java index 6b710c692e..12e2488f24 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java @@ -37,11 +37,9 @@ public class ManagePledgePower implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet); - packet.writeD(_rank); packet.writeD(_action); packet.writeD(_clan.getRankPrivs(_rank).getBitmask()); - return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 95f4b6f201..4e2ab3f00b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -42,11 +42,9 @@ public class MonRaceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MON_RACE_INFO.writeId(packet); - packet.writeD(_unknown1); packet.writeD(_unknown2); - packet.writeD(0x08); - + packet.writeD(8); for (int i = 0; i < 8; i++) { packet.writeD(_monsters[i].getObjectId()); // npcObjectID @@ -68,7 +66,7 @@ public class MonRaceInfo implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java index 0093b3edc9..e6386921ff 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java @@ -45,13 +45,10 @@ public class MoveToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_xDst); packet.writeD(_yDst); packet.writeD(_zDst); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java index b1fb3ea003..59103c6c4c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java @@ -48,7 +48,6 @@ public class MoveToLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java index 30ff3c96af..aa261f924f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java @@ -50,11 +50,9 @@ public class MoveToPawn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_PAWN.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetId); packet.writeD(_distance); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index e1da19cc8f..50ff0191b8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -58,18 +58,16 @@ public class MultiSellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.MULTI_SELL_LIST.writeId(packet); - - packet.writeC(0x00); // Helios + packet.writeC(0); // Helios packet.writeD(_list.getId()); // list id - packet.writeC(0x00); // GOD Unknown + packet.writeC(0); // GOD Unknown packet.writeD(1 + (_index / PAGE_SIZE)); // page started from 1 - packet.writeD(_finished ? 0x01 : 0x00); // finished + packet.writeD(_finished ? 1 : 0); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - packet.writeC(0x00); // Grand Crusade - packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window - packet.writeD(0x20); // Helios - Always 32 - + packet.writeC(0); // Grand Crusade + packet.writeC(_list.isChanceMultisell() ? 1 : 0); // new multisell window + packet.writeD(32); // Helios - Always 32 while (_size-- > 0) { ItemInfo itemEnchantment = _list.getItemEnchantment(_index); @@ -86,19 +84,15 @@ public class MultiSellList extends AbstractItemPacket } } } - packet.writeD(_index); // Entry ID. Start from 1. packet.writeC(entry.isStackable() ? 1 : 0); - // Those values will be passed down to MultiSellChoose packet. packet.writeH(itemEnchantment != null ? itemEnchantment.getEnchantLevel() : 0); // enchant level writeItemAugment(packet, itemEnchantment); writeItemElemental(packet, itemEnchantment); writeItemEnsoulOptions(packet, itemEnchantment); - packet.writeH(entry.getProducts().size()); packet.writeH(entry.getIngredients().size()); - for (ItemChanceHolder product : entry.getProducts()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(product.getId()); @@ -122,7 +116,6 @@ public class MultiSellList extends AbstractItemPacket writeItemElemental(packet, displayItemEnchantment); writeItemEnsoulOptions(packet, displayItemEnchantment); } - for (ItemChanceHolder ingredient : entry.getIngredients()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(ingredient.getId()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java index 6e85f5348c..cd46aac3aa 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java @@ -45,11 +45,10 @@ public class MyTargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MY_TARGET_SELECTED.writeId(packet); - - packet.writeD(0x01); // Grand Crusade + packet.writeD(1); // Grand Crusade packet.writeD(_objectId); packet.writeH(_color); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java index 1901ad1297..166c5c1e00 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java @@ -36,7 +36,6 @@ public class NewCharacterSuccess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NEW_CHARACTER_SUCCESS.writeId(packet); - packet.writeD(_chars.size()); for (PlayerTemplate chr : _chars) { @@ -44,31 +43,24 @@ public class NewCharacterSuccess implements IClientOutgoingPacket { continue; } - // TODO: Unhardcode these packet.writeD(chr.getRace().ordinal()); packet.writeD(chr.getClassId().getId()); - packet.writeD(99); packet.writeD(chr.getBaseSTR()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseDEX()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseCON()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseINT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseWIT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseMEN()); packet.writeD(1); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java index be1605f679..6061ea26ef 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java @@ -38,7 +38,6 @@ public class NicknameChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NICK_NAME_CHANGED.writeId(packet); - packet.writeD(_objectId); packet.writeS(_title); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index f9cd107e2c..3e4837b4a4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -54,24 +54,20 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public NpcHtmlMessage(int npcObjId, int itemId) { super(npcObjId); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } public NpcHtmlMessage(int npcObjId, int itemId, String html) { super(npcObjId, html); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } @@ -79,11 +75,10 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java index 61f195e35d..05489103cb 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java @@ -47,10 +47,8 @@ public class NpcInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -58,7 +56,6 @@ public class NpcInfo extends AbstractMaskPacket private int _clanId = 0; private int _statusMask = 0; private final Set _abnormalVisualEffects; - private String[] _localisation; public void setLang(String lang) @@ -101,112 +98,90 @@ public class NpcInfo extends AbstractMaskPacket { addComponentType(NpcInfoType.HEADING); } - if ((npc.getStat().getPAtkSpd() > 0) || (npc.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (npc.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((npc.getLeftHandItem() > 0) || (npc.getRightHandItem() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (npc.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (npc.getDisplayEffect() > 0) { addComponentType(NpcInfoType.DISPLAY_EFFECT); } - if (npc.isInsideZone(ZoneId.WATER) || npc.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (npc.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (npc.getCloneObjId() > 0) { addComponentType(NpcInfoType.CLONE); } - if (npc.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (npc.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (npc.getCurrentHp() <= npc.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (npc.getCurrentMp() <= npc.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (npc.getTemplate().isUsingServerSideName()) { addComponentType(NpcInfoType.NAME); } - if (npc.getTemplate().isUsingServerSideTitle() || (npc.isMonster() && (Config.SHOW_NPC_LEVEL || Config.SHOW_NPC_AGGRESSION)) || npc.isChampion() || npc.isTrap()) { addComponentType(NpcInfoType.TITLE); } - if (npc.getNameString() != null) { addComponentType(NpcInfoType.NAME_NPCSTRINGID); } - if (npc.getTitleString() != null) { addComponentType(NpcInfoType.TITLE_NPCSTRINGID); } - if (_npc.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (!_abnormalVisualEffects.isEmpty() || npc.isInvisible()) { addComponentType(NpcInfoType.ABNORMALS); } - if (npc.getEnchantEffect() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (npc.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (npc.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (npc.getClanId() > 0) { final Clan clan = ClanTable.getInstance().getClan(npc.getClanId()); @@ -220,14 +195,11 @@ public class NpcInfo extends AbstractMaskPacket addComponentType(NpcInfoType.CLAN); } } - addComponentType(NpcInfoType.COLOR_EFFECT); - if (npc.getPvpFlag() > 0) { addComponentType(NpcInfoType.PVP_FLAG); } - // TODO: Confirm me if (npc.isInCombat()) { @@ -245,8 +217,7 @@ public class NpcInfo extends AbstractMaskPacket { _statusMask |= 0x08; } - - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -296,27 +267,23 @@ public class NpcInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO.writeId(packet); - packet.writeD(_npc.getObjectId()); - packet.writeC(_npc.isShowSummonAnimation() ? 0x02 : 0x00); // // 0=teleported 1=default 2=summoned + packet.writeC(_npc.isShowSummonAnimation() ? 2 : 0); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 0x01 : 0x00); + packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { String title = _npc.getTitle(); - // Localisation related. if ((_localisation != null) && !_localisation[1].equals("")) { @@ -329,10 +296,8 @@ public class NpcInfo extends AbstractMaskPacket title = title.replace(NpcData.getInstance().getTemplate(_npc.getId()).getTitle(), _localisation[1]); } } - packet.writeS(title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -351,7 +316,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -366,20 +331,20 @@ public class NpcInfo extends AbstractMaskPacket if (containsMask(NpcInfoType.EQUIPPED)) { packet.writeD(_npc.getRightHandItem()); - packet.writeD(0x00); // Armor id? + packet.writeD(0); // Armor id? packet.writeD(_npc.getLeftHandItem()); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_npc.isDead() ? 0x00 : 0x01); + packet.writeC(_npc.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); + packet.writeC(_npc.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 0x01 : _npc.isFlying() ? 0x02 : 0x00); + packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -391,7 +356,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_npc.isFlying() ? 0x01 : 0x00); + packet.writeD(_npc.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { @@ -427,12 +392,12 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(0x00); // 2 - do some animation on spawn + packet.writeC(0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -464,12 +429,10 @@ public class NpcInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java index c95a8e5274..923e9cebad 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class NpcInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_npc.getObjectId()); packet.writeD(_npc.getTransformationDisplayId()); - final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size()); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java index a294edc57a..2a0ba41eeb 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java @@ -38,7 +38,6 @@ public class NpcQuestHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NPC_QUEST_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_questId); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java index d3328ade97..fc6d0d4a3a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java @@ -106,7 +106,6 @@ public class NpcSay implements IClientOutgoingPacket { _parameters = new ArrayList<>(); } - for (String item : params) { if ((item != null) && (item.length() > 0)) @@ -127,11 +126,9 @@ public class NpcSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_SAY.writeId(packet); - packet.writeD(_objectId); packet.writeD(_textType.getClientId()); packet.writeD(_npcId); - // Localisation related. if (_lang != null) { @@ -147,7 +144,6 @@ public class NpcSay implements IClientOutgoingPacket } } } - packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java index 356e3f48a9..ac61f9d247 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java @@ -33,11 +33,10 @@ public class ObservationMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_START.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me packet.writeD(0xc0); // TODO: Find me return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java index 5c0a0766b3..896ccea02b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java @@ -33,7 +33,6 @@ public class ObservationReturn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_END.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java index c2f7ab404f..173772c870 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java @@ -37,7 +37,6 @@ public class OnEventTrigger implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EVENT_TRIGGER.writeId(packet); - packet.writeD(_emitterId); packet.writeC(_enabled); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index d499719f31..70a51b2b0d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -44,7 +44,6 @@ public class PackageSendableList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet); - packet.writeD(_objectId); packet.writeQ(_adena); packet.writeD(_items.size()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java index a53f589386..e24d63f717 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java @@ -39,7 +39,6 @@ public class PackageToList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_TO_LIST.writeId(packet); - packet.writeD(_players.size()); for (Entry entry : _players.entrySet()) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 655c7abcd1..44b23b37f4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -55,7 +55,6 @@ public class PartyMemberPosition implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); - packet.writeD(locations.size()); for (Entry entry : locations.entrySet()) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java index 9e275ec246..c9d3595037 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java @@ -36,7 +36,6 @@ public class PartyRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java index b9c7d06769..8c97cac6b5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java @@ -36,12 +36,10 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ADD.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); // c3 packet.writeD(_party.getDistributionType().getId()); // c3 packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); - packet.writeD((int) _member.getCurrentCp()); // c4 packet.writeD(_member.getMaxCp()); // c4 packet.writeD((int) _member.getCurrentHp()); @@ -51,7 +49,7 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket packet.writeD(_member.getVitalityPoints()); packet.writeC(_member.getLevel()); packet.writeH(_member.getClassId().getId()); - packet.writeC(0x00); + packet.writeC(0); packet.writeH(_member.getRace().ordinal()); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java index 65d0c60c2e..5ad91f5463 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java @@ -37,21 +37,17 @@ public class PartySmallWindowAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ALL.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); packet.writeC(_party.getDistributionType().getId()); packet.writeC(_party.getMemberCount() - 1); - for (Player member : _party.getMembers()) { if ((member != null) && (member != _exclude)) { packet.writeD(member.getObjectId()); packet.writeS(member.getName()); - packet.writeD((int) member.getCurrentCp()); // c4 packet.writeD(member.getMaxCp()); // c4 - packet.writeD((int) member.getCurrentHp()); packet.writeD(member.getMaxHp()); packet.writeD((int) member.getCurrentMp()); @@ -59,7 +55,7 @@ public class PartySmallWindowAll implements IClientOutgoingPacket packet.writeD(member.getVitalityPoints()); packet.writeC(member.getLevel()); packet.writeH(member.getClassId().getId()); - packet.writeC(0x01); // Unk + packet.writeC(1); // Unk packet.writeH(member.getRace().ordinal()); final Summon pet = member.getPet(); packet.writeD(member.getServitors().size() + (pet != null ? 1 : 0)); // Summon size, one only atm diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java index 94a8a5a2ce..09ce132af4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java @@ -33,7 +33,6 @@ public class PartySmallWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_DELETE.writeId(packet); - packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java index c53c6c7779..e9ea2efbbe 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java @@ -42,7 +42,6 @@ public class PartySmallWindowUpdate extends AbstractMaskPacket _summon.getStat().getExp()) { packet.writeQ(_summon.getStat().getExp()); // 0% absolute value @@ -160,9 +148,7 @@ public class PetInfo implements IClientOutgoingPacket { packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value } - packet.writeQ(_summon.getExpForNextLevel()); // 100% absoulte value - packet.writeD(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight packet.writeD(_summon.getMaxLoad()); // max weight it can carry packet.writeD(_summon.getPAtk()); // patk @@ -178,25 +164,20 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD((int) _summon.getStat().getMoveSpeed()); // speed packet.writeD(_summon.getPAtkSpd()); // atkspeed packet.writeD(_summon.getMAtkSpd()); // casting speed - packet.writeC(0); // TODO: Check me, might be ride status packet.writeC(_summon.getTeam().getId()); // Confirmed packet.writeC(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed packet.writeC(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed - - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. - + packet.writeD(0); // TODO: Find me + packet.writeD(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. packet.writeC(_summon.getOwner().getSummonPoints()); // Used Summon Points packet.writeC(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points - final Set aves = _summon.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeH(aves.size()); // Confirmed for (AbnormalVisualEffect ave : aves) { packet.writeH(ave.getClientId()); // Confirmed } - packet.writeC(_statusMask); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 5b43daa74b..1f60ec39d1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -46,7 +46,6 @@ public class PetInventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.PET_INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index e4cf35779f..16dc83b7ed 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -35,7 +35,6 @@ public class PetItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java index fdb00ddbb1..913f65d470 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java @@ -38,7 +38,6 @@ public class PetStatusShow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_SHOW.writeId(packet); - packet.writeD(_summonType); packet.writeD(_summonObjectId); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 25c2c74292..823a8c405a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -52,7 +52,6 @@ public class PetStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_UPDATE.writeId(packet); - packet.writeD(_summon.getSummonType()); packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getX()); @@ -69,7 +68,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket packet.writeQ(_summon.getStat().getExp()); packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value packet.writeQ(_summon.getExpForNextLevel()); // 100% absolute value - packet.writeD(0x01); // TODO: Find me! + packet.writeD(1); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java index 4bc3570779..0898b01f67 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java @@ -63,7 +63,6 @@ public class PlaySound implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLAY_SOUND.writeId(packet); - packet.writeD(_unknown1); // unknown 0 for quest and ship; packet.writeS(_soundFile); packet.writeD(_unknown3); // unknown 0 for quest; 1 for ship; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java index fbe57d4aaf..5108fe7e1b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java @@ -44,7 +44,6 @@ public class PledgeCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java index aa11b1213e..6805f64d7c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java @@ -34,7 +34,6 @@ public class PledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_INFO.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getId()); packet.writeS(_clan.getName()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java index 72f2c71838..193ee17589 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java @@ -36,12 +36,10 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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 - // clan or subpledge name if (_member.getPledgeType() != 0) { @@ -51,7 +49,6 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket { packet.writeS(_member.getClan().getName()); } - packet.writeS(_member.getApprenticeOrSponsorName()); // name of this member's apprentice/sponsor return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java index eefd482979..6aa5067c8f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java @@ -36,7 +36,6 @@ public class PledgeReceivePowerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_POWER_INFO.writeId(packet); - packet.writeD(_member.getPowerGrade()); // power grade packet.writeS(_member.getName()); packet.writeD(_member.getClan().getRankPrivs(_member.getPowerGrade()).getBitmask()); // privileges diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 818c38a076..01f71eea17 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -40,8 +40,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_SUB_PLEDGE_CREATED.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); packet.writeD(_subPledge.getId()); packet.writeS(_subPledge.getName()); packet.writeS(getLeaderName()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java index 4d0efeb82a..7649947064 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java @@ -43,7 +43,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(packet); - packet.writeD(_tab); // page packet.writeD(_clanList.size()); for (ClanWar clanWar : _clanList) @@ -53,7 +52,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket { continue; } - packet.writeS(clan.getName()); packet.writeD(clanWar.getState().ordinal()); // type: 0 = Declaration, 1 = Blood Declaration, 2 = In War, 3 = Victory, 4 = Defeat, 5 = Tie, 6 = Error packet.writeD(clanWar.getRemainingTime()); // Time if friends to start remaining diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java index 2cbbdbf046..80d10fcb66 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java @@ -34,26 +34,25 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_INFO_UPDATE.writeId(packet); - // sending empty data so client will ask all the info in response ;) packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getLevel()); // clan level packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); // castle state ? + packet.writeD(0); // castle state ? packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); // clan reputation score - packet.writeD(0x00); // ? - packet.writeD(0x00); // ? + packet.writeD(0); // ? + packet.writeD(0); // ? packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); // c5 packet.writeD(_clan.getAllyCrestId()); // c5 packet.writeD(_clan.isAtWar() ? 1 : 0); // c5 - packet.writeD(0x00); // TODO: Find me! - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java index ae26e50dbb..2fa9f26d4a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java @@ -51,12 +51,11 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ADD.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); - packet.writeD(0x00); - packet.writeD(0x01); + packet.writeD(0); + packet.writeD(1); packet.writeD(_isOnline); // 1 = online 0 = offline packet.writeD(_pledgeType); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index c5ea7b284b..a1be315cf4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -41,7 +41,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket { _clan = clan; _pledge = pledge; - _pledgeId = _pledge == null ? 0x00 : _pledge.getId(); + _pledgeId = _pledge == null ? 0 : _pledge.getId(); _leaderName = pledge == null ? clan.getLeaderName() : CharNameTable.getInstance().getNameById(pledge.getLeaderId()); _name = pledge == null ? clan.getName() : pledge.getName(); _members = _clan.getMembers(); @@ -65,31 +65,28 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(packet); - - packet.writeD(_isSubPledge ? 0x00 : 0x01); + packet.writeD(_isSubPledge ? 0 : 1); packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_pledgeId); packet.writeS(_name); packet.writeS(_leaderName); - packet.writeD(_clan.getCrestId()); // crest id .. is used again packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); // 0 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(0); // 0 packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.isAtWar() ? 1 : 0); // new c3 - packet.writeD(0x00); // Territory castle ID + packet.writeD(0); // Territory castle ID packet.writeD(_clan.getSubPledgeMembersCount(_pledgeId)); - for (ClanMember m : _members) { if (m.getPledgeType() != _pledgeId) @@ -107,8 +104,8 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket } else { - packet.writeD(0x01); // no visible effect - packet.writeD(0x01); // packet.writeD(1); + packet.writeD(1); // no visible effect + packet.writeD(1); // packet.writeD(1); } packet.writeD(m.isOnline() ? m.getObjectId() : 0); // objectId = online 0 = offline packet.writeD(m.getSponsor() != 0 ? 1 : 0); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java index 0fd387e419..154bcc610d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java @@ -32,7 +32,6 @@ public class PledgeShowMemberListDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_DELETE.writeId(packet); - packet.writeS(_player); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java index c61f412ed0..7b8c7c516b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java @@ -66,7 +66,6 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index 4e89797e45..09f70ea024 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -62,14 +62,14 @@ public class PledgeSkillList implements IClientOutgoingPacket { packet.writeD(sk.getDisplayId()); packet.writeH(sk.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } for (SubPledgeSkill sk : _subSkills) { packet.writeD(sk._subType); // Clan Sub-unit types packet.writeD(sk._skillId); packet.writeH(sk._skillLevel); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java index f3b8d4c26c..a94601294f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java @@ -37,7 +37,6 @@ public class PledgeSkillListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST_ADD.writeId(packet); - packet.writeD(_id); packet.writeD(_level); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java index 9e1b4843ac..5f32f2bf54 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java @@ -33,15 +33,14 @@ public class PledgeStatusChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_STATUS_CHANGED.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getLeaderId()); packet.writeD(_clan.getId()); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getAllyId()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.getCrestLargeId()); - packet.writeD(0x00); // pledge type ? + packet.writeD(0); // pledge type ? return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java index 5b56d0b28d..41d0f9f7d8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java @@ -44,12 +44,10 @@ public class PrivateStoreListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_LIST.writeId(packet); - packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); // Viewer's item count? + packet.writeD(0); // Viewer's item count? packet.writeD(_items.size()); - int slotNumber = 0; for (TradeItem item : _items) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 67b6ba8d94..d72050283e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -43,11 +43,10 @@ public class PrivateStoreListSell extends AbstractItemPacket else { OutgoingPackets.PRIVATE_STORE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index bb462b6cd2..5e95f8b9b8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -43,17 +43,14 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MANAGE_LIST.writeId(packet); - packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(_itemList.size()); // inventory items for potential buy for (Item item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(_buyList.size()); // count for all items already added for buy for (TradeItem item : _buyList) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index 400307eb79..94ff06a790 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -45,18 +45,15 @@ public class PrivateStoreManageListSell extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MANAGE_LIST.writeId(packet); - packet.writeD(_objId); packet.writeD(_packageSale ? 1 : 0); // Package sell packet.writeQ(_playerAdena); - packet.writeD(_itemList.size()); // for potential sells for (TradeItem item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(_sellList.size()); // count for any items already added for sell for (TradeItem item : _sellList) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java index 8a5b9eef92..0d7bcbea16 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgBuy implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java index b00bd2add2..8fdb5701b8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgSell implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java index c3958367e8..5ddaa46ba0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java @@ -40,7 +40,6 @@ public class RadarControl implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RADAR_CONTROL.writeId(packet); - packet.writeD(_showRadar); packet.writeD(_type); // maybe type packet.writeD(_x); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java index c7e4525bf2..bcfd911f58 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java @@ -40,10 +40,8 @@ public class RecipeBookItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_BOOK_ITEM_LIST.writeId(packet); - - packet.writeD(_isDwarvenCraft ? 0x00 : 0x01); // 0 = Dwarven - 1 = Common + packet.writeD(_isDwarvenCraft ? 0 : 1); // 0 = Dwarven - 1 = Common packet.writeD(_maxMp); - if (_recipes == null) { packet.writeD(0); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index d9c2621c84..a4e4641944 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -78,7 +78,6 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(_offeringMaximumAdena); // Adena worth of items for maximum offering. return true; } - PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java index a24ba356ef..ab67f9bff3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java @@ -50,7 +50,6 @@ public class RecipeShopItemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_ITEM_INFO.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD(_recipeId); packet.writeD((int) _manufacturer.getCurrentMp()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java index aac30faf53..ec67224b1e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java @@ -57,11 +57,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MANAGE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD((int) _seller.getAdena()); - packet.writeD(_isDwarven ? 0x00 : 0x01); - + packet.writeD(_isDwarven ? 0 : 1); if ((_recipes == null) || _recipes.isEmpty()) { packet.writeD(0); @@ -69,7 +67,6 @@ public class RecipeShopManageList implements IClientOutgoingPacket else { packet.writeD(_recipes.size()); // number of items in recipe book - int i = 1; for (RecipeHolder recipe : _recipes) { @@ -77,10 +74,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket packet.writeD(i++); } } - if ((_manufacture == null) || _manufacture.isEmpty()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -88,7 +84,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket for (Entry item : _manufacture) { packet.writeD(item.getKey()); - packet.writeD(0x00); // CanCraft? + packet.writeD(0); // CanCraft? packet.writeQ(item.getValue()); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java index c025b5e4ed..2b9bc5b6e7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java @@ -33,7 +33,6 @@ public class RecipeShopMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MSG.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeS(_player.getStoreName()); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java index 07ba331de9..8f504ce103 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java @@ -37,14 +37,13 @@ public class RecipeShopSellList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_SELL_LIST.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD((int) _manufacturer.getCurrentMp()); // Creator's MP packet.writeD(_manufacturer.getMaxMp()); // Creator's MP packet.writeQ(_buyer.getAdena()); // Buyer Adena if (!_manufacturer.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -52,7 +51,7 @@ public class RecipeShopSellList implements IClientOutgoingPacket for (Entry item : _manufacturer.getManufactureItems().entrySet()) { packet.writeD(item.getKey()); - packet.writeD(0x00); // CanCreate? + packet.writeD(0); // CanCreate? packet.writeQ(item.getValue()); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 74700e29b0..269e14d50b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -88,7 +88,6 @@ public class RelationChanged implements IClientOutgoingPacket { return; } - final Relation r = new Relation(); r._objId = activeChar.getObjectId(); r._relation = relation; @@ -102,7 +101,6 @@ public class RelationChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RELATION_CHANGED.writeId(packet); - packet.writeC(_mask); if (_multi == null) { @@ -122,7 +120,6 @@ public class RelationChanged implements IClientOutgoingPacket private void writeRelation(PacketWriter packet, Relation relation) { packet.writeD(relation._objId); - if ((_mask & SEND_DEFAULT) != SEND_DEFAULT) { packet.writeD(relation._relation); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java index b4e9dc25c5..4477cfb705 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java @@ -35,7 +35,6 @@ public class RequestEnchant implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java index 4ef15fb74c..7a0a6cbe58 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java @@ -33,7 +33,6 @@ public class Revive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.REVIVE.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java index 9c409601e3..b9ddf7733f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java @@ -42,7 +42,6 @@ public class Ride implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RIDE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_mounted); packet.writeD(_rideType); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 813ce03f4d..13ef62f55f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -49,11 +49,9 @@ public class SellListProcure implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SELL_LIST_PROCURE.writeId(packet); - packet.writeQ(_money); // money - packet.writeD(0x00); // lease ? + packet.writeD(0); // lease ? packet.writeH(_sellList.size()); // list size - for (Entry entry : _sellList.entrySet()) { final Item item = entry.getKey(); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java index baa37a8507..75b5b07854 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java @@ -39,12 +39,10 @@ public class SendMacroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MACRO_LIST.writeId(packet); - packet.writeC(_updateType.getId()); - packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0x00); // modified, created or deleted macro's id + packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0); // modified, created or deleted macro's id packet.writeC(_count); // count of Macros packet.writeC(_macro != null ? 1 : 0); // unknown - if ((_macro != null) && (_updateType != MacroUpdateType.DELETE)) { packet.writeD(_macro.getId()); // Macro ID @@ -52,9 +50,7 @@ public class SendMacroList implements IClientOutgoingPacket packet.writeS(_macro.getDescr()); // Desc packet.writeS(_macro.getAcronym()); // acronym packet.writeD(_macro.getIcon()); // icon - packet.writeC(_macro.getCommands().size()); // count - int i = 1; for (MacroCmd cmd : _macro.getCommands()) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java index 47fada25be..21622b5f19 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java @@ -32,7 +32,6 @@ public class SendTradeRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_REQUEST.writeId(packet); - packet.writeD(_senderId); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java index 69aa749406..1513a0e3d1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java @@ -55,7 +55,6 @@ public class ServerObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SERVER_OBJECT_INFO.writeId(packet); - packet.writeD(_activeChar.getObjectId()); packet.writeD(_displayId + 1000000); packet.writeS(_name); // name @@ -70,8 +69,8 @@ public class ServerObjectInfo implements IClientOutgoingPacket packet.writeF(_collisionHeight); packet.writeD((int) (_isAttackable ? _activeChar.getCurrentHp() : 0)); packet.writeD(_isAttackable ? _activeChar.getMaxHp() : 0); - packet.writeD(0x01); // object type - packet.writeD(0x00); // special effects + packet.writeD(1); // object type + packet.writeD(0); // special effects return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java index 88b370ad8b..0164e5c4a2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java @@ -34,7 +34,6 @@ public class SetSummonRemainTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SET_SUMMON_REMAIN_TIME.writeId(packet); - packet.writeD(_maxTime); packet.writeD(_remainingTime); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java index db28b72acf..016f5a0c9a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java @@ -38,7 +38,6 @@ public class ShopPreviewInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_INFO.writeId(packet); - packet.writeD(Inventory.PAPERDOLL_TOTALSLOTS); // Slots packet.writeD(getFromList(Inventory.PAPERDOLL_UNDER)); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index 4d605cfbb4..0cc66729ca 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -52,11 +52,9 @@ public class ShopPreviewList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_LIST.writeId(packet); - packet.writeD(5056); packet.writeQ(_money); // current money packet.writeD(_listId); - int newlength = 0; for (Product product : _list) { @@ -66,23 +64,20 @@ public class ShopPreviewList implements IClientOutgoingPacket } } packet.writeH(newlength); - for (Product product : _list) { if (!product.getItem().getCrystalType().isGreater(_expertise) && product.getItem().isEquipable()) { packet.writeD(product.getItemId()); packet.writeH(product.getItem().getType2()); // item type2 - if (product.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { packet.writeQ(product.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } else { - packet.writeQ(0x00); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand + packet.writeQ(0); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } - packet.writeQ(Config.WEAR_PRICE); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 298301ed0d..b13080ff28 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -40,7 +40,6 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_BUFF_STATUS_UPDATE.writeId(packet); - packet.writeD(_skillId); packet.writeH(_skillLevel); packet.writeH(_skillSubLevel); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index c6a67fb97c..b8624ce4cd 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -33,7 +33,6 @@ public class ShortCutInit implements IClientOutgoingPacket { return; } - _shortCuts = player.getAllShortCuts(); } @@ -41,24 +40,22 @@ public class ShortCutInit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); packet.writeD(sc.getSlot() + (sc.getPage() * 12)); - switch (sc.getType()) { case ITEM: { packet.writeD(sc.getId()); - packet.writeD(0x01); // Enabled or not + packet.writeD(1); // Enabled or not packet.writeD(sc.getSharedReuseGroup()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeQ(0x00); // Augment id - packet.writeD(0x00); // Visual id + packet.writeD(0); + packet.writeD(0); + packet.writeQ(0); // Augment id + packet.writeD(0); // Visual id break; } case SKILL: @@ -67,8 +64,8 @@ public class ShortCutInit implements IClientOutgoingPacket packet.writeH(sc.getLevel()); packet.writeH(sc.getSubLevel()); packet.writeD(sc.getSharedReuseGroup()); - packet.writeC(0x00); // C5 - packet.writeD(0x01); // C6 + packet.writeC(0); // C5 + packet.writeD(1); // C6 break; } case ACTION: @@ -77,7 +74,7 @@ public class ShortCutInit implements IClientOutgoingPacket case BOOKMARK: { packet.writeD(sc.getId()); - packet.writeD(0x01); // C6 + packet.writeD(1); // C6 } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java index 43d61af661..f099eab47e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java @@ -37,7 +37,6 @@ public class ShortCutRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_REGISTER.writeId(packet); - packet.writeD(_shortcut.getType().ordinal()); packet.writeD(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client switch (_shortcut.getType()) @@ -47,10 +46,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeD(_shortcut.getId()); packet.writeD(_shortcut.getCharacterType()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeD(0x00); // unknown - packet.writeD(0x00); // unknown - packet.writeD(0x00); // item augment id - packet.writeD(0x00); // TODO: Find me, item visual id ? + packet.writeD(0); // unknown + packet.writeD(0); // unknown + packet.writeD(0); // item augment id + packet.writeD(0); // TODO: Find me, item visual id ? break; } case SKILL: @@ -59,10 +58,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeH(_shortcut.getLevel()); packet.writeH(_shortcut.getSubLevel()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeC(0x00); // C5 + packet.writeC(0); // C5 packet.writeD(_shortcut.getCharacterType()); - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me + packet.writeD(0); // TODO: Find me break; } case ACTION: diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java index d6f71b5f70..cfae3b3fad 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java @@ -54,7 +54,6 @@ public class ShowBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - packet.writeC(_showBoard); // c4 1 to show community 00 to hide packet.writeS("bypass _bbshome"); // top packet.writeS("bypass _bbsgetfav"); // favorite diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java index 4b62a7001b..4d62e99d7a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java @@ -32,7 +32,6 @@ public class ShowCalculator implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_CALC.writeId(packet); - packet.writeD(_calculatorId); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java index 55f58d5375..4574762467 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java @@ -32,9 +32,8 @@ public class ShowMiniMap implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_MINIMAP.writeId(packet); - packet.writeD(_mapId); - packet.writeC(0x00); // Seven Signs state + packet.writeC(0); // Seven Signs state return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java index 303eab4e8a..97100d09d2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java @@ -34,7 +34,6 @@ public class ShowPCCafeCouponShowUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_PCCAFE_COUPON_SHOW_UI.writeId(packet); - return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java index d86958e586..0a0f3ae861 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java @@ -35,7 +35,6 @@ public class ShowXMasSeal implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_XMAS_SEAL.writeId(packet); - packet.writeD(_item); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java index 66eccc7fbf..1baa030c4d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java @@ -28,9 +28,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = ca
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Attackers Clans?
* d = Number of Attackers Clans
* { //repeats
@@ -58,11 +58,10 @@ public class SiegeAttackerList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _castle.getSiege().getAttackerClans().size(); if (size > 0) { @@ -76,12 +75,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -90,8 +88,8 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index 5d5c831f14..8afd1f38ce 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -29,9 +29,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = 0xcb
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Defending Clans?
* d = Number of Defending Clans
* { //repeats
@@ -60,16 +60,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // Unknown - packet.writeD(0x01); // Unknown - packet.writeD(0x00); // Unknown - + packet.writeD(0); // Unknown + packet.writeD(1); // Unknown + packet.writeD(0); // Unknown final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0); packet.writeD(size); packet.writeD(size); - // Add owners final Clan ownerClan = _castle.getOwner(); if (ownerClan != null) @@ -78,14 +75,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket packet.writeS(ownerClan.getName()); packet.writeS(ownerClan.getLeaderName()); packet.writeD(ownerClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.OWNER.ordinal()); packet.writeD(ownerClan.getAllyId()); packet.writeS(ownerClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(ownerClan.getAllyCrestId()); } - // List of confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans()) { @@ -94,19 +90,17 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(defendingClan.getAllyCrestId()); } - // List of not confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans()) { @@ -115,12 +109,11 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER_PENDING.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 0a3fe46cb7..dfeefdaecf 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -59,13 +59,11 @@ public class SiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_INFO.writeId(packet); - if (_castle != null) { packet.writeD(_castle.getResidenceId()); - final int ownerId = _castle.getOwnerId(); - packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 0x01 : 0x00); + packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0); packet.writeD(ownerId); if (ownerId > 0) { @@ -89,7 +87,6 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { @@ -97,7 +94,7 @@ public class SiegeInfo implements IClientOutgoingPacket cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis()); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(Config.SIEGE_HOUR_LIST.size()); for (int hour : Config.SIEGE_HOUR_LIST) { @@ -108,7 +105,7 @@ public class SiegeInfo implements IClientOutgoingPacket else { packet.writeD((int) (_castle.getSiegeDate().getTimeInMillis() / 1000)); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index d11b3817c0..3c4c475339 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -51,12 +51,11 @@ public class SkillCoolTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SKILL_COOL_TIME.writeId(packet); - packet.writeD(_skillReuseTimeStamps.size()); for (TimeStamp ts : _skillReuseTimeStamps) { packet.writeD(ts.getSkillId()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD((int) ts.getReuse() / 1000); packet.writeD((int) Math.max(ts.getStamp() - _currentTime, 0) / 1000); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index de54232b51..ed4615c403 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -41,10 +41,9 @@ public class Snoop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SNOOP.writeId(packet); - packet.writeD(_convoId); packet.writeS(_name); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_type.getClientId()); packet.writeS(_speaker); packet.writeS(_msg); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java index 37827bdf6c..52f15519a5 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java @@ -37,10 +37,9 @@ public class SocialAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SOCIAL_ACTION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_actionId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index fd7e43a153..19066f5f85 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -33,16 +33,15 @@ public class SpawnItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPAWN_ITEM.writeId(packet); - packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeD(_item.isStackable() ? 0x01 : 0x00); + packet.writeD(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java index ccae75b850..04f3ad716c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java @@ -110,7 +110,6 @@ public class SpecialCamera implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPECIAL_CAMERA.writeId(packet); - packet.writeD(_id); packet.writeD(_force); packet.writeD(_angle1); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java index cdd3821740..281756e793 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java @@ -34,7 +34,6 @@ public class StartPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_PLEDGE_WAR.writeId(packet); - packet.writeS(_playerName); packet.writeS(_pledgeName); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java index 48b4238eea..27fb4f606b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java @@ -38,7 +38,6 @@ public class StartRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_side); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java index b4f421df36..067bdeb082 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java @@ -72,7 +72,6 @@ public class StaticObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATIC_OBJECT.writeId(packet); - packet.writeD(_staticObjectId); packet.writeD(_objectId); packet.writeD(_type); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index 928b54aa48..40836e4af8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -46,7 +46,6 @@ public class StatusUpdate implements IClientOutgoingPacket public void addUpdate(StatusUpdateType type, int level) { _updates.put(type, level); - if (_isPlayable) { switch (type) @@ -75,10 +74,9 @@ public class StatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATUS_UPDATE.writeId(packet); - packet.writeD(_objectId); // casterId - packet.writeD(_isVisible ? _casterObjectId : 0x00); - packet.writeC(_isVisible ? 0x01 : 0x00); + packet.writeD(_isVisible ? _casterObjectId : 0); + packet.writeC(_isVisible ? 1 : 0); packet.writeC(_updates.size()); for (Entry entry : _updates.entrySet()) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java index 9919307366..cf2b71df5a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java @@ -53,7 +53,6 @@ public class StopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java index 50fdc3fe4c..78fdb5d70c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java @@ -43,7 +43,6 @@ public class StopMoveInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java index 9c828c3962..b254cad8b1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java @@ -34,7 +34,6 @@ public class StopPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java index b0392de226..ca69cd5346 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java @@ -36,7 +36,6 @@ public class StopRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FINISH_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_speed); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index c1feb37b2f..2d92796c75 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -43,10 +43,8 @@ public class SummonInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class SummonInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class SummonInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,11 +154,9 @@ public class SummonInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - // Show red aura? - // if (_statusMask != 0) + // if (_statusMask != 0x00) // { // addComponentType(NpcInfoType.VISUAL_STATE); // } @@ -229,28 +206,24 @@ public class SummonInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.SUMMON_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -269,7 +242,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -285,19 +258,19 @@ public class SummonInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -309,20 +282,20 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -346,12 +319,12 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -381,12 +354,10 @@ public class SummonInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java index 864462f76f..6f88551204 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java @@ -34,7 +34,6 @@ public class SurrenderPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SURRENDER_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 746b2da3f7..b509d599db 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -161,7 +161,6 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } - _params[_paramIndex++] = param; } @@ -267,7 +266,6 @@ public class SystemMessage implements IClientOutgoingPacket { return addString(item.getName()); } - append(new SMParam(TYPE_ITEM_NAME, id)); return this; } @@ -389,7 +387,6 @@ public class SystemMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SYSTEM_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -402,13 +399,12 @@ public class SystemMessage implements IClientOutgoingPacket params[i] = _params[i].getValue(); } packet.writeH(SystemMessageId.S1_2.getId()); - packet.writeC(0x01); + packet.writeC(1); packet.writeC(TYPE_TEXT); packet.writeS(sml.getLocalisation(params)); return true; } } - packet.writeH(getId()); packet.writeC(_params.length); for (SMParam param : _params) @@ -418,9 +414,7 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } - packet.writeC(param.getType()); - switch (param.getType()) { case TYPE_ELEMENT_NAME: diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java index a91da07e77..d357efbb0e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java @@ -47,13 +47,12 @@ public class TargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_SELECTED.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java index 3dadd249f6..3d7208c06f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java @@ -42,12 +42,11 @@ public class TargetUnselected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_UNSELECTED.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index 943b5078b6..13f9b9565a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -41,14 +41,13 @@ public class TeleportToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TELEPORT_TO_LOCATION.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // Fade 0, Instant 1. + packet.writeD(0); // Fade 0, Instant 1. packet.writeD(_heading); - packet.writeD(0x00); // Unknown. + packet.writeD(0); // Unknown. return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java index cb82f2da59..8d09576d9d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java @@ -32,7 +32,6 @@ public class TradeDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_DONE.writeId(packet); - packet.writeD(_num); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index 470ce757db..0635e50548 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -56,7 +56,6 @@ public class TradeStart extends AbstractItemPacket { _mask |= 0x08; } - // Does not shows level if (_partner.isGM()) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java index 0b92812a6f..aec0ace924 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java @@ -39,7 +39,6 @@ public class TradeUpdate extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_UPDATE.writeId(packet); - packet.writeH(1); packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2); writeItem(packet, _item); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java index c7102ca385..728020c0b1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java @@ -32,7 +32,6 @@ public class TutorialEnableClientEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_ENABLE_CLIENT_EVENT.writeId(packet); - packet.writeD(_eventId); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java index 92ac75afcf..7cc33a0f80 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java @@ -48,7 +48,6 @@ public class TutorialShowHtml extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_HTML.writeId(packet); - packet.writeD(_type); packet.writeS(getHtml()); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java index 75a57be38b..2ee62835db 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java @@ -37,7 +37,6 @@ public class TutorialShowQuestionMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_QUESTION_MARK.writeId(packet); - packet.writeC(_markType); packet.writeD(_markId); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 7c67dd651d..a17fa02134 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -35,7 +35,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class UserInfo extends AbstractMaskPacket { private Player _player; - private int _relation; private int _runSpd; private int _walkSpd; @@ -49,14 +48,12 @@ public class UserInfo extends AbstractMaskPacket private int _enchantLevel; private int _armorEnchant; private String _title; - private final byte[] _masks = new byte[] { (byte) 0x00, (byte) 0x00, (byte) 0x00 }; - private int _initSize = 5; public UserInfo(Player player) @@ -80,6 +77,7 @@ public class UserInfo extends AbstractMaskPacket _enchantLevel = player.getInventory().getWeaponEnchant(); _armorEnchant = player.getInventory().getArmorMinEnchant(); _title = player.getTitle(); + if (player.isGM() && player.isInvisible()) { _title = "[Invisible]"; @@ -135,29 +133,25 @@ public class UserInfo extends AbstractMaskPacket } OutgoingPackets.USER_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_initSize); packet.writeH(23); packet.writeB(_masks); - if (containsMask(UserInfoType.RELATION)) { packet.writeD(_relation); } - if (containsMask(UserInfoType.BASIC_INFO)) { packet.writeH(16 + (_player.getAppearance().getVisibleName().length() * 2)); packet.writeString(_player.getName()); - packet.writeC(_player.isGM() ? 0x01 : 0x00); + packet.writeC(_player.isGM() ? 1 : 0); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } - if (containsMask(UserInfoType.BASE_STATS)) { packet.writeH(18); @@ -170,7 +164,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getLUC()); packet.writeH(_player.getCHA()); } - if (containsMask(UserInfoType.MAX_HPCPMP)) { packet.writeH(14); @@ -178,7 +171,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMaxMp()); packet.writeD(_player.getMaxCp()); } - if (containsMask(UserInfoType.CURRENT_HPMPCP_EXP_SP)) { packet.writeH(38); @@ -189,23 +181,20 @@ public class UserInfo extends AbstractMaskPacket packet.writeQ(_player.getExp()); packet.writeF((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel()))); } - if (containsMask(UserInfoType.ENCHANTLEVEL)) { packet.writeH(4); packet.writeC(_enchantLevel); packet.writeC(_armorEnchant); } - if (containsMask(UserInfoType.APPAREANCE)) { packet.writeH(15); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); } - if (containsMask(UserInfoType.STATUS)) { packet.writeH(6); @@ -214,7 +203,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.getCrystallizeGrade() != ItemGrade.NONE ? 1 : 0); packet.writeC(_player.getAbilityPoints() - _player.getAbilityPointsUsed()); } - if (containsMask(UserInfoType.STATS)) { packet.writeH(56); @@ -233,7 +221,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); } - if (containsMask(UserInfoType.ELEMENTALS)) { packet.writeH(14); @@ -244,7 +231,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getDefenseElementValue(AttributeType.HOLY)); packet.writeH(_player.getDefenseElementValue(AttributeType.DARK)); } - if (containsMask(UserInfoType.POSITION)) { packet.writeH(18); @@ -253,7 +239,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getZ()); packet.writeD(_player.isInVehicle() ? _player.getVehicle().getObjectId() : 0); } - if (containsMask(UserInfoType.SPEED)) { packet.writeH(18); @@ -266,21 +251,18 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_flyRunSpd); packet.writeH(_flyWalkSpd); } - if (containsMask(UserInfoType.MULTIPLIER)) { packet.writeH(18); packet.writeF(_moveMultiplier); packet.writeF(_player.getAttackSpeedMultiplier()); } - if (containsMask(UserInfoType.COL_RADIUS_HEIGHT)) { packet.writeH(18); packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); } - if (containsMask(UserInfoType.ATK_ELEMENTAL)) { packet.writeH(5); @@ -288,7 +270,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); } - if (containsMask(UserInfoType.CLAN)) { packet.writeH(32 + (_title.length() * 2)); @@ -298,12 +279,11 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getClanCrestLargeId()); packet.writeD(_player.getClanCrestId()); packet.writeD(_player.getClanPrivileges().getBitmask()); - packet.writeC(_player.isClanLeader() ? 0x01 : 0x00); + packet.writeC(_player.isClanLeader() ? 1 : 0); packet.writeD(_player.getAllyId()); packet.writeD(_player.getAllyCrestId()); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); } - if (containsMask(UserInfoType.SOCIAL)) { packet.writeH(22); @@ -317,59 +297,52 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); } - if (containsMask(UserInfoType.VITA_FAME)) { packet.writeH(15); packet.writeD(_player.getVitalityPoints()); - packet.writeC(0x00); // Vita Bonus + packet.writeC(0); // Vita Bonus packet.writeD(_player.getFame()); packet.writeD(_player.getRaidbossPoints()); } - if (containsMask(UserInfoType.SLOTS)) { packet.writeH(9); packet.writeC(_player.getInventory().getTalismanSlots()); // Confirmed packet.writeC(_player.getInventory().getBroochJewelSlots()); // Confirmed packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeC(0x00); // (1 = Red, 2 = White, 3 = White Pink) dotted ring on the floor - packet.writeC(0x00); - packet.writeC(0x00); - packet.writeC(0x00); + packet.writeC(0); // (1 = Red, 2 = White, 3 = White Pink) dotted ring on the floor + packet.writeC(0); + packet.writeC(0); + packet.writeC(0); } - if (containsMask(UserInfoType.MOVEMENTS)) { packet.writeH(4); packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); - packet.writeC(_player.isRunning() ? 0x01 : 0x00); + packet.writeC(_player.isRunning() ? 1 : 0); } - if (containsMask(UserInfoType.COLOR)) { packet.writeH(10); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); } - if (containsMask(UserInfoType.INVENTORY_LIMIT)) { packet.writeH(9); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); packet.writeH(_player.getInventoryLimit()); packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); } - if (containsMask(UserInfoType.TRUE_HERO)) { packet.writeH(9); - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeC(_player.isTrueHero() ? 100 : 0x00); + packet.writeD(0); + packet.writeH(0); + packet.writeC(_player.isTrueHero() ? 100 : 0); } - return true; } @@ -386,7 +359,6 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x10; // Party leader } } - if (clan != null) { relation |= 0x20; // Clan member @@ -395,12 +367,10 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x40; // Clan leader } } - if (player.isInSiege()) { relation |= 0x80; // In siege } - return relation; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java index 283bcf1614..90c416726a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java @@ -36,7 +36,6 @@ public class ValidateLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java index 4d8f9683d0..83f72bf981 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java @@ -40,7 +40,6 @@ public class ValidateLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java index b684e70bdc..71367cd26d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java @@ -36,7 +36,6 @@ public class VehicleCheckLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_CHECK_LOCATION.writeId(packet); - packet.writeD(_boat.getObjectId()); packet.writeD(_boat.getX()); packet.writeD(_boat.getY()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java index a4a5780f30..5b565c08b7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java @@ -46,7 +46,6 @@ public class VehicleDeparture implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_DEPARTURE.writeId(packet); - packet.writeD(_objId); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java index ec611028bf..4a995a6352 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java @@ -44,7 +44,6 @@ public class VehicleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java index 207a6fd899..bf629dcbbc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java @@ -42,7 +42,6 @@ public class VehicleStarted implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_START.writeId(packet); - packet.writeD(_objectId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 455305ce79..76b391afc6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -30,6 +30,7 @@ public class WareHouseDepositList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; public static final int FREIGHT = 1; + private final long _playerAdena; private final int _warehouseSize; private final List _items = new ArrayList<>(); @@ -49,7 +50,6 @@ public class WareHouseDepositList extends AbstractItemPacket _whType = type; _playerAdena = player.getAdena(); _warehouseSize = player.getActiveWarehouse() != null ? player.getActiveWarehouse().getSize() : 0; - final boolean isPrivate = _whType == PRIVATE; for (Item temp : player.getInventory().getAvailableItems(true, isPrivate, false)) { @@ -68,19 +68,15 @@ public class WareHouseDepositList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.WAREHOUSE_DEPOSIT_LIST.writeId(packet); - packet.writeH(_whType); packet.writeQ(_playerAdena); packet.writeD(_warehouseSize); packet.writeH(_itemsStackable.size()); - for (int itemId : _itemsStackable) { packet.writeD(itemId); } - packet.writeH(_items.size()); - for (Item item : _items) { writeItem(packet, item); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 6f57005e47..785f0a0849 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -32,6 +32,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private Player _player; private long _playerAdena; private final int _invSize; @@ -58,7 +59,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } - _items = _player.getActiveWarehouse().getItems(); for (Item item : _items) { @@ -73,7 +73,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.WAREHOUSE_WITHDRAW_LIST.writeId(packet); - packet.writeH(_whType); packet.writeQ(_playerAdena); packet.writeH(_items.size()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java index 7442882a70..bd10e174c6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java @@ -59,7 +59,6 @@ public class ExAcquireAPSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_AP_SKILL_LIST.writeId(packet); - packet.writeD(_enable ? 1 : 0); packet.writeQ(Config.ABILITY_POINTS_RESET_SP); // Changed to from Adena to SP on Grand Crusade // packet.writeQ(_price); Removed on Grand Crusade diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java index f9af89e4db..ff296bf632 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java @@ -35,7 +35,6 @@ public class ExCloseAPListWnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_AP_LIST_WND.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java index d72baf2a44..69c47ce99f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java @@ -35,7 +35,6 @@ public class ExShowAPListWnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AP_LIST_WND.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java index 5f2dd05f3b..aea1476fb2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java @@ -35,8 +35,7 @@ public class ExDivideAdenaCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_CANCEL.writeId(packet); - - packet.writeC(0x00); // TODO: Find me + packet.writeC(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java index 6af912cebf..de4e955aba 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java @@ -46,9 +46,8 @@ public class ExDivideAdenaDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_DONE.writeId(packet); - - packet.writeC(_isPartyLeader ? 0x01 : 0x00); - packet.writeC(_isCCLeader ? 0x01 : 0x00); + packet.writeC(_isPartyLeader ? 1 : 0); + packet.writeC(_isCCLeader ? 1 : 0); packet.writeD(_memberCount); packet.writeQ(_distributedAdenaCount); packet.writeQ(_adenaCount); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java index ab8a7471d6..32f99abfdc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java @@ -38,8 +38,7 @@ public class ExAlchemyConversion implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_CONVERSION.writeId(packet); - - packet.writeC((_successCount == 0) && (_failureCount == 0) ? 0x01 : 0x00); + packet.writeC((_successCount == 0) && (_failureCount == 0) ? 1 : 0); packet.writeD(_successCount); packet.writeD(_failureCount); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java index be4a2a57e6..cb3cf4b3e0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java @@ -47,7 +47,6 @@ public class ExTryMixCube implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TRY_MIX_CUBE.writeId(packet); - packet.writeC(_type.ordinal()); packet.writeD(_items.size()); for (AlchemyResult holder : _items) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index 549def456e..84b5fead76 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -43,7 +43,6 @@ public class ExChooseShapeShiftingItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_SHAPE_SHIFTING_ITEM.writeId(packet); - packet.writeD(_targetType != null ? _targetType.ordinal() : 0); packet.writeD(_type != null ? _type.ordinal() : 0); packet.writeD(_itemId); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java index 33fb439aa5..ba55887a1a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java @@ -45,7 +45,6 @@ public class ExCuriousHouseMemberUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_UPDATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_maxHp); packet.writeD(_maxCp); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java index 8ad3659725..be2d29d864 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPacket { - public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0x00); - public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(0x01); + public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0); + public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(1); private final int _result; @@ -39,7 +39,6 @@ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPa public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_EXTRACTION_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java index ec82cc14f3..e84d7a7255 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; public static final ExPutShapeShiftingTargetItemResult FAILED = new ExPutShapeShiftingTargetItemResult(RESULT_FAILED, 0); @@ -43,7 +43,6 @@ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_resultId); packet.writeQ(_price); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java index f4d3118cc4..038eae0042 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExShapeShiftingResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; - public static final int RESULT_CLOSE = 0x02; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; + public static final int RESULT_CLOSE = 2; public static final ExShapeShiftingResult FAILED = new ExShapeShiftingResult(RESULT_FAILED, 0, 0); public static final ExShapeShiftingResult CLOSE = new ExShapeShiftingResult(RESULT_CLOSE, 0, 0); @@ -47,7 +47,6 @@ public class ExShapeShiftingResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHAPE_SHIFTING_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_targetItemId); packet.writeD(_extractItemId); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java index eaf0d209fd..4b48b09002 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java @@ -38,7 +38,7 @@ public class ExConfirmVipAttendanceCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CONFIRM_VIP_ATTENDANCE_CHECK.writeId(packet); - packet.writeC(_available ? 0x01 : 0x00); // can receive reward today? 1 else 0 + packet.writeC(_available ? 1 : 0); // can receive reward today? 1 else 0 packet.writeC(_index); // active reward index packet.writeD(0); packet.writeD(0); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java index 9d61fe68d6..dd94df023f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java @@ -45,10 +45,10 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket OutgoingPackets.EX_VIP_ATTENDANCE_ITEM_LIST.writeId(packet); packet.writeC(_available ? _index + 1 : _index); // index to receive? packet.writeC(_index); // last received index? - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeC(0x01); - packet.writeC(_available ? 0x01 : 0x00); // player can receive reward today? + packet.writeD(0); + packet.writeD(0); + packet.writeC(1); + packet.writeC(_available ? 1 : 0); // player can receive reward today? packet.writeC(250); packet.writeC(AttendanceRewardData.getInstance().getRewardsCount()); // reward size int rewardCounter = 0; @@ -57,11 +57,11 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket rewardCounter++; packet.writeD(reward.getId()); packet.writeQ(reward.getCount()); - packet.writeC(0x01); // is unknown? - packet.writeC((rewardCounter % 7) == 0 ? 0x01 : 0x00); // is last in row? + packet.writeC(1); // is unknown? + packet.writeC((rewardCounter % 7) == 0 ? 1 : 0); // is last in row? } - packet.writeC(0x00); - packet.writeD(0x00); + packet.writeC(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java index 7f1d6d60d1..73f93335ef 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java @@ -43,7 +43,6 @@ public class ExCuriousHouseMemberList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_LIST.writeId(packet); - packet.writeD(_id); packet.writeD(_maxPlayers); packet.writeD(_players.size()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java index b71caa5f14..5d9b34db61 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java @@ -37,7 +37,6 @@ public class ExCuriousHouseRemainTime implements IClientOutgoingPacket { OutgoingPackets.EX_CURIOUS_HOUSE_REMAIN_TIME.writeId(packet); packet.writeD(_time); - return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java index 4c3ae253ea..c79b68becc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java @@ -39,7 +39,6 @@ public class ExResponseCommissionBuyInfo extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_INFO.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java index ddfa8b6db1..c1d29735b8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java @@ -40,7 +40,6 @@ public class ExResponseCommissionBuyItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_ITEM.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java index aa4bbbde24..01e4782408 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java @@ -39,7 +39,6 @@ public class ExResponseCommissionDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_DELETE.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java index e7e3c39816..b915574175 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java @@ -55,7 +55,6 @@ public class ExResponseCommissionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_INFO.writeId(packet); - packet.writeD(_result); packet.writeD(_itemId); packet.writeQ(_presetPricePerUnit); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 876a24c7ad..89000dd57f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -39,7 +39,6 @@ public class ExResponseCommissionItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_ITEM_LIST.writeId(packet); - packet.writeD(_items.size()); for (Item itemInstance : _items) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java index 4963393b42..a012b3ab30 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java @@ -64,7 +64,6 @@ public class ExResponseCommissionList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_LIST.writeId(packet); - packet.writeD(_replyType.getClientId()); switch (_replyType) { @@ -73,13 +72,11 @@ public class ExResponseCommissionList extends AbstractItemPacket { packet.writeD((int) Instant.now().getEpochSecond()); packet.writeD(_chunkId); - int chunkSize = _items.size() - _listIndexStart; if (chunkSize > MAX_CHUNK_SIZE) { chunkSize = MAX_CHUNK_SIZE; } - packet.writeD(chunkSize); for (int i = _listIndexStart; i < (_listIndexStart + chunkSize); i++) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java index b1b0a97d7a..183547af06 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java @@ -39,7 +39,6 @@ public class ExResponseCommissionRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_REGISTER.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java index 74d8a95587..b68386e4ed 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java @@ -35,8 +35,7 @@ public class ExShowCommission implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_COMMISSION.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java index 0c267ecf34..11b1ff1e0a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExEnchantFail implements IClientOutgoingPacket { public static final ExEnchantFail STATIC_PACKET = new ExEnchantFail(0, 0); + private final int _itemOne; private final int _itemTwo; @@ -39,7 +40,6 @@ public class ExEnchantFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_FAIL.writeId(packet); - packet.writeD(_itemOne); packet.writeD(_itemTwo); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java index 71ba811ed5..87d29a8e7c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java @@ -36,7 +36,6 @@ public class ExEnchantSucess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SUCESS.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java index eb4eb8b26c..ec67d50fb6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java @@ -39,7 +39,6 @@ public class ExGetCrystalizingEstimation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - packet.writeD(_items.size()); for (ItemChanceHolder holder : _items) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java index ac16c14f5b..ebf5b64751 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java @@ -43,18 +43,18 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket } OutgoingPackets.EX_CONNECTED_TIME_AND_GETTABLE_REWARD.writeId(packet); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_oneDayRewardAvailableCount); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index a8f3304739..f11ae5f478 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -62,7 +62,6 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket } OutgoingPackets.EX_ONE_DAY_RECEIVE_REWARD_LIST.writeId(packet); - packet.writeD(_dayRemainTime); packet.writeD(_weekRemainTime); packet.writeD(_monthRemainTime); @@ -74,7 +73,7 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket { packet.writeH(reward.getId()); packet.writeC(reward.getStatus(_player)); - packet.writeC(reward.getRequiredCompletions() > 1 ? 0x01 : 0x00); + packet.writeC(reward.getRequiredCompletions() > 1 ? 1 : 0); packet.writeD(Math.min(reward.getProgress(_player), _player.getLevel())); packet.writeD(reward.getRequiredCompletions()); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java index 586d77c13f..2fb9bb65a1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java @@ -40,11 +40,9 @@ public class ExFactionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FACTION_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_openDialog ? 1 : 0); packet.writeD(Faction.values().length); - for (Faction faction : Faction.values()) { packet.writeC(faction.getId()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java index fa605b548a..a99ad7f4e3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java @@ -52,7 +52,7 @@ public class ExFishingStart implements IClientOutgoingPacket packet.writeD(_baitLocation.getX()); packet.writeD(_baitLocation.getY()); packet.writeD(_baitLocation.getZ()); - packet.writeC(0x01); // 0 = newbie, 1 = normal, 2 = night + packet.writeC(1); // 0 = newbie, 1 = normal, 2 = night return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java index 046ad04cb6..74501fe7ff 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java @@ -49,7 +49,6 @@ public class ExUserInfoFishing implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_FISHING.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_isFishing ? 1 : 0); if (_baitLocation == null) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index dc0e3e05bc..336a384bcc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -47,9 +47,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FRIEND_DETAIL_INFO.writeId(packet); - packet.writeD(_objectId); - if (_friend == null) { packet.writeS(_name); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java index 0d4bb47ff0..a90b7b6083 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java @@ -33,8 +33,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x00); + packet.writeC(0); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java index 9add9c9caa..d24139644c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java @@ -49,7 +49,6 @@ public class FriendAddRequestResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_charId); packet.writeS(_charName); @@ -57,7 +56,7 @@ public class FriendAddRequestResult implements IClientOutgoingPacket packet.writeD(_charObjectId); packet.writeD(_charLevel); packet.writeD(_charClassId); - packet.writeH(0x00); // Always 0 on retail + packet.writeH(0); // Always 0 on retail return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java index a135944662..13a7d01967 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java @@ -86,12 +86,10 @@ public class FriendList implements IClientOutgoingPacket } continue; } - if (player1.isOnline()) { online = true; } - classid = player1.getClassId().getId(); level = player1.getLevel(); _info.add(new FriendInfo(objId, name, online, classid, level)); @@ -102,14 +100,13 @@ public class FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._classid); packet.writeD(info._level); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java index 07c23f9fd2..1bb4142e34 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java @@ -38,7 +38,6 @@ public class FriendRemove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_REMOVE.writeId(packet); - packet.writeD(_responce); packet.writeS(_charName); return true; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java index e8dbddcd63..a3990c0879 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java @@ -52,7 +52,6 @@ public class FriendStatus implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_STATUS.writeId(packet); - packet.writeD(_type); packet.writeS(_name); switch (_type) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java index 8752104e06..78da5850b8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java @@ -50,7 +50,6 @@ public class L2Friend implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND.writeId(packet); - packet.writeD(_action ? 1 : 3); // 1-add 3-remove packet.writeD(_objid); packet.writeS(_name); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java index b69a253635..e50693cb11 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java @@ -81,17 +81,16 @@ public class L2FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._level); packet.writeD(info._classId); - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java index 677c09091f..706c179a9c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java @@ -37,7 +37,6 @@ public class ExMentorAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_ADD.writeId(packet); - packet.writeS(_mentor.getName()); packet.writeD(_mentor.getActiveClass()); packet.writeD(_mentor.getLevel()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java index 4722a9cab3..18c1cdeedf 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java @@ -64,9 +64,8 @@ public class ExMentorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_LIST.writeId(packet); - packet.writeD(_type); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mentees.size()); for (Mentee mentee : _mentees) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java index d739dd94b7..2283920b98 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ListMenteeWaiting implements IClientOutgoingPacket { private static final int PLAYERS_PER_PAGE = 64; + private final List _possibleCandiates = new ArrayList<>(); private final int _page; @@ -51,18 +52,15 @@ public class ListMenteeWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_MENTEE_WAITING.writeId(packet); - - packet.writeD(0x01); // always 1 in retail + packet.writeD(1); // always 1 in retail if (_possibleCandiates.isEmpty()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } - packet.writeD(_possibleCandiates.size()); packet.writeD(_possibleCandiates.size() % PLAYERS_PER_PAGE); - for (Player player : _possibleCandiates) { if ((1 <= (PLAYERS_PER_PAGE * _page)) && (1 > (PLAYERS_PER_PAGE * (_page - 1)))) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java index ead46c2174..eaf44d3181 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java @@ -51,7 +51,6 @@ public class ExPledgeBonusList implements IClientOutgoingPacket packet.writeD(0); return; } - packet.writeD(bonus.getSkillReward().getSkillId()); break; } @@ -63,7 +62,6 @@ public class ExPledgeBonusList implements IClientOutgoingPacket packet.writeD(0); return; } - packet.writeD(bonus.getItemReward().getId()); break; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java index af3c790bc6..cfedfaa438 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java @@ -50,7 +50,6 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Player: " + _player + " attempting to write to a null clan!"); return false; } - final ClanRewardBonus highestMembersOnlineBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.MEMBERS_ONLINE); final ClanRewardBonus highestHuntingBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.HUNTING_MONSTERS); final ClanRewardBonus membersOnlineBonus = ClanRewardType.MEMBERS_ONLINE.getAvailableBonus(clan); @@ -75,23 +74,20 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Couldn't find item reward for highest available hunting bonus!!"); return false; } - // General OP Code OutgoingPackets.EX_PLEDGE_BONUS_OPEN.writeId(packet); - // Members online bonus packet.writeD(highestMembersOnlineBonus.getRequiredAmount()); packet.writeD(clan.getMaxOnlineMembers()); - packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0x00); - packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 0x01 : 0x00); - + packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0); + packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 1 : 0); // Hunting bonus packet.writeD(highestHuntingBonus.getRequiredAmount()); packet.writeD(clan.getHuntingPoints()); - packet.writeD(huntingBonus != null ? highestHuntingBonus.getItemReward().getId() : 0x00); - packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 0x01 : 0x00); + packet.writeD(huntingBonus != null ? highestHuntingBonus.getItemReward().getId() : 0); + packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 1 : 0); return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index fb735b8925..e75426e598 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -69,7 +69,6 @@ public class ExBRBuyProduct implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUY_PRODUCT.writeId(packet); - packet.writeD(_reply); return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java index 742b3eba9d..91a186b81d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java @@ -39,10 +39,9 @@ public class ExBRGamePoint implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_GAME_POINT.writeId(packet); - packet.writeD(_charId); packet.writeQ(_charPoints); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java index 50f21df46a..e36f2ff502 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java @@ -45,7 +45,6 @@ public class ExBRProductInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_INFO.writeId(packet); - packet.writeD(_item.getBrId()); packet.writeD(_item.getPrice()); packet.writeD(_item.getItems().size()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java index dc851ffd43..0f042ba043 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java @@ -45,9 +45,8 @@ public class ExBRProductList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); // Adena - packet.writeQ(0x00); // Hero coins + packet.writeQ(0); // Hero coins packet.writeC(_type); // Type 0 - Home, 1 - History, 2 - Favorites packet.writeD(_primeList.size()); for (PrimeShopGroup brItem : _primeList) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java index b23e9fa8a9..f4406c1407 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java @@ -38,7 +38,6 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RAID_BOSS_SPAWN_INFO.writeId(packet); - packet.writeD(_bossIds.size()); // alive count for (int id : _bossIds) // alive ids { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java index 2463589c81..c09b3e899d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java @@ -47,18 +47,15 @@ public class ExFlyMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_mapId); - packet.writeD(_locations.size()); for (SayuneEntry loc : _locations) { packet.writeD(loc.getId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(loc.getX()); packet.writeD(loc.getY()); packet.writeD(loc.getZ()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java index 03fc6b580d..70b3fb25d2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java @@ -47,16 +47,13 @@ public class ExFlyMoveBroadcast implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE_BROADCAST.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); packet.writeD(_mapId); - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD(_currentLoc.getX()); packet.writeD(_currentLoc.getY()); packet.writeD(_currentLoc.getZ()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java index cfe11a27e0..49e5d86910 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java @@ -35,7 +35,6 @@ public class ExNotifyFlyMoveStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_FLY_MOVE_START.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java index d5640a47ef..0efa37ae8c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java @@ -51,7 +51,6 @@ public class ExMoveToLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_SUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_targetX); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java index 0cbe2c3e02..a0314c39aa 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java @@ -46,7 +46,6 @@ public class ExShuttleGetOff implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_OFF.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_x); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java index 5211bef5ba..061bcafed9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java @@ -43,7 +43,6 @@ public class ExShuttleGetOn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_ON.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java index 97d54a9019..c8aee1fde7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java @@ -43,7 +43,6 @@ public class ExShuttleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHUTTLE_INFO.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD(_shuttle.getX()); packet.writeD(_shuttle.getY()); @@ -60,8 +59,8 @@ public class ExShuttleInfo implements IClientOutgoingPacket packet.writeD(loc.getY()); packet.writeD(loc.getZ()); } - packet.writeD(stop.isDoorOpen() ? 0x01 : 0x00); - packet.writeD(stop.hasDoorChanged() ? 0x01 : 0x00); + packet.writeD(stop.isDoorOpen() ? 1 : 0); + packet.writeD(stop.hasDoorChanged() ? 1 : 0); } return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java index 6ba38f29a1..28b33b998e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java @@ -43,7 +43,6 @@ public class ExShuttleMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_MOVE.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD((int) _shuttle.getStat().getMoveSpeed()); packet.writeD((int) _shuttle.getStat().getRotationSpeed()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java index bf2b6ea6eb..6c31189d6a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java @@ -44,7 +44,6 @@ public class ExStopMoveInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_SHUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java index f7f6849732..8492f42a6e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java @@ -44,7 +44,6 @@ public class ExValidateLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_SHUTTLE.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java index 1d59c6d002..e7654ed911 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java @@ -60,7 +60,7 @@ public class AccountKicked implements IOutgoingPacket { OutgoingPackets.ACCOUNT_KICKED.writeId(packet); packet.writeD(_reason.getCode()); - return true; } } + diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 2e3a1f6163..1fe813e393 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: response + * Format: d d: response */ public class GGAuth implements IOutgoingPacket { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/network/serverpackets/Init.java index 4b3f71f30e..d725f45ca2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/network/serverpackets/Init.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/network/serverpackets/Init.java @@ -52,7 +52,6 @@ public class Init implements IOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.INIT.writeId(packet); - packet.writeD(_sessionId); // session id packet.writeD(0x0000c621); // protocol revision diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index 8c534554a8..f4dcd22b00 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: the failure reason + * Format: d d: the failure reason */ public class LoginFail implements IOutgoingPacket { diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index c700328f3d..f8b05abb47 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -529,7 +529,7 @@ public class Lindvior extends AbstractNpcAI for (Location loc : CONTROL_GENERATOR_SPAWNS) { guard = (FriendlyNpc) addSpawn(NPC_GENERATOR, loc, true); - guard.setDisplayEffect(0x01); + guard.setDisplayEffect(1); guard.setScriptValue(i++); _generatorSpawn.add(guard); } @@ -685,7 +685,7 @@ public class Lindvior extends AbstractNpcAI if (!hasFlag(_activeMask, 1 << index)) { _activeMask |= 1 << index; - npc.setDisplayEffect(0x02); + npc.setDisplayEffect(2); sendEventTrigger(true, GENERATOR_TRIGERS[index]); _zoneLair.getPlayersInside().stream().forEach(p -> p.broadcastPacket(new Earthquake(p.getX(), p.getY(), p.getZ(), 20, 10))); if (hasFlag(_activeMask, 0xf)) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/BaseRecievePacket.java index c682cb741d..a6ed15ce32 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/BaseRecievePacket.java @@ -73,7 +73,7 @@ public abstract class BaseRecievePacket try { result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE); - result = result.substring(0, result.indexOf(0x00)); + result = result.substring(0, result.indexOf(0)); _off += (result.length() * 2) + 2; } catch (Exception e) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/BaseSendablePacket.java index a9d918de4c..8fa8491cbf 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/commons/network/BaseSendablePacket.java @@ -117,16 +117,16 @@ public abstract class BaseSendablePacket public byte[] getBytes() { // if (this instanceof Init) - // writeD(0x00); // reserve for XOR initial key + // writeD(0); // reserve for XOR initial key - writeD(0x00); // reserve for checksum + writeD(0); // reserve for checksum final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++) { - writeC(0x00); + writeC(0); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/AttackType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/AttackType.java index 6064b10ed7..e9983f15e3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/AttackType.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/AttackType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum AttackType { - MISSED(0x01), - BLOCKED(0x02), - CRITICAL(0x04), - SHOT_USED(0x08); + MISSED(1), + BLOCKED(2), + CRITICAL(4), + SHOT_USED(8); private final int _mask; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/GroupType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/GroupType.java index 954aaace8b..916a14fd05 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/GroupType.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/GroupType.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum GroupType implements IUpdateTypeComponent { - NONE(0x01), - PARTY(0x02), - COMMAND_CHANNEL(0x04); + NONE(1), + PARTY(2), + COMMAND_CHANNEL(4); private int _mask; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/ItemListType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/ItemListType.java index 2d38c8f5b1..c80234439f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/ItemListType.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/ItemListType.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum ItemListType implements IUpdateTypeComponent { - AUGMENT_BONUS(0x01), - ELEMENTAL_ATTRIBUTE(0x02), - ENCHANT_EFFECT(0x04), - VISUAL_ID(0x08), - SOUL_CRYSTAL(0x10); + AUGMENT_BONUS(1), + ELEMENTAL_ATTRIBUTE(2), + ENCHANT_EFFECT(4), + VISUAL_ID(8), + SOUL_CRYSTAL(16); private final int _mask; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java index b3d08596c6..29403b783d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum MacroUpdateType { - ADD(0x01), - LIST(0x01), - MODIFY(0x02), - DELETE(0x00); + ADD(1), + LIST(1), + MODIFY(2), + DELETE(0); private final int _id; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java index 86c6159869..7776721c0f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java @@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum PartySmallWindowUpdateType implements IUpdateTypeComponent { - CURRENT_CP(0x01), - MAX_CP(0x02), - CURRENT_HP(0x04), - MAX_HP(0x08), - CURRENT_MP(0x10), - MAX_MP(0x20), - LEVEL(0x40), - CLASS_ID(0x80), - PARTY_SUBSTITUTE(0x100), - VITALITY_POINTS(0x200); + CURRENT_CP(1), + MAX_CP(2), + CURRENT_HP(4), + MAX_HP(8), + CURRENT_MP(16), + MAX_MP(32), + LEVEL(64), + CLASS_ID(128), + PARTY_SUBSTITUTE(256), + VITALITY_POINTS(512); private final int _mask; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 00bb331778..667ce7f17c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.Broadcast; import org.l2jmobius.gameserver.util.Util; /** - * Fromat:(ch) dddddc + * Format:(ch) dddddc * @author -Wooden- */ public class RequestExMagicSkillUseGround implements IClientIncomingPacket diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java index ec60042793..6054868de7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java @@ -39,7 +39,6 @@ public class AbnormalStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ABNORMAL_STATUS_UPDATE.writeId(packet); - packet.writeH(_effects.size()); for (BuffInfo info : _effects) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 1b8ddb2042..bec794bef3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -44,7 +44,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; } @@ -60,7 +59,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; setHtml(html); } @@ -77,13 +75,11 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } - if (!html.contains(""; return; } - _html = html; } @@ -96,7 +92,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } - setHtml(content); return true; } @@ -138,12 +133,10 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { player.clearHtmlActions(getScope()); } - if (_disabledValidation) { return; } - if (player != null) { Util.buildHtmlActionCache(player, getScope(), _npcObjId, _html); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index e9cd6a88b8..b99d4d3348 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -86,8 +86,8 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket= 0) || (item.getAttributeDefence(AttributeType.FIRE) > 0) || (item.getAttributeDefence(AttributeType.WATER) > 0) || (item.getAttributeDefence(AttributeType.WIND) > 0) || (item.getAttributeDefence(AttributeType.EARTH) > 0) || (item.getAttributeDefence(AttributeType.HOLY) > 0) || (item.getAttributeDefence(AttributeType.DARK) > 0)) { mask |= ItemListType.ELEMENTAL_ATTRIBUTE.getMask(); } - if (item.getEnchantOptions() != null) { for (int id : item.getEnchantOptions()) @@ -184,17 +182,14 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket 0) { mask |= ItemListType.VISUAL_ID.getMask(); } - if (((item.getSoulCrystalOptions() != null) && !item.getSoulCrystalOptions().isEmpty()) || ((item.getSoulCrystalSpecialOptions() != null) && !item.getSoulCrystalSpecialOptions().isEmpty())) { mask |= ItemListType.SOUL_CRYSTAL.getMask(); } - return mask; } @@ -262,7 +257,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); packet.writeC(removeSkills.size()); for (Skill removed : removeSkills) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java index 8fa6259f64..6451dffd02 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ActionFailed implements IClientOutgoingPacket { public static final ActionFailed STATIC_PACKET = new ActionFailed(); - private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); + private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); static { for (SkillCastingType castingType : SkillCastingType.values()) @@ -57,7 +57,6 @@ public class ActionFailed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ACTION_FAIL.writeId(packet); - packet.writeD(_castingType); // MagicSkillUse castingType return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java index 6e868368c9..30ce58da60 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java @@ -44,9 +44,8 @@ public class AgitDecoInfo implements IClientOutgoingPacket { continue; } - packet.writeC(_residense.hasFunction(type) ? 0x01 : 0x00); + packet.writeC(_residense.hasFunction(type) ? 1 : 0); } - // Unknown packet.writeD(0); // TODO: Find me! packet.writeD(0); // TODO: Find me! diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java index 6cb71fc985..4683fb30f0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java @@ -44,7 +44,6 @@ public class AllianceInfo implements IClientOutgoingPacket _name = leader.getAllyName(); _leaderC = leader.getName(); _leaderP = leader.getLeaderName(); - final Collection allies = ClanTable.getInstance().getClanAllies(allianceId); _allies = new ClanInfo[allies.size()]; int idx = 0; @@ -57,7 +56,6 @@ public class AllianceInfo implements IClientOutgoingPacket total += ci.getTotal(); online += ci.getOnline(); } - _total = total; _online = online; } @@ -66,18 +64,16 @@ public class AllianceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_INFO.writeId(packet); - packet.writeS(_name); packet.writeD(_total); packet.writeD(_online); packet.writeS(_leaderC); packet.writeS(_leaderP); - packet.writeD(_allies.length); for (ClanInfo aci : _allies) { packet.writeS(aci.getClan().getName()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(aci.getClan().getLevel()); packet.writeS(aci.getClan().getLeaderName()); packet.writeD(aci.getTotal()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java index f9d08f6600..186fd12e81 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java @@ -44,7 +44,6 @@ public class AllyCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java index 6218f1717f..1ae4653f91 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java @@ -38,7 +38,6 @@ public class AskJoinAlly implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_ALLIANCE.writeId(packet); - packet.writeD(_requestorObjId); packet.writeS(null); // Ally Name ? packet.writeS(null); // TODO: Find me! diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java index a66bb3cd33..b9cfbe81b9 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java @@ -39,7 +39,6 @@ public class AskJoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_PARTY.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 05c420ff59..227ab571be 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -45,7 +45,6 @@ public class Attack implements IClientOutgoingPacket _attackerObjId = attacker.getObjectId(); _attackerLoc = new Location(attacker); _targetLoc = new Location(target); - final Player player = attacker.getActingPlayer(); if (player == null) { @@ -111,7 +110,6 @@ public class Attack implements IClientOutgoingPacket final Iterator it = _hits.iterator(); final Hit firstHit = it.next(); OutgoingPackets.ATTACK.writeId(packet); - packet.writeD(_attackerObjId); packet.writeD(firstHit.getTargetId()); packet.writeD(_soulshotVisualSubstitute); // Ertheia @@ -121,13 +119,11 @@ public class Attack implements IClientOutgoingPacket packet.writeD(_attackerLoc.getX()); packet.writeD(_attackerLoc.getY()); packet.writeD(_attackerLoc.getZ()); - packet.writeH(_hits.size() - 1); while (it.hasNext()) { writeHit(packet, it.next()); } - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java index bd6878eb42..8b85fe85e3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java @@ -35,7 +35,6 @@ public class AutoAttackStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_START.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java index e767d1877a..a294b1e212 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java @@ -35,7 +35,6 @@ public class AutoAttackStop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_STOP.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java index 3f329415df..0c79677eae 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java @@ -38,7 +38,6 @@ public class BlockListPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BLOCK_LIST.writeId(packet); - packet.writeD(_playersId.size()); for (int playerId : _playersId) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index f610cdc6aa..d95f0543b9 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -45,8 +45,7 @@ public class BuyList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x00); // Type BUY + packet.writeD(0); // Type BUY packet.writeQ(_money); // current money packet.writeD(_listId); packet.writeD(_inventorySlots); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index cd25af908d..7cb2bf4425 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -50,36 +50,34 @@ public class BuyListSeed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BUY_LIST_SEED.writeId(packet); - packet.writeQ(_money); // current money - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeD(_manorId); // manor id - if (!_list.isEmpty()) { packet.writeH(_list.size()); // list length for (SeedProduction s : _list) { - packet.writeC(0x00); // mask item 0 to print minimal item information + packet.writeC(0); // mask item 0 to print minimal item information packet.writeD(s.getId()); // ObjectId packet.writeD(s.getId()); // ItemId packet.writeC(0xFF); // T1 packet.writeQ(s.getAmount()); // Quantity - packet.writeC(0x05); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item - packet.writeC(0x00); // Filler (always 0) - packet.writeH(0x00); // Equipped : 00-No, 01-yes - packet.writeQ(0x00); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand - packet.writeH(0x00); // Enchant level (pet level shown in control item) + packet.writeC(5); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item + packet.writeC(0); // Filler (always 0) + packet.writeH(0); // Equipped : 00-No, 01-yes + packet.writeQ(0); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand + packet.writeH(0); // Enchant level (pet level shown in control item) packet.writeD(-1); packet.writeD(-9999); - packet.writeC(0x01); // GOD Item enabled = 1 disabled (red) = 0 + packet.writeC(1); // GOD Item enabled = 1 disabled (red) = 0 packet.writeQ(s.getPrice()); // price } _list.clear(); } else { - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java index 3a7b67af23..f3dc872dca 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java @@ -32,8 +32,7 @@ public class CSShowComBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - - packet.writeC(0x01); // c4 1 to show community 00 to hide + packet.writeC(1); // c4 1 to show community 00 to hide packet.writeB(_html); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java index eacc27aa07..b18dac4cc3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java @@ -36,7 +36,6 @@ public class CameraMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CAMERA_MODE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java index 1682f5bc62..adea754676 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java @@ -39,7 +39,6 @@ public class ChairSit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAIR_SIT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_staticObjectId); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java index 2bc31a285a..de141fa067 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java @@ -38,7 +38,6 @@ public class ChangeMoveType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_MOVE_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_running ? RUN : WALK); packet.writeD(0); // c2 diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index 73277d923d..fbe5e39e2e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -22,17 +22,17 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ChangeWaitType implements IClientOutgoingPacket { + public static final int WT_SITTING = 0; + public static final int WT_STANDING = 1; + public static final int WT_START_FAKEDEATH = 2; + public static final int WT_STOP_FAKEDEATH = 3; + private final int _objectId; private final int _moveType; private final int _x; private final int _y; private final int _z; - public static final int WT_SITTING = 0; - public static final int WT_STANDING = 1; - public static final int WT_START_FAKEDEATH = 2; - public static final int WT_STOP_FAKEDEATH = 3; - public ChangeWaitType(Creature creature, int newMoveType) { _objectId = creature.getObjectId(); @@ -46,7 +46,6 @@ public class ChangeWaitType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_WAIT_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_moveType); packet.writeD(_x); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index 41180bac50..aa2e7b2eaa 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -30,7 +30,6 @@ public class CharCreateFail implements IClientOutgoingPacket public static final int REASON_CREATE_NOT_ALLOWED = 0x05; // "Characters cannot be created from this server." public static final int REASON_CHOOSE_ANOTHER_SVR = 0x06; // "Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please // choose another server." - private final int _error; public CharCreateFail(int errorCode) @@ -42,7 +41,6 @@ public class CharCreateFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index f0e99885ad..768617e558 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -31,8 +31,7 @@ public class CharCreateOk implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_SUCCESS.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index bed289ca0a..1674eef343 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -33,7 +33,6 @@ public class CharDeleteFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_DELETE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index c3f775a8d3..e9ca7cefa6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -33,6 +33,22 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { + private static final int[] PAPERDOLL_ORDER = new int[] + { + Inventory.PAPERDOLL_UNDER, + Inventory.PAPERDOLL_HEAD, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_LHAND, + Inventory.PAPERDOLL_GLOVES, + Inventory.PAPERDOLL_CHEST, + Inventory.PAPERDOLL_LEGS, + Inventory.PAPERDOLL_FEET, + Inventory.PAPERDOLL_CLOAK, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_HAIR, + Inventory.PAPERDOLL_HAIR2 + }; + private final Player _player; private final Clan _clan; private int _objId; @@ -55,22 +71,6 @@ public class CharInfo implements IClientOutgoingPacket private int _vehicleId = 0; private final boolean _gmSeeInvis; - private static final int[] PAPERDOLL_ORDER = new int[] - { - Inventory.PAPERDOLL_UNDER, - Inventory.PAPERDOLL_HEAD, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_LHAND, - Inventory.PAPERDOLL_GLOVES, - Inventory.PAPERDOLL_CHEST, - Inventory.PAPERDOLL_LEGS, - Inventory.PAPERDOLL_FEET, - Inventory.PAPERDOLL_CLOAK, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_HAIR, - Inventory.PAPERDOLL_HAIR2 - }; - public CharInfo(Player player, boolean gmSeeInvis) { _player = player; @@ -119,16 +119,15 @@ public class CharInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); // Confirmed packet.writeD(_y); // Confirmed packet.writeD(_z); // Confirmed packet.writeD(_vehicleId); // Confirmed packet.writeD(_objId); // Confirmed packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed - packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) @@ -152,10 +151,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.getPvpFlag()); packet.writeD(_player.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -166,53 +163,40 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); - packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeS(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle()); - packet.writeD(_player.getAppearance().getVisibleClanId()); packet.writeD(_player.getAppearance().getVisibleClanCrestId()); packet.writeD(_player.getAppearance().getVisibleAllyId()); packet.writeD(_player.getAppearance().getVisibleAllyCrestId()); - - packet.writeC(_player.isSitting() ? 0x00 : 0x01); // Confirmed - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // Confirmed - packet.writeC(_player.isInCombat() ? 0x01 : 0x00); // Confirmed - - packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 0x01 : 0x00); // Confirmed - - packet.writeC(_player.isInvisible() ? 0x01 : 0x00); - + packet.writeC(_player.isSitting() ? 0 : 1); // Confirmed + packet.writeC(_player.isRunning() ? 1 : 0); // Confirmed + packet.writeC(_player.isInCombat() ? 1 : 0); // Confirmed + packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 1 : 0); // Confirmed + packet.writeC(_player.isInvisible() ? 1 : 0); packet.writeC(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount packet.writeC(_player.getPrivateStoreType().getId()); // Confirmed packet.writeH(_player.getCubics().size()); // Confirmed _player.getCubics().keySet().forEach(packet::writeH); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); // Confirmed packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); packet.writeH(_player.getRecomHave()); // Confirmed packet.writeD(_player.getMountNpcId() == 0 ? 0 : _player.getMountNpcId() + 1000000); - packet.writeD(_player.getClassId().getId()); // Confirmed - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeC(_player.isMounted() ? 0 : _enchantLevel); // Confirmed - packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeD(_player.getClanCrestLargeId()); packet.writeC(_player.getNobleLevel()); // Confirmed packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed - final ILocational baitLocation = _player.getFishing().getBaitLocation(); if (baitLocation != null) { @@ -228,29 +212,21 @@ public class CharInfo implements IClientOutgoingPacket } packet.writeD(_player.getAppearance().getNameColor()); // Confirmed - packet.writeD(_heading); // Confirmed - packet.writeC(_player.getPledgeClass()); packet.writeH(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); // Confirmed - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - - packet.writeC(0x00); // nPvPRestrainStatus - + packet.writeC(0); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentHp())); // Confirmed packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - - packet.writeC(0x00); // cBRLectureMark + packet.writeC(0); // cBRLectureMark final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed @@ -262,8 +238,9 @@ public class CharInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } + packet.writeC(_player.isTrueHero() ? 100 : 0); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); // Hair accessory + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); // Hair accessory packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 7187b73184..11f5f4df52 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -40,17 +40,16 @@ public class CharSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTED.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getTitle()); packet.writeD(_sessionId); packet.writeD(_player.getClanId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x01); // active ?? + packet.writeD(1); // active ?? packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -62,25 +61,20 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_player.getReputation()); packet.writeD(_player.getPkKills()); packet.writeD(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_player.getClassId().getId()); - packet.writeB(new byte[16]); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeB(new byte[28]); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 70bb23564d..9b6f0dcb3f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -45,10 +45,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { private static final Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); - private final String _loginName; - private final int _sessionId; - private int _activeId; - private final List _characterPackages; private static final int[] PAPERDOLL_ORDER = new int[] { @@ -86,7 +82,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_BROOCH_JEWEL5, Inventory.PAPERDOLL_BROOCH_JEWEL6 }; - private static final int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, @@ -100,6 +95,11 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_HAIR2, }; + private final String _loginName; + private final int _sessionId; + private int _activeId; + private final List _characterPackages; + /** * Constructor for CharSelectionInfo. * @param loginName @@ -130,16 +130,13 @@ public class CharSelectionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.size(); packet.writeD(size); // Created character count - packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) - packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 0x01 : 0x00); // if 1 can't create new char - packet.writeC(0x01); // 0=can't play, 1=can play free until level 85, 2=100% free play - packet.writeD(0x02); // if 1, Korean client - packet.writeC(0x00); // Gift message for inactive accounts // 152 - + packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 1 : 0); // if 1 can't create new char + packet.writeC(1); // 0=can't play, 1=can play free until level 85, 2=100% free play + packet.writeD(2); // if 1, Korean client + packet.writeC(0); // Gift message for inactive accounts // 152 // Balthus Knights if (Config.BALTHUS_KNIGHTS_ENABLED) { @@ -148,23 +145,22 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (Config.PREMIUM_SYSTEM_ENABLED) { PremiumManager.getInstance().loadPremiumData(_loginName); - packet.writeC(PremiumManager.getInstance().getPremiumExpiration(_loginName) > 0 ? 0x01 : 0x00); + packet.writeC(PremiumManager.getInstance().getPremiumExpiration(_loginName) > 0 ? 1 : 0); } else { - packet.writeC(0x00); + packet.writeC(0); } } else { - packet.writeC(0x01); + packet.writeC(1); } } else { - packet.writeC(0x00); + packet.writeC(0); } - long lastAccess = 0; if (_activeId == -1) { @@ -177,7 +173,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - for (int i = 0; i < size; i++) { final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); @@ -185,95 +180,77 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name packet.writeD(_sessionId); // Account ID - packet.writeD(0x00); // Clan ID - packet.writeD(0x00); // Builder level - + packet.writeD(0); // Clan ID + packet.writeD(0); // Builder level packet.writeD(charInfoPackage.getSex()); // Sex packet.writeD(charInfoPackage.getRace()); // Race packet.writeD(charInfoPackage.getBaseClassId()); - - packet.writeD(0x01); // GameServerName - + packet.writeD(1); // GameServerName packet.writeD(charInfoPackage.getX()); packet.writeD(charInfoPackage.getY()); packet.writeD(charInfoPackage.getZ()); packet.writeF(charInfoPackage.getCurrentHp()); packet.writeF(charInfoPackage.getCurrentMp()); - packet.writeQ(charInfoPackage.getSp()); packet.writeQ(charInfoPackage.getExp()); packet.writeF((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel()))); packet.writeD(charInfoPackage.getLevel()); - packet.writeD(charInfoPackage.getReputation()); packet.writeD(charInfoPackage.getPkKills()); packet.writeD(charInfoPackage.getPvPKills()); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); // Ertheia - packet.writeD(0x00); // Ertheia - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); // Ertheia + packet.writeD(0); // Ertheia for (int slot : getPaperdollOrder()) { packet.writeD(charInfoPackage.getPaperdollItemId(slot)); } - - packet.writeD(0x00); // Salvation - packet.writeD(0x00); // Salvation - packet.writeD(0x00); // Salvation - packet.writeD(0x00); // Salvation - packet.writeD(0x00); // Salvation - + packet.writeD(0); // Salvation + packet.writeD(0); // Salvation + packet.writeD(0); // Salvation + packet.writeD(0); // Salvation + packet.writeD(0); // Salvation for (int slot : getPaperdollOrderVisualId()) { packet.writeD(charInfoPackage.getPaperdollItemVisualId(slot)); } - packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_CHEST)); // Upper Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_LEGS)); // Lower Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_HEAD)); // Headgear enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_GLOVES)); // Gloves enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_FEET)); // Boots enchant level - packet.writeD(charInfoPackage.getHairStyle()); packet.writeD(charInfoPackage.getHairColor()); packet.writeD(charInfoPackage.getFace()); - packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); - packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption1Id() : 0); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption2Id() : 0); - // packet.writeD(charInfoPackage.getTransformId()); // Used to display Transformations - packet.writeD(0x00); // Currently on retail when you are on character select you don't see your transformation. - - packet.writeD(0x00); // Pet NpcId - packet.writeD(0x00); // Pet level - packet.writeD(0x00); // Pet Food - packet.writeD(0x00); // Pet Food Level - packet.writeF(0x00); // Current pet HP - packet.writeF(0x00); // Current pet MP - + packet.writeD(0); // Currently on retail when you are on character select you don't see your transformation. + packet.writeD(0); // Pet NpcId + packet.writeD(0); // Pet level + packet.writeD(0); // Pet Food + packet.writeD(0); // Pet Food Level + packet.writeF(0); // Current pet HP + packet.writeF(0); // Current pet MP packet.writeD(charInfoPackage.getVitalityPoints()); // Vitality packet.writeD((int) Config.RATE_VITALITY_EXP_MULTIPLIER * 100); // Vitality Percent packet.writeD(charInfoPackage.getVitalityItemsUsed()); // Remaining vitality item uses - packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0x00 : 0x01); // Char is active or not - packet.writeC(charInfoPackage.isNoble() ? 0x01 : 0x00); - packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 0x01 : 0x00); // Hero glow - packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 0x01 : 0x00); // Show hair accessory if enabled + packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0 : 1); // Char is active or not + packet.writeC(charInfoPackage.isNoble() ? 1 : 0); + packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 1 : 0); // Hero glow + packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 1 : 0); // Show hair accessory if enabled } return true; } @@ -282,7 +259,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); - try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate")) { @@ -295,7 +271,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (charInfopackage != null) { characterList.add(charInfopackage); - final Player player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { @@ -309,7 +284,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return characterList; } @@ -351,7 +325,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { clan.removeClanMember(objectId, 0); } - GameClient.deleteCharByObjId(objectId); return null; } @@ -370,20 +343,16 @@ public class CharSelectionInfo implements IClientOutgoingPacket charInfopackage.setHairStyle(chardata.getInt("hairstyle")); charInfopackage.setHairColor(chardata.getInt("haircolor")); charInfopackage.setSex(chardata.getInt("sex")); - charInfopackage.setExp(chardata.getLong("exp")); charInfopackage.setSp(chardata.getLong("sp")); charInfopackage.setVitalityPoints(chardata.getInt("vitality_points")); charInfopackage.setClanId(chardata.getInt("clanid")); - charInfopackage.setRace(chardata.getInt("race")); - final int baseClassId = chardata.getInt("base_class"); final int activeClassId = chardata.getInt("classid"); charInfopackage.setX(chardata.getInt("x")); charInfopackage.setY(chardata.getInt("y")); charInfopackage.setZ(chardata.getInt("z")); - final int faction = chardata.getInt("faction"); if (faction == 1) { @@ -393,7 +362,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setEvil(); } - if (Config.MULTILANG_ENABLE) { String lang = chardata.getString("language"); @@ -403,22 +371,18 @@ public class CharSelectionInfo implements IClientOutgoingPacket } charInfopackage.setHtmlPrefix("data/lang/" + lang + "/"); } - // if is in subclass, load subclass exp, sp, level info if (baseClassId != activeClassId) { loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId); } - charInfopackage.setClassId(activeClassId); - // Get the augmentation id for equipped weapon int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); if (weaponObjId < 1) { weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); } - if (weaponObjId > 0) { try (Connection con = DatabaseFactory.getConnection(); @@ -444,7 +408,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } - // Check if the base class is set to zero and also doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly. if ((baseClassId == 0) && (activeClassId > 0)) { @@ -454,7 +417,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setBaseClassId(baseClassId); } - charInfopackage.setDeleteTimer(deletetime); charInfopackage.setLastAccess(chardata.getLong("lastAccess")); charInfopackage.setNoble(chardata.getInt("nobless") == 1); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java index 847e24db87..d59df7911a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java @@ -32,7 +32,6 @@ public class ChooseInventoryItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHOOSE_INVENTORY_ITEM.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java index 12a3940521..ac66c2fa0f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java @@ -32,7 +32,6 @@ public class ClientSetTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CLIENT_SET_TIME.writeId(packet); - packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // time in client minutes packet.writeD(6); // constant to match the server time( this determines the speed of the client clock) return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java index 195824578b..5fdb62f544 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java @@ -68,7 +68,6 @@ public class ConfirmDlg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CONFIRM_DLG.writeId(packet); - final SMParam[] params = _systemMessage.getParams(); packet.writeD(_systemMessage.getId()); packet.writeD(params.length); @@ -130,7 +129,6 @@ public class ConfirmDlg implements IClientOutgoingPacket } } } - packet.writeD(_time); packet.writeD(_requesterId); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 2a98428740..85d5630327 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -71,7 +71,6 @@ public class CreatureSay implements IClientOutgoingPacket _mask |= 0x08; } } - // Does not shows level if (sender.isGM()) { @@ -123,7 +122,6 @@ public class CreatureSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_sender == null ? 0 : _sender.getObjectId()); packet.writeD(_chatType.getClientId()); if (_senderName != null) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index dfc40d995f..a307b06e4b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -38,9 +38,8 @@ public class DeleteObject implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DELETE_OBJECT.writeId(packet); - packet.writeD(_objectId); - packet.writeC(0x00); // c2 + packet.writeC(0); // c2 return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java index 982c8f3311..3b5917e55b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java @@ -50,7 +50,6 @@ public class Dice implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DICE.writeId(packet); - packet.writeD(_objectId); // object id of player packet.writeD(_itemId); // item id of dice (spade) 4625,4626,4627,4628 packet.writeD(_number); // number rolled diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 3d741a86a6..ebc93d0fc4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -68,7 +68,6 @@ public class Die implements IClientOutgoingPacket siegeClan = fort.getSiege().getAttackerClan(clan); isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan); } - _toVillage = creature.canRevive() && !creature.isPendingRevive(); _toClanHall = (clan != null) && (clan.getHideoutId() > 0); _toCastle = ((clan != null) && (clan.getCastleId() > 0)) || isInCastleDefense; @@ -76,7 +75,6 @@ public class Die implements IClientOutgoingPacket _useFeather = creature.getAccessLevel().allowFixedRes() || creature.getInventory().haveItemForSelfResurrection(); _toFortress = ((clan != null) && (clan.getFortId() > 0)) || isInFortDefense; } - _isSweepable = creature.isAttackable() && creature.isSweepActive(); } @@ -91,7 +89,6 @@ public class Die implements IClientOutgoingPacket { _items = new ArrayList<>(8); } - if (_items.size() < 8) { _items.add(itemId); @@ -116,20 +113,18 @@ public class Die implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DIE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_toVillage ? 0x01 : 0x00); - packet.writeD(_toClanHall ? 0x01 : 0x00); - packet.writeD(_toCastle ? 0x01 : 0x00); - packet.writeD(_toOutpost ? 0x01 : 0x00); - packet.writeD(_isSweepable ? 0x01 : 0x00); - packet.writeD(_useFeather ? 0x01 : 0x00); - packet.writeD(_toFortress ? 0x01 : 0x00); - packet.writeD(0x00); // Disables use Feather button for X seconds - packet.writeD(0x00); // Adventure's Song - packet.writeC(_hideAnimation ? 0x01 : 0x00); - - packet.writeD(_itemsEnabled ? 0x01 : 0x00); + packet.writeD(_toVillage ? 1 : 0); + packet.writeD(_toClanHall ? 1 : 0); + packet.writeD(_toCastle ? 1 : 0); + packet.writeD(_toOutpost ? 1 : 0); + packet.writeD(_isSweepable ? 1 : 0); + packet.writeD(_useFeather ? 1 : 0); + packet.writeD(_toFortress ? 1 : 0); + packet.writeD(0); // Disables use Feather button for X seconds + packet.writeD(0); // Adventure's Song + packet.writeC(_hideAnimation ? 1 : 0); + packet.writeD(_itemsEnabled ? 1 : 0); packet.writeD(getItems().size()); getItems().forEach(packet::writeD); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java index 15404f9dee..5837faec19 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java @@ -33,7 +33,6 @@ public class DoorInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_INFO.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.getId()); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java index 54f8742a73..14d41afee7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java @@ -33,7 +33,6 @@ public class DoorStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_STATUS_UPDATE.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.isOpen() ? 0 : 1); packet.writeD(_door.getDamage()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index b12458e719..3035890956 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -40,20 +40,17 @@ public class DropItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DROP_ITEM.writeId(packet); - packet.writeD(_objectId); packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeC(_item.isStackable() ? 0x01 : 0x00); + packet.writeC(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - - packet.writeC(0x00); - // packet.writeD(0x01); if above C == true (1) then packet.readD() + packet.writeC(0); + // packet.writeD(1); if above C == true (1) then packet.readD() packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java index 631c43ba0c..99bd80d97e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java @@ -62,13 +62,12 @@ public class Earthquake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EARTHQUAKE.writeId(packet); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_intensity); packet.writeD(_duration); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index db168592f1..335ea9dced 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -58,7 +58,6 @@ public class EnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_crystal); packet.writeQ(_count); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java index 837be1f5e3..169410245b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java @@ -41,7 +41,6 @@ public class EtcStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ETC_STATUS_UPDATE.writeId(packet); - packet.writeC(_player.getCharges()); // 1-7 increase force, level packet.writeD(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%) packet.writeC(_player.getExpertiseWeaponPenalty()); // Weapon Grade Penalty [1-4] diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java index 5dca90f960..9f8d576148 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java @@ -24,13 +24,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class Ex2ndPasswordAck implements IClientOutgoingPacket { + // TODO: Enum + public static final int SUCCESS = 0; + public static final int WRONG_PATTERN = 1; + private final int _status; private final int _response; - // TODO: Enum - public static final int SUCCESS = 0x00; - public static final int WRONG_PATTERN = 0x01; - public Ex2ndPasswordAck(int status, int response) { _status = status; @@ -41,10 +41,9 @@ public class Ex2ndPasswordAck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_ACK.writeId(packet); - packet.writeC(_status); - packet.writeD(_response == WRONG_PATTERN ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(_response == WRONG_PATTERN ? 1 : 0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java index 48bde5161d..c86b5185d0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordCheck implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_NEW = 0x00; - public static final int PASSWORD_PROMPT = 0x01; - public static final int PASSWORD_OK = 0x02; + public static final int PASSWORD_NEW = 0; + public static final int PASSWORD_PROMPT = 1; + public static final int PASSWORD_OK = 2; private final int _windowType; @@ -40,9 +40,8 @@ public class Ex2ndPasswordCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_CHECK.writeId(packet); - packet.writeD(_windowType); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java index 1abf50ab01..f6731bf18f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordVerify implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_OK = 0x00; - public static final int PASSWORD_WRONG = 0x01; - public static final int PASSWORD_BAN = 0x02; + public static final int PASSWORD_OK = 0; + public static final int PASSWORD_WRONG = 1; + public static final int PASSWORD_BAN = 2; private final int _wrongTentatives; private final int _mode; @@ -42,7 +42,6 @@ public class Ex2ndPasswordVerify implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_VERIFY.writeId(packet); - packet.writeD(_mode); packet.writeD(_wrongTentatives); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java index 8f3d5ec764..528988ab5f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java @@ -45,10 +45,8 @@ public class ExAbnormalStatusUpdateFromTarget implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ABNORMAL_STATUS_UPDATE_FROM_TARGET.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeH(_effects.size()); - for (BuffInfo info : _effects) { packet.writeD(info.getSkill().getDisplayId()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java index c4b9cd8356..f3abd6ec5c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java @@ -41,7 +41,6 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRABLE_SKILL_LIST_BY_CLASS.writeId(packet); - packet.writeH(_type.getId()); packet.writeH(_learnable.size()); for (SkillLearn skill : _learnable) @@ -54,7 +53,7 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket packet.writeC(skill.getRequiredItems().size()); if (_type == AcquireSkillType.SUBPLEDGE) { - packet.writeH(0x00); + packet.writeH(0); } } return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java index fd0e2fc97c..8555bb6e86 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java @@ -61,7 +61,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_SKILL_INFO.writeId(packet); - packet.writeD(_id); packet.writeD(_level); packet.writeQ(_spCost); @@ -73,7 +72,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket packet.writeD(holder.getId()); packet.writeQ(holder.getCount()); } - packet.writeD(_skillRem.size()); for (Skill skill : _skillRem) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java index 29793f4d6c..ff8c526ec4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java @@ -36,7 +36,6 @@ public class ExAdenaInvenCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ADENA_INVEN_COUNT.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeH(_player.getInventory().getSize()); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java index 2aa2d85bc5..5ef11e0f1e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java @@ -50,13 +50,11 @@ public class ExAirShipInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_INFO.writeId(packet); - packet.writeD(_ship.getObjectId()); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(_captain); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); @@ -73,14 +71,13 @@ public class ExAirShipInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - packet.writeD(_ship.getFuel()); packet.writeD(_ship.getMaxFuel()); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java index 4cfc76bfba..8b37f4fc0a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java @@ -42,7 +42,6 @@ public class ExAirShipStopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_airShipId); packet.writeD(_playerId); packet.writeD(_x); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java index 33c57712da..52958f931b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java @@ -37,12 +37,10 @@ public class ExAirShipTeleportList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_TELEPORT_LIST.writeId(packet); - packet.writeD(_dockId); if (_teleports != null) { packet.writeD(_teleports.length); - for (int i = 0; i < _teleports.length; i++) { packet.writeD(i - 1); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java index 392b228f0d..7918022c72 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java @@ -50,13 +50,12 @@ public class ExAlchemySkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_SKILL_LIST.writeId(packet); - packet.writeD(_skills.size()); for (Skill skill : _skills) { packet.writeD(skill.getId()); packet.writeD(skill.getLevel()); - packet.writeQ(0x00); // Always 0 on Naia, SP i guess? + packet.writeQ(0); // Always 0 on Naia, SP i guess? packet.writeC(skill.getId() == CommonSkill.ALCHEMY_CUBE.getId() ? 0 : 1); // This is type in flash, visible or not } return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java index 3bfadd2650..ed7f8d4255 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java @@ -47,12 +47,10 @@ public class ExAlterSkillRequest implements IClientOutgoingPacket { return true; } - OutgoingPackets.EX_ALTER_SKILL_REQUEST.writeId(packet); packet.writeD(_nextSkillId); packet.writeD(_currentSkillId); packet.writeD(_alterTime); - if (_alterTime > 0) { _player.setAlterSkillActive(true); @@ -62,7 +60,6 @@ public class ExAlterSkillRequest implements IClientOutgoingPacket _player.setAlterSkillActive(false); }, _alterTime * 1000); } - return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java index 3d7ee12a81..1990e1e701 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java @@ -37,7 +37,6 @@ public class ExAskCoupleAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_COUPLE_ACTION.writeId(packet); - packet.writeD(_actionId); packet.writeD(_objectId); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java index 61cabedd98..45615daf5a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java @@ -39,9 +39,8 @@ public class ExAskJoinMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_MPCC.writeId(packet); - packet.writeS(_requestorName); // name of CCLeader - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java index 17fa9d028f..908022ff7e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java @@ -38,7 +38,6 @@ public class ExAskJoinPartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_PARTY_ROOM.writeId(packet); - packet.writeS(_charName); packet.writeS(_roomName); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java index 2a6b958dc9..1551840013 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java @@ -38,7 +38,6 @@ public class ExAskModifyPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_MODIFY_PARTY_LOOTING.writeId(packet); - packet.writeS(_requestor); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java index 958e7c3d06..fa62c8a207 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java @@ -45,7 +45,6 @@ public class ExAttributeEnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ATTRIBUTE_ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeC(_isWeapon); packet.writeH(_type); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java index 1a3a1ef3fe..3d65055b3c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java @@ -41,9 +41,8 @@ public class ExAutoSoulShot implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AUTO_SOUL_SHOT.writeId(packet); - packet.writeD(_itemId); - packet.writeD(_enable ? 0x01 : 0x00); + packet.writeD(_enable ? 1 : 0); packet.writeD(_type); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java index 8680c6bd7a..a8137347ec 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java @@ -37,8 +37,7 @@ public class ExBaseAttributeCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASE_ATTRIBUTE_CANCEL_RESULT.writeId(packet); - - packet.writeD(0x01); // result + packet.writeD(1); // result packet.writeD(_objId); packet.writeD(_attribute); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java index acbad69599..27f7fb5a63 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java @@ -75,7 +75,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 1149, 1150, 1151, 1152, 1153, 1154, 1155 }; - public static final int[] DEFAULT_ACTION_LIST = { 0, 1, 2, 3, @@ -145,7 +144,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 5012, 5013, 5014, 5015 }; //@formatter:on - public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST); private final int[] _actionIds; @@ -159,7 +157,6 @@ public class ExBasicActionList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASIC_ACTION_LIST.writeId(packet); - packet.writeD(_actionIds.length); for (int _actionId : _actionIds) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java index 4c4fac8c91..d32dca4d21 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java @@ -34,13 +34,14 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBeautyItemList implements IClientOutgoingPacket { - private int _colorCount; - private final BeautyData _beautyData; - private final Map> _colorData = new HashMap<>(); private static final int HAIR_TYPE = 0; private static final int FACE_TYPE = 1; private static final int COLOR_TYPE = 2; + private int _colorCount; + private final BeautyData _beautyData; + private final Map> _colorData = new HashMap<>(); + public ExBeautyItemList(Player player) { _beautyData = BeautyShopData.getInstance().getBeautyData(player.getRace(), player.getAppearance().getSexType()); @@ -60,7 +61,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BEAUTY_ITEM_LIST.writeId(packet); - packet.writeD(HAIR_TYPE); packet.writeD(_beautyData.getHairList().size()); for (BeautyItem hair : _beautyData.getHairList().values()) @@ -72,7 +72,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(hair.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(FACE_TYPE); packet.writeD(_beautyData.getFaceList().size()); for (BeautyItem face : _beautyData.getFaceList().values()) @@ -84,7 +83,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(face.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(COLOR_TYPE); packet.writeD(_colorCount); for (Entry> entry : _colorData.entrySet()) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java index 1825236886..6d4c45cb2b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java @@ -34,7 +34,6 @@ public class ExBirthdayPopup implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_BIRTH_DAY.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java index 7d2f17e697..43e525f05f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java @@ -26,6 +26,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBrBroadcastEventState implements IClientOutgoingPacket { + public static final int APRIL_FOOLS = 20090401; + public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) + public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) + public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) + public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) + private final int _eventId; private final int _eventState; private int _param0; @@ -36,12 +42,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket private String _param5; private String _param6; - public static final int APRIL_FOOLS = 20090401; - public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) - public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) - public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) - public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) - public ExBrBroadcastEventState(int eventId, int eventState) { _eventId = eventId; @@ -65,7 +65,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BROADCAST_EVENT_STATE.writeId(packet); - packet.writeD(_eventId); packet.writeD(_eventState); packet.writeD(_param0); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java index 1fd7ec663a..c0683c8797 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java @@ -44,7 +44,6 @@ public class ExBrBuffEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUFF_EVENT_STATE.writeId(packet); - packet.writeD(_type); packet.writeD(_value); packet.writeD(_state); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java index 943aae8a62..8e009d7b09 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java @@ -43,7 +43,6 @@ public class ExBrLoadEventTopRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_LOAD_EVENT_TOP_RANKERS.writeId(packet); - packet.writeD(_eventId); packet.writeD(_day); packet.writeD(_count); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java index 6a98c01654..9105e39efe 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java @@ -36,9 +36,8 @@ public class ExBrPremiumState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PREMIUM_STATE.writeId(packet); - packet.writeD(_player.getObjectId()); - packet.writeC(_player.hasPremiumStatus() ? 0x01 : 0x00); + packet.writeC(_player.hasPremiumStatus() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 381dd859ad..567cfc70f9 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -59,10 +59,8 @@ public class ExBuySellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x01); // Type SELL + packet.writeD(1); // Type SELL packet.writeD(_inventorySlots); - if ((_sellList != null)) { packet.writeH(_sellList.size()); @@ -74,9 +72,8 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - if ((_refundList != null) && !_refundList.isEmpty()) { packet.writeH(_refundList.size()); @@ -90,10 +87,9 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - - packet.writeC(_done ? 0x01 : 0x00); + packet.writeC(_done ? 1 : 0); return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java index 2b43c0ce4b..e0ec81e0e7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java @@ -39,7 +39,6 @@ public class ExCastleState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CASTLE_STATE.writeId(packet); - packet.writeD(_castleId); packet.writeD(_castleSide.ordinal()); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java index b7f90d261b..a8196c7a83 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java @@ -52,7 +52,6 @@ public class ExChangeClientEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_CLIENT_EFFECT_INFO.writeId(packet); - packet.writeD(_type); packet.writeD(_key); packet.writeD(_value); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java index 472abc88df..eea59162ee 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java @@ -37,7 +37,6 @@ public class ExChangeNpcState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NPC_STATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java index 8cdcb4460d..45f2805517 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java @@ -49,7 +49,6 @@ public class ExChangePostState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_POST_STATE.writeId(packet); - packet.writeD(_receivedBoard ? 1 : 0); packet.writeD(_changedMsgIds.length); for (int postId : _changedMsgIds) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java index fc58ec9a2e..d765ab54e0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java @@ -35,7 +35,6 @@ public class ExChangeToAwakenedClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_TO_AWAKENED_CLASS.writeId(packet); - packet.writeD(_classId); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index f51a3eb3ae..1e9b8e9dc8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -47,7 +47,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket throw new IllegalArgumentException("Undefined Atribute item: " + stone); } _level = ElementalAttributeData.getInstance().getMaxElementLevel(_itemId); - // Register only items that can be put an attribute stone/crystal for (Item item : player.getInventory().getItems()) { @@ -62,7 +61,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_INVENTORY_ATTRIBUTE_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeQ(_count); packet.writeD(_atribute == AttributeType.FIRE ? 1 : 0); // Fire diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java index a272d85469..238882cd11 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java @@ -35,7 +35,6 @@ public class ExCloseMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java index d2ecd70952..877bca760a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java @@ -34,7 +34,6 @@ public class ExClosePartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_PARTY_ROOM.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java index 27c112776b..1d02c972b5 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java @@ -54,7 +54,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLOSSEUM_FENCE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_clientState); packet.writeD(_x); @@ -62,7 +61,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_width); packet.writeD(_length); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java index 766d3619ad..b72bef93e8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java @@ -37,9 +37,8 @@ public class ExConfirmAddingContact implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AGIT_AUCTION_CMD.writeId(packet); - packet.writeS(_charName); - packet.writeD(_added ? 0x01 : 0x00); + packet.writeD(_added ? 1 : 0); return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java index beded32254..c832d507ed 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameAddPlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x01); - + packet.writeD(1); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java index 5f36f730d0..847ea93e6a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java @@ -45,9 +45,7 @@ public class ExCubeGameChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java index 66abbf4b75..a2f2e61ded 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java @@ -43,12 +43,10 @@ public class ExCubeGameChangeTeam implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x05); - + packet.writeD(5); packet.writeD(_player.getObjectId()); - packet.writeD(_fromRedTeam ? 0x01 : 0x00); - packet.writeD(_fromRedTeam ? 0x00 : 0x01); + packet.writeD(_fromRedTeam ? 1 : 0); + packet.writeD(_fromRedTeam ? 0 : 1); return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java index 5273b2099a..136b439283 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java @@ -39,9 +39,7 @@ public class ExCubeGameChangeTimeToStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x03); - + packet.writeD(3); packet.writeD(_seconds); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java index f81a302941..9bdba49029 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java @@ -35,7 +35,6 @@ public class ExCubeGameCloseUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0xffffffff); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java index 259a0e9407..3177e7a488 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java @@ -40,11 +40,9 @@ public class ExCubeGameEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x01); - - packet.writeD(_isRedTeamWin ? 0x01 : 0x00); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(1); + packet.writeD(_isRedTeamWin ? 1 : 0); + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java index 4d89e621ce..8b96bb545f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java @@ -55,14 +55,11 @@ public class ExCubeGameExtendedChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeD(_playerPoints); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java index e5a00f1ab7..c084789f13 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameRemovePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java index 00be884d2f..35a3f289d1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java @@ -35,8 +35,7 @@ public class ExCubeGameRequestReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x04); + packet.writeD(4); return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java index 1bc89e0c32..8b755dd3cc 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java @@ -30,7 +30,6 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket // Players Lists private final List _bluePlayers; private final List _redPlayers; - // Common Values private final int _roomNumber; @@ -51,12 +50,9 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_roomNumber); packet.writeD(0xffffffff); - packet.writeD(_bluePlayers.size()); for (Player player : _bluePlayers) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java index 2f2c092c08..d000112787 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java @@ -31,7 +31,6 @@ public class ExCursedWeaponList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet); - final Set ids = CursedWeaponsManager.getInstance().getCursedWeaponsIds(); packet.writeD(ids.size()); ids.forEach(packet::writeD); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java index 2f60a1b80c..5bc7ff3238 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java @@ -39,7 +39,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet); - if (!_cursedWeaponInfo.isEmpty()) { packet.writeD(_cursedWeaponInfo.size()); @@ -47,7 +46,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { packet.writeD(w.id); packet.writeD(w.activated); - packet.writeD(w.pos.getX()); packet.writeD(w.pos.getY()); packet.writeD(w.pos.getZ()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java index f475a02b28..0456fb9dae 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java @@ -34,7 +34,6 @@ public class ExDissmissMPCCRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DISSMISS_MPCC_ROOM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java index 258010f717..c731b7c7a9 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java @@ -37,7 +37,6 @@ public class ExDuelAskStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_ASK_START.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDuel); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java index 043c82c0db..e9a31bee57 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java @@ -38,7 +38,6 @@ public class ExDuelEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_END.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java index 264409b3d6..e1fa1cea88 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java @@ -38,7 +38,6 @@ public class ExDuelReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_READY.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java index 488aafcb7d..ecdd528a16 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java @@ -38,7 +38,6 @@ public class ExDuelStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_START.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java index 7df040c5e7..5ed0c09675 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java @@ -36,7 +36,6 @@ public class ExDuelUpdateUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_UPDATE_USER_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeD(_player.getClassId().getId()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 7ab055a3d8..f58c0573a8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExEnchantSkillInfo implements IClientOutgoingPacket { private final Set _routes; - private final int _skillId; private final int _skillLevel; private final int _skillSubLevel; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 41368a8efb..e4ee350e64 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -50,7 +50,6 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_INFO_DETAIL.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java index 5cedcd6284..1d32f0d725 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java @@ -43,7 +43,6 @@ public class ExEnchantSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_LIST.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skills.size()); for (Skill skill : _skills) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java index 6ab5e869f2..853d74039f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java @@ -38,7 +38,6 @@ public class ExEnchantSkillResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_RESULT.writeId(packet); - packet.writeD(_enchanted ? 1 : 0); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java index 7b7d2d008d..410bf16510 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java @@ -42,7 +42,6 @@ public class ExEventMatchMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_EVENT_MATCH_MESSAGE.writeId(packet); - packet.writeC(_type); packet.writeS(_message); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java index 7264e90233..1946758bf5 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java @@ -37,11 +37,9 @@ public class ExGetBookMarkInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOOK_MARK_INFO.writeId(packet); - - packet.writeD(0x00); // Dummy + packet.writeD(0); // Dummy packet.writeD(_player.getBookMarkSlot()); packet.writeD(_player.getTeleportBookmarks().size()); - for (TeleportBookmark tpbm : _player.getTeleportBookmarks()) { packet.writeD(tpbm.getId()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java index 36e7bb81af..201e8eb49b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java @@ -42,15 +42,14 @@ public class ExGetBossRecord implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOSS_RECORD.writeId(packet); - packet.writeD(_ranking); packet.writeD(_totalPoints); if (_bossRecordInfo == null) { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } else { @@ -59,7 +58,7 @@ public class ExGetBossRecord implements IClientOutgoingPacket { packet.writeD(entry.getKey()); packet.writeD(entry.getValue()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? } } return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java index ea0a5f8b18..85ccad0758 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java @@ -41,7 +41,6 @@ public class ExGetOffAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_OFF_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_x); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java index f8e16a4191..9a02e49223 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java @@ -39,7 +39,6 @@ public class ExGetOnAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_ON_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java index 51197344a5..704b3212a1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExGetPremiumItemList implements IClientOutgoingPacket { private final Player _player; - private final Map _map; public ExGetPremiumItemList(Player player) @@ -43,7 +42,6 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_PREMIUM_ITEM_LIST.writeId(packet); - packet.writeD(_map.size()); for (Entry entry : _map.entrySet()) { @@ -51,7 +49,7 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket packet.writeQ(entry.getKey()); packet.writeD(item.getItemId()); packet.writeQ(item.getCount()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeS(item.getSender()); } return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index a005fa8ad8..0200bdee08 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -40,7 +40,6 @@ public class ExHeroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HERO_LIST.writeId(packet); - packet.writeD(_heroList.size()); for (StatSet hero : _heroList.values()) { @@ -51,7 +50,7 @@ public class ExHeroList implements IClientOutgoingPacket packet.writeS(hero.getString(Hero.ALLY_NAME, "")); packet.writeD(hero.getInt(Hero.ALLY_CREST, 0)); packet.writeD(hero.getInt(Hero.COUNT)); - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index d5b5430142..0baca7cd86 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -48,8 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); - - packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade + packet.writeC(_hide ? 0 : 1); // Grand Crusade packet.writeD(_currentTemplateId); packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java index 81db66b88f..323c0cdf1e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java @@ -35,7 +35,6 @@ public class ExIsCharNameCreatable implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_IS_CHAR_NAME_CREATABLE.writeId(packet); - packet.writeD(_allowed); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java index ecc751eab3..45def9e0be 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java @@ -38,7 +38,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { throw new NullPointerException(); } - if (currentAuction.getAuctionState() != ItemAuctionState.STARTED) { _timeRemaining = 0; @@ -47,7 +46,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { _timeRemaining = (int) (currentAuction.getFinishingTimeRemaining() / 1000); // in seconds } - _refresh = refresh; _currentAuction = currentAuction; _nextAuction = nextAuction; @@ -57,16 +55,12 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_AUCTION_INFO.writeId(packet); - - packet.writeC(_refresh ? 0x00 : 0x01); + packet.writeC(_refresh ? 0 : 1); packet.writeD(_currentAuction.getInstanceId()); - final ItemAuctionBid highestBid = _currentAuction.getHighestBid(); packet.writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid()); - packet.writeD(_timeRemaining); writeItem(packet, _currentAuction.getItemInfo()); - if (_nextAuction != null) { packet.writeQ(_nextAuction.getAuctionInitBid()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java index f66c77509f..e40ebdb90b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java @@ -44,7 +44,6 @@ public class ExItemAuctionStatus implements IClientOutgoingPacket _x = spawn.getX(); _y = spawn.getY(); _z = spawn.getZ(); - final ItemAuctionInstance manager = ItemAuctionManager.getInstance().getManagerInstance(AUCTION_MANAGER); if (manager != null) { @@ -64,7 +63,7 @@ public class ExItemAuctionStatus implements IClientOutgoingPacket packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); + packet.writeD(0); packet.writeH(_status); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java index 53ad8abd58..1c5e38cbab 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListMpccWaiting implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _rooms = new LinkedList<>(); @@ -53,7 +54,6 @@ public class ExListMpccWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_MPCC_WAITING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 78f2fec636..eafea24fa6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _players = new LinkedList<>(); @@ -60,7 +61,6 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(packet); - packet.writeD(_size); packet.writeD(_players.size()); for (Player player : _players) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java index 786c616875..c8723a9fc0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java @@ -46,7 +46,6 @@ public class ExMPCCPartyInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCPARTY_INFO_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_LeaderOID); packet.writeD(_memberCount); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java index 4bf07f0133..08259e4e6c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java @@ -37,7 +37,6 @@ public class ExMPCCPartymasterList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_PARTYMASTER_LIST.writeId(packet); - packet.writeD(_leadersName.size()); _leadersName.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java index abbdc8fe76..f021ef5f1f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java @@ -36,7 +36,6 @@ public class ExMPCCRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java index 154e156270..2eec590cb4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java @@ -41,7 +41,6 @@ public class ExMPCCRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java index 06e3027bfc..a0e9d0a4b0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java @@ -37,7 +37,6 @@ public class ExMPCCShowPartyMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCSHOW_PARTY_MEMBER_INFO.writeId(packet); - packet.writeD(_party.getMemberCount()); for (Player pc : _party.getMembers()) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java index e454a746f3..771b2f22cb 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java @@ -49,7 +49,6 @@ public class ExMagicAttackInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAGIC_ATTACK_INFO.writeId(packet); - packet.writeD(_caster); packet.writeD(_target); packet.writeD(_type); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java index 9cfbeb5aee..1aaa5b6520 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java @@ -35,7 +35,6 @@ public class ExMailArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAIL_ARRIVED.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java index 983ff22b92..48156c0600 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java @@ -44,7 +44,6 @@ public class ExManageMpccRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MANAGE_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java index f710c006e8..9d7d14211e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java @@ -45,7 +45,6 @@ public class ExMoveToLocationAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_objId); packet.writeD(_tx); packet.writeD(_ty); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java index 3e3bdc9fed..87e44b51cd 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java @@ -43,7 +43,6 @@ public class ExMoveToLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java index 7ab0d1c7da..3c1902892a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java @@ -40,11 +40,9 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet); - packet.writeS(_channel.getLeader().getName()); - packet.writeD(0x00); // Channel loot 0 or 1 + packet.writeD(0); // Channel loot 0 or 1 packet.writeD(_channel.getMemberCount()); - packet.writeD(_channel.getParties().size()); for (Party p : _channel.getParties()) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java index 1536bd5f9b..f2a32bb6e8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java @@ -43,7 +43,6 @@ public class ExNeedToChangeName implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEED_TO_CHANGE_NAME.writeId(packet); - packet.writeD(_type); packet.writeD(_subType); packet.writeS(_name); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java index be9bec8559..d18b4606b3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java @@ -35,7 +35,6 @@ public class ExNevitAdventEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CHANNELING_EFFECT.writeId(packet); - packet.writeD(_timeLeft); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java index 3a0367c178..09f6250f51 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java @@ -35,7 +35,6 @@ public class ExNevitAdventPointInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_AGATHION_ENERGY_INFO.writeId(packet); - packet.writeD(_points); // 72 = 1%, max 7200 = 100% return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java index 88fdaae499..ef220d86de 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java @@ -37,9 +37,8 @@ public class ExNevitAdventTimeChange implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - // state 0 - pause 1 - started - packet.writeC(_paused ? 0x00 : 0x01); + packet.writeC(_paused ? 0 : 1); // left time in ms max is 16000 its 4m and state is automatically changed to quit packet.writeD(_time); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java index fccdf510cc..4025bf78fa 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java @@ -34,7 +34,6 @@ public class ExNewSkillToLearnByLevelUp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEW_SKILL_TO_LEARN_BY_LEVEL_UP.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java index 324c18a517..f2ce8614dc 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java @@ -43,8 +43,7 @@ public class ExNoticePostArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTICE_POST_ARRIVED.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java index afe3719d9b..050c7ccea5 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java @@ -43,8 +43,7 @@ public class ExNoticePostSent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_WRITE_POST.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java index 5d98c20b09..e0bd08d39a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java @@ -30,7 +30,6 @@ public class ExNotifyPremiumItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_PREMIUM_ITEM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java index 6cb3724448..ba3c0cfeaa 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java @@ -34,7 +34,6 @@ public class ExOlympiadMatchEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MATCH_END.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java index 264d5aa484..7ffd5ed3bd 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java @@ -55,19 +55,15 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x00); // Type 0 = Match List, 1 = Match Result - + packet.writeD(0); // Type 0 = Match List, 1 = Match Result packet.writeD(_games.size()); - packet.writeD(0x00); - + packet.writeD(0); for (OlympiadGameTask curGame : _games) { final AbstractOlympiadGame game = curGame.getGame(); if (game != null) { packet.writeD(game.getStadiumId()); // Stadium Id (Arena 1 = 0) - if (game instanceof OlympiadGameNonClassed) { packet.writeD(1); @@ -80,8 +76,7 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket { packet.writeD(0); } - - packet.writeD(curGame.isRunning() ? 0x02 : 0x01); // (1 = Standby, 2 = Playing) + packet.writeD(curGame.isRunning() ? 2 : 1); // (1 = Standby, 2 = Playing) packet.writeS(game.getPlayerNames()[0]); // Player 1 Name packet.writeS(game.getPlayerNames()[1]); // Player 2 Name } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java index 712651603d..b387271fba 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java @@ -53,9 +53,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x01); // Type 0 = Match List, 1 = Match Result - + packet.writeD(1); // Type 0 = Match List, 1 = Match Result packet.writeD(_tie ? 1 : 0); // 0 - win, 1 - tie packet.writeS(_winnerList.get(0).getName()); packet.writeD(_winTeam); @@ -69,9 +67,8 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } - packet.writeD(_loseTeam); packet.writeD(_loserList.size()); for (OlympiadInfo info : _loserList) @@ -83,7 +80,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java index 34d81d1f53..712b9e06c6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java @@ -38,7 +38,6 @@ public class ExOlympiadMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MODE.writeId(packet); - packet.writeC(_mode); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java index ebea6c56f3..5b4f2c2523 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java @@ -53,7 +53,6 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_SPELLED_INFO.writeId(packet); - packet.writeD(_playerId); packet.writeD(_effects.size() + _effects2.size()); for (BuffInfo info : _effects) @@ -62,7 +61,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(info.getSkill().getDisplayId()); packet.writeH(info.getSkill().getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(info.getSkill().getAbnormalType().getClientId()); writeOptionalD(packet, info.getSkill().isAura() ? -1 : info.getTime()); } @@ -73,7 +72,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(skill.getDisplayId()); packet.writeH(skill.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(skill.getAbnormalType().getClientId()); packet.writeH(-1); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java index 18c34fe9de..ca473edfcf 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java @@ -76,7 +76,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_USER_INFO.writeId(packet); - if (_player != null) { packet.writeC(_player.getOlympiadSide()); @@ -91,7 +90,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket packet.writeS(_par.getName()); packet.writeD(_par.getBaseClass()); } - packet.writeD(_curHp); packet.writeD(_maxHp); packet.writeD(_curCp); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java index e84d0251bd..7ec64cc8c3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java @@ -35,7 +35,6 @@ public class ExOpenMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OPEN_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java index 90349cc1a2..5661dc9f57 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java @@ -56,7 +56,6 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PCCAFE_POINT_INFO.writeId(packet); - packet.writeD(_points); // num points packet.writeD(_mAddPoint); // points inc display packet.writeC(_mPeriodType); // period(0=don't show window,1=acquisition,2=use points) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java index f7e8b4a99a..248a2f7d98 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_ADD.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java index 832bee0012..1f452f4bae 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_DELETE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_summon.getSummonType()); packet.writeD(_summon.getOwner().getObjectId()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java index 0646a67001..703694fa2f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_UPDATE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 0e3edb3ea7..e4c6b79ae0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -47,7 +47,6 @@ public class ExPartyRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2bffdec368..2ebf1dc7f0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -43,10 +43,8 @@ public class ExPetInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class ExPetInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class ExPetInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,9 +154,8 @@ public class ExPetInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -227,28 +205,24 @@ public class ExPetInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PET_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -267,7 +241,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -283,19 +257,19 @@ public class ExPetInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -307,20 +281,20 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -344,12 +318,12 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -379,12 +353,10 @@ public class ExPetInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java index 082f4c7662..0f72c05a3a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java @@ -34,7 +34,6 @@ public class ExPlayScene implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLAY_SCENE.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java index e98d317e14..7e3803bdaa 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java @@ -36,7 +36,6 @@ public class ExPledgeCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_COUNT.writeId(packet); - packet.writeD(_count); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java index 838029e284..4084de3481 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java @@ -38,7 +38,6 @@ public class ExPledgeDraftListSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_DRAFT_LIST_SEARCH.writeId(packet); - packet.writeD(_pledgeRecruitList.size()); for (PledgeWaitingInfo prl : _pledgeRecruitList) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java index fb956e9996..44e34004ea 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java @@ -25,11 +25,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExPledgeEmblem implements IClientOutgoingPacket { + private static final int TOTAL_SIZE = 65664; + private final int _crestId; private final int _clanId; private final byte[] _data; private final int _chunkId; - private static final int TOTAL_SIZE = 65664; public ExPledgeEmblem(int crestId, byte[] chunkedData, int clanId, int chunkId) { @@ -43,7 +44,6 @@ public class ExPledgeEmblem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clanId); packet.writeD(_crestId); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java index ed19bf976b..b32f8c0645 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitApplyInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_APPLY_INFO.writeId(packet); - packet.writeD(_status.ordinal()); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java index fc98b7b6f7..af4af9c9c1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitBoardDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_DETAIL.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClanId()); packet.writeD(_pledgeRecruitInfo.getKarma()); packet.writeS(_pledgeRecruitInfo.getInformation()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index b4d48373a6..eda808e754 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -34,7 +34,6 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket private final int _clanOnCurrentPage; private final int _startIndex; private final int _endIndex; - static final int CLAN_PER_PAGE = 12; public ExPledgeRecruitBoardSearch(List clanList, int currentPage) @@ -51,11 +50,9 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_SEARCH.writeId(packet); - packet.writeD(_currentPage); packet.writeD(_totalNumberOfPage); packet.writeD(_clanOnCurrentPage); - for (int i = _startIndex; i < _endIndex; i++) { packet.writeD(_clanList.get(i).getClanId()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 4ae5ffe316..b1f139226d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -40,7 +40,6 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java index 77080a3820..5844f220ec 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java @@ -39,7 +39,6 @@ public class ExPledgeWaitingList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST.writeId(packet); - packet.writeD(pledgePlayerRecruitInfos.size()); for (PledgeApplicantInfo recruitInfo : pledgePlayerRecruitInfos.values()) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java index a9245c1309..6b88572057 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java @@ -30,7 +30,6 @@ public class ExPledgeWaitingListAlarm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_ALARM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java index 60997b3da0..28c3967119 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java @@ -40,7 +40,6 @@ public class ExPledgeWaitingListApplied implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_APPLIED.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClan().getId()); packet.writeS(_pledgeRecruitInfo.getClan().getName()); packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java index 66a06892c2..1f53d1bb38 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java @@ -36,7 +36,6 @@ public class ExPledgeWaitingUser implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_USER.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getPlayerId()); packet.writeS(_pledgeRecruitInfo.getMessage()); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java index 49bc9b0995..5f404779f5 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java @@ -43,7 +43,6 @@ public class ExPrivateStoreSetWholeMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_objectId); packet.writeS(_msg); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java index cb5e8fbce9..ff996b5d0c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutCommissionResultForVariationMake implements IClientOutgoingPac public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_COMMISSION_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_gemstoneObjId); packet.writeD(_itemId); packet.writeQ(_gemstoneCount); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java index 81721e921f..098472b7ae 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantScrollItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SCROLL_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java index 871f377db2..ffea182a49 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java index c47a4bcff4..8016e128f4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java index c8b46be499..95c0c0e4e1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_INTENSIVE_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_refinerItemObjId); packet.writeD(_lifestoneItemId); packet.writeD(_gemstoneItemId); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 2128b2b19f..2970ca00a2 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -41,13 +41,12 @@ public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_CANCEL.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); packet.writeD(_itemAug1); packet.writeD(_itemAug2); packet.writeQ(_price); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java index 80541e65cd..c25dd16b01 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java @@ -34,10 +34,9 @@ public class ExPutItemResultForVariationMake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java index fe5eb74eb0..bc8896164d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java @@ -56,13 +56,12 @@ public class ExQuestNpcLogList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_NPC_LOG_LIST.writeId(packet); - packet.writeD(_questId); packet.writeC(_npcLogList.size()); for (NpcLogListHolder holder : _npcLogList) { packet.writeD(holder.isNpcString() ? holder.getId() : holder.getId() + 1000000); - packet.writeC(holder.isNpcString() ? 0x01 : 0x00); + packet.writeC(holder.isNpcString() ? 1 : 0); packet.writeD(holder.getCount()); } return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java index 62d622caff..60616b256d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java @@ -35,7 +35,6 @@ public class ExRedSky implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RED_SKY.writeId(packet); - packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java index ce40b1a792..163faff855 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java @@ -36,7 +36,6 @@ public class ExRegenMax implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REGEN_MAX.writeId(packet); - packet.writeD(1); packet.writeD(_time); packet.writeD(_tickInterval); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java index d864795cd6..a17525576b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java @@ -34,7 +34,6 @@ public class ExRemoveEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REMOVE_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 57ed88ac29..4e479e75a6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -56,7 +56,6 @@ public class ExReplyReceivedPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_RECEIVED_POST.writeId(packet); - packet.writeD(_msg.getMailType().ordinal()); // GOD if (_msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED) { @@ -76,11 +75,10 @@ public class ExReplyReceivedPost extends AbstractItemPacket } packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown packet.writeS(_msg.getSenderName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -92,9 +90,8 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeQ(_msg.getReqAdena()); packet.writeD(_msg.hasAttachments() ? 1 : 0); packet.writeD(_msg.isReturned() ? 1 : 0); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 75f6596194..ed490eae91 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -54,14 +54,12 @@ public class ExReplySentPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_SENT_POST.writeId(packet); - - packet.writeD(0x00); // GOD + packet.writeD(0); // GOD packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); packet.writeS(_msg.getReceiverName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -73,11 +71,11 @@ public class ExReplySentPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeQ(_msg.getReqAdena()); - packet.writeD(_msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(_msg.isReturned() ? 0x01 : 00); + packet.writeD(_msg.hasAttachments() ? 1 : 0); + packet.writeD(_msg.isReturned() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index cc4f7ce1d8..e6a3f9bca2 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -35,7 +35,6 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java index 2634aa1cdd..60201b177f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java @@ -35,7 +35,6 @@ public class ExRequestHackShield implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REQUEST_HACK_SHIELD.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java index c51ff31d0b..75e3b3a945 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java @@ -29,13 +29,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyList implements IClientOutgoingPacket { + public static final int SHOW_FACESHAPE = 1; + public static final int SHOW_HAIRSTYLE = 0; + private final Player _player; private final int _type; private final Map _beautyItem; - public static final int SHOW_FACESHAPE = 1; - public static final int SHOW_HAIRSTYLE = 0; - public ExResponseBeautyList(Player player, int type) { _player = player; @@ -54,7 +54,6 @@ public class ExResponseBeautyList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java index ca2ed360ab..4b19201833 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java @@ -25,16 +25,15 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket { + public static final int FAILURE = 0; + public static final int SUCCESS = 1; + public static final int CHANGE = 0; + public static final int RESTORE = 1; + private final Player _player; private final int _type; private final int _result; - public static final int FAILURE = 0; - public static final int SUCCESS = 1; - - public static final int CHANGE = 0; - public static final int RESTORE = 1; - public ExResponseBeautyRegistReset(Player player, int type, int result) { _player = player; @@ -46,7 +45,6 @@ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_REGIST_RESET.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java index 0e313ef3b7..c0922cfb04 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java @@ -36,10 +36,8 @@ public class ExResponseResetList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_RESET_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); - packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java index 01fe1945ef..a230033d67 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java @@ -37,7 +37,6 @@ public class ExRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ROTATION.writeId(packet); - packet.writeD(_charId); packet.writeD(_heading); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index c58ccfc233..2646a71e77 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -36,7 +36,6 @@ public class ExRpItemLink extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RP_ITEM_LINK.writeId(packet); - writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java index 04556bbed2..f0c6eba8e9 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java @@ -34,7 +34,6 @@ public class ExSearchOrc implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEARCH_ORC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index 1e06cc2a3f..7a4dced122 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -38,7 +38,6 @@ public class ExSendManorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_MANOR_LIST.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java index b63c69f37e..2c25cc8bfc 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java @@ -124,7 +124,6 @@ public class ExSendUIEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_UIEVENT.writeId(packet); - packet.writeD(_objectId); packet.writeD(_type); // 0 = show, 1 = hide (there is 2 = pause and 3 = resume also but they don't work well you can only pause count down and you cannot resume it because resume hides the counter). packet.writeD(0); // unknown diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java index 4378479707..716a3e8623 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java @@ -385,16 +385,13 @@ public class ExServerPrimitive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SERVER_PRIMITIVE.writeId(packet); - packet.writeS(_name); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(65535); // has to do something with display range and angle packet.writeD(65535); // has to do something with display range and angle - packet.writeD(_points.size() + _lines.size()); - for (Point point : _points) { packet.writeC(1); // Its the type in this case Point @@ -408,7 +405,6 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(point.getY()); packet.writeD(point.getZ()); } - for (Line line : _lines) { packet.writeC(2); // Its the type in this case Line diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java index fb32e199b2..51fb91b643 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java @@ -46,7 +46,6 @@ public class ExSetCompassZoneCode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_COMPASS_ZONE_CODE.writeId(packet); - packet.writeD(_zoneType); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java index 1d0fbae3a4..34dee8bda0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java @@ -38,7 +38,6 @@ public class ExSetPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_PARTY_LOOTING.writeId(packet); - packet.writeD(_result); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java index 7b14ec8412..4e491af9d1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java @@ -34,7 +34,6 @@ public class ExShowAdventurerGuideBook implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_ADVENTURER_GUIDE_BOOK.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index 82554fdc5f..1f8df76083 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -39,7 +39,6 @@ public class ExShowAgitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AGIT_INFO.writeId(packet); - final Collection clanHalls = ClanHallData.getInstance().getClanHalls(); packet.writeD(clanHalls.size()); clanHalls.forEach(clanHall -> diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index dd11ee0150..51e6646ff5 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -44,7 +44,6 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BASE_ATTRIBUTE_CANCEL_WINDOW.writeId(packet); - packet.writeD(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java index 14e55d39f3..e22345c4fd 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java @@ -25,13 +25,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExShowBeautyMenu implements IClientOutgoingPacket { - private final Player _player; - private final int _type; - // TODO: Enum public static final int MODIFY_APPEARANCE = 0; public static final int RESTORE_APPEARANCE = 1; + private final Player _player; + private final int _type; + public ExShowBeautyMenu(Player player, int type) { _player = player; @@ -42,7 +42,6 @@ public class ExShowBeautyMenu implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BEAUTY_MENU.writeId(packet); - packet.writeD(_type); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 15d011befc..b0d2b90494 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -41,7 +41,6 @@ public class ExShowCastleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CASTLE_INFO.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) @@ -65,8 +64,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } packet.writeD(castle.getTaxPercent(TaxType.BUY)); packet.writeD((int) (castle.getSiege().getSiegeDate().getTimeInMillis() / 1000)); - - packet.writeC(castle.getSiege().isInProgress() ? 0x01 : 0x00); // Grand Crusade + packet.writeC(castle.getSiege().isInProgress() ? 1 : 0); // Grand Crusade packet.writeC(castle.getSide().ordinal()); // Grand Crusade } return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java index aeb4079f3a..f9a6ebe0e7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java @@ -38,7 +38,6 @@ public class ExShowContactList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_SHOW_POST_FRIEND.writeId(packet); - packet.writeD(_contacts.size()); _contacts.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index a079ea3129..94b989b583 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -37,7 +37,6 @@ public class ExShowCropInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _crops = (nextPeriod && !manor.isManorApproved()) ? null : manor.getCropProcure(manorId, nextPeriod); } @@ -46,10 +45,9 @@ public class ExShowCropInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Crop Sales" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Crop Sales" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); + packet.writeD(0); if (_crops != null) { packet.writeD(_crops.size()); @@ -64,17 +62,17 @@ public class ExShowCropInfo implements IClientOutgoingPacket if (seed == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(seed.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(seed.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(seed.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index a1e06eb2bf..1c65dde1a6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -62,10 +62,8 @@ public class ExShowCropSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getCropId()); // crop id diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index ee9fa9fd37..b625a1e4e7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -39,7 +39,6 @@ public class ExShowFortressInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_INFO.writeId(packet); - final Collection forts = FortManager.getInstance().getForts(); packet.writeD(forts.size()); for (Fort fort : forts) @@ -47,7 +46,7 @@ public class ExShowFortressInfo implements IClientOutgoingPacket final Clan clan = fort.getOwnerClan(); packet.writeD(fort.getResidenceId()); packet.writeS(clan != null ? clan.getName() : ""); - packet.writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00); + packet.writeD(fort.getSiege().isInProgress() ? 1 : 0); // Time of possession packet.writeD(fort.getOwnedTime()); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index f389b26ed5..678ab43e96 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -42,11 +42,9 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_MAP_INFO.writeId(packet); - packet.writeD(_fortress.getResidenceId()); packet.writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status packet.writeD(_fortress.getFortSize()); // barracks count - final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId()); if ((commanders != null) && !commanders.isEmpty() && _fortress.getSiege().isInProgress()) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 27da99cf41..da186103ae 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -51,7 +51,6 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_SIEGE_INFO.writeId(packet); - packet.writeD(_fortId); // Fortress Id packet.writeD(_size); // Total Barracks Count if (_csize > 0) @@ -64,22 +63,22 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { case 0: { - packet.writeD(0x03); + packet.writeD(3); break; } case 1: { - packet.writeD(0x02); + packet.writeD(2); break; } case 2: { - packet.writeD(0x01); + packet.writeD(1); break; } case 3: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -92,27 +91,27 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket // TODO: once control room supported, update packet.writeD(0x0x) to support 5th room case 0: { - packet.writeD(0x05); + packet.writeD(5); break; } case 1: { - packet.writeD(0x04); + packet.writeD(4); break; } case 2: { - packet.writeD(0x03); + packet.writeD(3); break; } case 3: { - packet.writeD(0x02); + packet.writeD(2); break; } case 4: { - packet.writeD(0x01); + packet.writeD(1); break; } } @@ -124,7 +123,7 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { for (int i = 0; i < _size; i++) { - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java index 8bb38fd28c..bc1e679418 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java @@ -41,8 +41,7 @@ public class ExShowManorDefaultInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_MANOR_DEFAULT_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" and "Crop Sales" buttons + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" and "Crop Sales" buttons packet.writeD(_crops.size()); for (Seed crop : _crops) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 1d3312d668..d03ce2a5fd 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -52,10 +52,8 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet); - packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java index cf38d18c1c..f41999329f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java @@ -34,7 +34,6 @@ public class ExShowQuestInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_INFO.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java index 70f31e318f..0fa64c401d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java @@ -37,7 +37,6 @@ public class ExShowQuestMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_MARK.writeId(packet); - packet.writeD(_questId); packet.writeD(_questState); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index ab85228caf..1a6ee00a10 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ExShowReceivedPostList implements IClientOutgoingPacket { - private final List _inbox; - private static final int MESSAGE_FEE = 100; private static final int MESSAGE_FEE_PER_SLOT = 1000; + private final List _inbox; + public ExShowReceivedPostList(int objectId) { _inbox = MailManager.getInstance().getInbox(objectId); @@ -45,7 +45,6 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { @@ -64,18 +63,18 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getSenderName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); + packet.writeD(msg.isUnread() ? 1 : 0); packet.writeD(((msg.getMailType() == MailType.COMMISSION_ITEM_SOLD) || (msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED)) ? 0 : 1); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(msg.isReturned() ? 0x01 : 0x00); - packet.writeD(0x00); // SysString in some case it seems + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(msg.isReturned() ? 1 : 0); + packet.writeD(0); // SysString in some case it seems } } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(MESSAGE_FEE); packet.writeD(MESSAGE_FEE_PER_SLOT); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java index 9679468789..deebb99c8f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java @@ -33,6 +33,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; */ public class ExShowScreenMessage implements IClientOutgoingPacket { + // Positions + public static final byte TOP_LEFT = 1; + public static final byte TOP_CENTER = 2; + public static final byte TOP_RIGHT = 3; + public static final byte MIDDLE_LEFT = 4; + public static final byte MIDDLE_CENTER = 5; + public static final byte MIDDLE_RIGHT = 6; + public static final byte BOTTOM_CENTER = 7; + public static final byte BOTTOM_RIGHT = 8; + private final int _type; private final int _sysMessageId; private final int _unk1; @@ -48,15 +58,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket private List _parameters; // Localisation related. private String _lang; - // Positions - public static final byte TOP_LEFT = 0x01; - public static final byte TOP_CENTER = 0x02; - public static final byte TOP_RIGHT = 0x03; - public static final byte MIDDLE_LEFT = 0x04; - public static final byte MIDDLE_CENTER = 0x05; - public static final byte MIDDLE_RIGHT = 0x06; - public static final byte BOTTOM_CENTER = 0x07; - public static final byte BOTTOM_RIGHT = 0x08; public void setLang(String lang) { @@ -265,7 +266,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SCREEN_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -284,9 +284,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(sml.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -308,9 +308,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -318,7 +318,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket } } } - packet.writeD(_type); packet.writeD(_sysMessageId); packet.writeD(_position); @@ -326,9 +325,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java index 29ab5d355f..6123b08991 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java @@ -37,7 +37,6 @@ public class ExShowSeedInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _seeds = (nextPeriod && !manor.isManorApproved()) ? null : manor.getSeedProduction(manorId, nextPeriod); } @@ -46,16 +45,14 @@ public class ExShowSeedInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown if (_seeds == null) { packet.writeD(0); return true; } - packet.writeD(_seeds.size()); for (SeedProduction seed : _seeds) { @@ -67,17 +64,17 @@ public class ExShowSeedInfo implements IClientOutgoingPacket if (s == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(s.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(s.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(s.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java index e628099700..eb6e686e10 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java @@ -32,13 +32,10 @@ public class ExShowSeedMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_MAP_INFO.writeId(packet); - packet.writeD(2); // seed count - // Seed of Destruction packet.writeD(1); // id 1? Grand Crusade packet.writeD(2770 + GraciaSeedsManager.getInstance().getSoDState()); // sys msg id - // Seed of Infinity packet.writeD(2); // id 2? Grand Crusade // Manager not implemented yet diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index c9bf485ee2..05c0401a7c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -62,10 +62,8 @@ public class ExShowSeedSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getSeedId()); // seed id diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 1994402da2..269bec5b97 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -47,7 +47,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _cropsItems.put(cropId, item); } } - for (CropProcure crop : CastleManorManager.getInstance().getCropProcure(_manorId, false)) { if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) @@ -61,7 +60,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_cropsItems.size()); // size for (Item item : _cropsItems.values()) @@ -70,9 +68,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket packet.writeD(item.getObjectId()); // Object id packet.writeD(item.getId()); // crop id packet.writeD(seed.getLevel()); // seed level - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(1)); // reward 1 id - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(2)); // reward 2 id if (_castleCrops.containsKey(item.getId())) { @@ -85,9 +83,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket else { packet.writeD(0xFFFFFFFF); // manor - packet.writeQ(0x00); // buy residual - packet.writeQ(0x00); // buy price - packet.writeC(0x00); // reward + packet.writeQ(0); // buy residual + packet.writeQ(0); // buy price + packet.writeC(0); // reward } packet.writeQ(item.getCount()); // my crops } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index db4bccc928..b61d5b2301 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -40,7 +40,6 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { @@ -50,17 +49,17 @@ public class ExShowSentPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getReceiverName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); - packet.writeD(0x01); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(msg.isUnread() ? 1 : 0); + packet.writeD(1); + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(0); } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java index 0e4e9fd2ef..0dca57f2f8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java @@ -48,7 +48,6 @@ public class ExShowTerritory implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TERRITORY.writeId(packet); - packet.writeD(_vertices.size()); packet.writeD(_minZ); packet.writeD(_maxZ); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java index 4e284f82c5..86e1009bbf 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java @@ -46,7 +46,6 @@ public class ExShowTrace implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TRACE.writeId(packet); - packet.writeH(0); // type broken in H5 packet.writeD(0); // time broken in H5 packet.writeH(_locations.size()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java index 3245767ed7..836a5c9624 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java @@ -44,7 +44,6 @@ public class ExShowUsm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_USM.writeId(packet); - packet.writeD(_videoId); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java index 4acdffa842..1f1a14c31b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java @@ -34,7 +34,6 @@ public class ExShowVariationCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_CANCEL_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java index 3a2298019e..9870424e26 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java @@ -35,7 +35,6 @@ public class ExShowVariationMakeWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_MAKE_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java index 169827bab3..86211c8d97 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java @@ -44,10 +44,9 @@ public class ExSpawnEmitter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SPAWN_EMITTER.writeId(packet); - packet.writeD(_npcObjectId); packet.writeD(_playerObjectId); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java index 620800c1c4..534549b4fe 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java @@ -36,7 +36,6 @@ public class ExStartScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_START_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java index 0bd990cf34..babac59129 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java index 0e2689d598..d3e67afe99 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipObjId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java index 44b064113f..f5b3e1340f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java @@ -36,7 +36,6 @@ public class ExStopScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index 0b1e077353..7c8def3864 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -66,7 +66,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket } OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet); - packet.writeD(_inventory); packet.writeD(_warehouse); packet.writeD(_freight); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java index 3293a5b557..57563ca2f9 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java @@ -39,7 +39,6 @@ public class ExSubPledgeSkillAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUB_PLEDGET_SKILL_ADD.writeId(packet); - packet.writeD(_type); packet.writeD(_skillId); packet.writeD(_skillLevel); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java index d61dfa20ab..816d6f16a6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java @@ -97,7 +97,6 @@ public class ExSubjobInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUBJOB_INFO.writeId(packet); - packet.writeC(_type); packet.writeD(_currClassId); packet.writeD(_currRace); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java index 85616016c7..b7a152629d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java @@ -38,7 +38,6 @@ public class ExTacticalSign implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TACTICAL_SIGN.writeId(packet); - packet.writeD(_target.getObjectId()); packet.writeD(_tokenId); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java index 3486e6281d..9e03a8bd0a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java @@ -39,7 +39,6 @@ public class ExTeleportToLocationActivate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_TO_LOCATION_ACTIVATE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java index a214c53a0f..7bcddd964d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java @@ -27,6 +27,7 @@ public class ExUISetting implements IClientOutgoingPacket { public static final String UI_KEY_MAPPING_VAR = "UI_KEY_MAPPING"; public static final String SPLIT_VAR = " "; + private final byte[] _uiKeyMapping; public ExUISetting(Player player) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java index 187770cfc8..eff4285a8b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java @@ -37,7 +37,6 @@ public class ExUnReadMailCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_UN_READ_MAIL_COUNT.writeId(packet); - packet.writeD(_mailUnreadCount); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java index f992b3c937..e59c651371 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java @@ -41,7 +41,6 @@ public class ExUseSharedGroupItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USE_SHARED_GROUP_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeD(_grpId); packet.writeD(_remainingTime); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java index 474fcc5208..f49d451587 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class ExUserInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getTransformationId()); - final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); final boolean isInvisible = _player.isInvisible(); packet.writeD(abnormalVisualEffects.size() + (isInvisible ? 1 : 0)); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java index b841449ab3..1069a64e3e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java @@ -36,12 +36,9 @@ public class ExUserInfoCubic implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_CUBIC.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(_player.getCubics().size()); - _player.getCubics().keySet().forEach(packet::writeH); - packet.writeD(_player.getAgathionId()); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java index 048986d108..7a0d1bfd74 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java @@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExUserInfoEquipSlot extends AbstractMaskPacket { private final Player _player; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -63,11 +62,9 @@ public class ExUserInfoEquipSlot extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_EQUIP_SLOT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(InventorySlot.values().length); packet.writeB(_masks); - final PlayerInventory inventory = _player.getInventory(); for (InventorySlot slot : InventorySlot.values()) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java index 3eb1cf9578..d655e48843 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java @@ -36,7 +36,6 @@ public class ExUserInfoInvenWeight implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_INVEN_WEIGHT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java index 91e0e92338..16aa81e9c0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java @@ -44,7 +44,6 @@ public class ExValidateLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java index 727267c9d5..50cb4025e4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java @@ -35,7 +35,6 @@ public class ExVariationCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_CANCEL_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java index 5cdc1b8d0e..4fde190ae2 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java @@ -32,14 +32,13 @@ public class ExVariationResult implements IClientOutgoingPacket { _option1 = option1; _option2 = option2; - _success = success ? 0x01 : 0x00; + _success = success ? 1 : 0; } @Override public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_RESULT.writeId(packet); - packet.writeD(_option1); packet.writeD(_option2); packet.writeD(_success); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java index db0acfd5ff..60fb57c0b3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java @@ -41,10 +41,9 @@ public class ExVitalityEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_EFFECT_INFO.writeId(packet); - packet.writeD(_points); packet.writeD(_vitalityBonus); // Vitality Bonus - packet.writeH(0x00); // Vitality additional bonus in % + packet.writeH(0); // Vitality additional bonus in % packet.writeH(_vitalityItemsRemaining); // How much vitality items remaining for use packet.writeH(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java index 3cd9d26602..9a401c2321 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java @@ -35,7 +35,6 @@ public class ExVitalityPointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_POINT_INFO.writeId(packet); - packet.writeD(_vitalityPoints); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java index 71baff96ea..c4c5539ca4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java @@ -45,7 +45,6 @@ public class ExVoteSystemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VOTE_SYSTEM_INFO.writeId(packet); - packet.writeD(_recomLeft); packet.writeD(_recomHave); packet.writeD(_bonusTime); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java index 21411f5abc..452b0dc43a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java @@ -37,7 +37,6 @@ public class ExWorldChatCnt implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_WORLD_CHAT_CNT.writeId(packet); - packet.writeD(_points); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java index 5f935fe0dc..dc9c2288f8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java @@ -79,19 +79,17 @@ public class FakePlayerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // vehicleId + packet.writeD(0); // vehicleId packet.writeD(_objId); packet.writeS(_npc.getName()); - packet.writeH(_npc.getRace().ordinal()); - packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 0x01 : 0x00); + packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 1 : 0); packet.writeD(_fpcHolder.getClassId()); - - packet.writeD(0x00); // Inventory.PAPERDOLL_UNDER + packet.writeD(0); // Inventory.PAPERDOLL_UNDER packet.writeD(_fpcHolder.getEquipHead()); packet.writeD(_fpcHolder.getEquipRHand()); packet.writeD(_fpcHolder.getEquipLHand()); @@ -103,28 +101,22 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_fpcHolder.getEquipRHand()); // dual hand packet.writeD(_fpcHolder.getEquipHair()); packet.writeD(_fpcHolder.getEquipHair2()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderAugument()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } - packet.writeC(_fpcHolder.getArmorEnchantLevel()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderVisualId()) { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeC(_npc.getScriptValue()); // getPvpFlag() packet.writeD(_npc.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -135,16 +127,12 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_npc.getCollisionRadius()); packet.writeF(_npc.getCollisionHeight()); - packet.writeD(_fpcHolder.getHair()); packet.writeD(_fpcHolder.getHairColor()); packet.writeD(_fpcHolder.getFace()); - packet.writeS(_npc.getTemplate().getTitle()); - if (_clan != null) { packet.writeD(_clan.getId()); @@ -154,71 +142,51 @@ public class FakePlayerInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - - packet.writeC(0x01); // isSitting() ? 0x00 : 0x01 (at some initial tests it worked) - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); - packet.writeC(_npc.isInCombat() ? 0x01 : 0x00); - - packet.writeC(_npc.isAlikeDead() ? 0x01 : 0x00); - - packet.writeC(_npc.isInvisible() ? 0x01 : 0x00); - - packet.writeC(0x00); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount - packet.writeC(0x00); // getPrivateStoreType().getId() - - packet.writeH(0x00); // getCubics().size() + packet.writeC(1); // isSitting() ? 0 : 1 (at some initial tests it worked) + packet.writeC(_npc.isRunning() ? 1 : 0); + packet.writeC(_npc.isInCombat() ? 1 : 0); + packet.writeC(_npc.isAlikeDead() ? 1 : 0); + packet.writeC(_npc.isInvisible() ? 1 : 0); + packet.writeC(0); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount + packet.writeC(0); // getPrivateStoreType().getId() + packet.writeH(0); // getCubics().size() // getCubics().keySet().forEach(packet::writeH); - packet.writeC(0x00); - + packet.writeC(0); packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : 0); packet.writeH(_fpcHolder.getRecommends()); - packet.writeD(0x00); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 - + packet.writeD(0); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 packet.writeD(_fpcHolder.getClassId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(_fpcHolder.getWeaponEnchantLevel()); // isMounted() ? 0 : _enchantLevel - packet.writeC(_npc.getTeam().getId()); - - packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0x00); + packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0); packet.writeC(_fpcHolder.getNobleLevel()); - packet.writeC(_fpcHolder.isHero() ? 0x01 : 0x00); - - packet.writeC(_fpcHolder.isFishing() ? 0x01 : 0x00); - + packet.writeC(_fpcHolder.isHero() ? 1 : 0); + packet.writeC(_fpcHolder.isFishing() ? 1 : 0); packet.writeD(_fpcHolder.getBaitLocationX()); packet.writeD(_fpcHolder.getBaitLocationY()); packet.writeD(_fpcHolder.getBaitLocationZ()); - packet.writeD(_fpcHolder.getNameColor()); - packet.writeD(_heading); - packet.writeC(_fpcHolder.getPledgeStatus()); - packet.writeH(0x00); // getPledgeType() - + packet.writeH(0); // getPledgeType() packet.writeD(_fpcHolder.getTitleColor()); - - packet.writeC(0x00); // isCursedWeaponEquipped - - packet.writeD(0x00); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 - packet.writeD(0x00); // getTransformationDisplayId() + packet.writeC(0); // isCursedWeaponEquipped + packet.writeD(0); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 + packet.writeD(0); // getTransformationDisplayId() packet.writeD(_fpcHolder.getAgathionId()); - - packet.writeC(0x00); - - packet.writeD(0x00); // getCurrentCp() + packet.writeC(0); + packet.writeD(0); // getCurrentCp() packet.writeD(_npc.getMaxHp()); packet.writeD((int) Math.round(_npc.getCurrentHp())); packet.writeD(_npc.getMaxMp()); packet.writeD((int) Math.round(_npc.getCurrentMp())); - - packet.writeC(0x00); + packet.writeC(0); final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) @@ -229,9 +197,9 @@ public class FakePlayerInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(0x00); // cocPlayer.getPosition() - packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 0x01 : 0x00); - packet.writeC(0x00); // Used Ability Points + packet.writeC(0); // cocPlayer.getPosition() + packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 1 : 0); + packet.writeC(0); // Used Ability Points return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java index ae088538da..03223c8a3e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java @@ -62,7 +62,6 @@ public class FlyToLocation implements IClientOutgoingPacket _destY = destY; _destZ = destZ; _type = type; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -82,7 +81,6 @@ public class FlyToLocation implements IClientOutgoingPacket _flySpeed = flySpeed; _flyDelay = flyDelay; _animationSpeed = animationSpeed; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -103,7 +101,6 @@ public class FlyToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FLY_TO_LOCATION.writeId(packet); - packet.writeD(_chaObjId); packet.writeD(_destX); packet.writeD(_destY); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java index 1e52b0ef72..471d70f791 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java @@ -35,8 +35,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x01); + packet.writeC(1); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 81a384642c..fb7572fc5d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -50,7 +50,6 @@ public class GMHennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GMHENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON @@ -64,19 +63,19 @@ public class GMHennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(0x01); + packet.writeD(1); } if (_player.getHenna(4) != null) { packet.writeD(_player.getHenna(4).getDyeId()); - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 1 : 0); } else { - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid } return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java index 38ca4c7be0..59bf0d9d93 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java @@ -38,7 +38,6 @@ public class GMHide implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_HIDE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index cb55430def..7da70fb85a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -50,7 +50,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -79,28 +78,24 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); packet.writeD(_player.getPkKills()); - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollObjectId(slot)); } - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); } - for (int slot : getPaperdollOrder()) { final VariationInstance augment = _player.getInventory().getPaperdollAugmentation(slot); packet.writeD(augment != null ? augment.getOption1Id() : 0); // Confirmed packet.writeD(augment != null ? augment.getOption2Id() : 0); // Confirmed } - packet.writeC(_player.getInventory().getTalismanSlots()); // CT2.3 packet.writeC(_player.getInventory().canEquipCloak() ? 1 : 0); // CT2.3 - packet.writeD(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeH(0); packet.writeD(_player.getPAtk()); packet.writeD(_player.getPAtkSpd()); packet.writeD(_player.getPDef()); @@ -108,18 +103,14 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAccuracy()); packet.writeD(_player.getCriticalHit()); packet.writeD(_player.getMAtk()); - packet.writeD(_player.getMAtkSpd()); packet.writeD(_player.getPAtkSpd()); - packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicEvasionRate()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name packet.writeD(_player.getReputation()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -135,8 +126,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeD(_player.isGM() ? 0x01 : 0x00); // builder level - + packet.writeD(_player.isGM() ? 1 : 0); // builder level packet.writeS(_player.getTitle()); packet.writeD(_player.getClanId()); // pledge id packet.writeD(_player.getClanCrestId()); // pledge crest id @@ -146,26 +136,19 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeC(_player.getCreateItemLevel() > 0 ? 1 : 0); packet.writeD(_player.getPkKills()); packet.writeD(_player.getPvpKills()); - packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); - - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeC(321); - packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window - packet.writeC(_player.getNobleLevel()); - packet.writeC(_player.isHero() ? 0x01 : 0x00); - + packet.writeC(_player.isHero() ? 1 : 0); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); - final AttributeType attackAttribute = _player.getAttackElement(); packet.writeH(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); @@ -175,8 +158,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket } packet.writeD(_player.getFame()); packet.writeD(_player.getVitalityPoints()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index 1d88596096..552b6e6168 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -37,14 +37,12 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_player.getName()); packet.writeD(_clan.getId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); @@ -52,15 +50,14 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 packet.writeD(_clan.getAllyCrestId()); // c2 packet.writeD(_clan.isAtWar() ? 1 : 0); // c3 - packet.writeD(0x00); // T3 Unknown - + packet.writeD(0); // T3 Unknown packet.writeD(_clan.getMembers().size()); for (ClanMember member : _clan.getMembers()) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java index 93af10e254..3c155ff816 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -38,10 +38,8 @@ public class GMViewSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_SKILL_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_skills.size()); - final boolean isDisabled = (_player.getClan() != null) && (_player.getClan().getReputationScore() < 0); for (Skill skill : _skills) { @@ -49,7 +47,7 @@ public class GMViewSkillInfo implements IClientOutgoingPacket packet.writeH(skill.getDisplayLevel()); packet.writeH(skill.getSubLevel()); packet.writeD(skill.getDisplayId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(isDisabled && skill.isClanSkill() ? 1 : 0); packet.writeC(skill.isEnchantable() ? 1 : 0); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index f49138fafe..c909d5e6e1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -51,7 +51,6 @@ public class GMViewWarehouseWithdrawList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_WAREHOUSE_WITHDRAW_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java index d8c273f914..449271993b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java @@ -35,7 +35,6 @@ public class GameGuardQuery implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GAME_GUARD_QUERY.writeId(packet); - packet.writeD(0x27533DD9); packet.writeD(0x2E72A51D); packet.writeD(0x2017038B); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index b0c011b696..037b2e6b6b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -35,10 +35,8 @@ public class GetItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ITEM.writeId(packet); - packet.writeD(_playerId); packet.writeD(_item.getObjectId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java index f8c6126c87..5f4d7bf3ca 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java @@ -50,7 +50,6 @@ public class GetOffVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_OFF_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_x); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java index ffa8d5f310..77d1e6ba28 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java @@ -45,7 +45,6 @@ public class GetOnVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ON_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java index e5dcb9ded6..b1f5b588f9 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java @@ -44,14 +44,13 @@ public class GmViewQuestInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_QUEST_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeH(_questList.size()); // quest count - for (Quest quest : _questList) { final QuestState qs = _player.getQuestState(quest.getName()); packet.writeD(quest.getId()); packet.writeD(qs == null ? 0 : qs.getCond()); } - packet.writeH(0x00); // some size + packet.writeH(0); // some size // for size; ddQQ return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 395487097c..4309e2d74f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -51,7 +51,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeQ(_player.getAdena()); // activeChar current amount of Adena packet.writeD(3); // available equip slot packet.writeD(_hennaEquipList.size()); - for (Henna henna : _hennaEquipList) { // Player must have at least one dye in inventory @@ -62,8 +61,8 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); // item Id of the dye packet.writeQ(henna.getWearCount()); // amount of dyes required packet.writeQ(henna.getWearFee()); // amount of Adena required - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not - packet.writeD(0x00); // TODO: Find me! + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // meet the requirement or not + packet.writeD(0); // TODO: Find me! } } return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 30dc837721..b84d2283e8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -51,7 +51,6 @@ public class HennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON @@ -65,9 +64,8 @@ public class HennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); } - final Henna premium = _player.getHenna(4); if (premium != null) { @@ -77,16 +75,15 @@ public class HennaInfo implements IClientOutgoingPacket final long currentTime = Chronos.currentTimeMillis(); duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000; } - packet.writeD(premium.getDyeId()); packet.writeD(duration); // Premium Slot Dye Time Left - packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 1 : 0); } else { - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid } return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index cf3d83263f..5b77709720 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -40,12 +40,11 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_ITEM_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getWearCount()); // total amount of dye require packet.writeQ(_henna.getWearFee()); // total amount of Adena require to draw symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to draw or not 0 is false and 1 is true + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to draw or not 0 is false and 1 is true packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() + _player.getHennaValue(BaseStat.INT)); // equip INT @@ -63,7 +62,7 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket packet.writeH(_player.getLUC() + _player.getHennaValue(BaseStat.LUC)); // equip LUC packet.writeD(_player.getCHA()); // current CHA packet.writeH(_player.getCHA() + _player.getHennaValue(BaseStat.CHA)); // equip CHA - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index cb1379ac29..fc93d02a73 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -40,12 +40,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getCancelCount()); // total amount of dye require packet.writeQ(_henna.getCancelFee()); // total amount of Adena require to remove symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to remove or not + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to remove or not packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() - _player.getHennaValue(BaseStat.INT)); // equip INT @@ -63,7 +62,7 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket packet.writeH(_player.getLUC() - _player.getHennaValue(BaseStat.LUC)); // equip LUC packet.writeD(_player.getCHA()); // current CHA packet.writeH(_player.getCHA() - _player.getHennaValue(BaseStat.CHA)); // equip CHA - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 844fad86c7..452d354ac4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -39,7 +39,7 @@ public class HennaRemoveList implements IClientOutgoingPacket OutgoingPackets.HENNA_UNEQUIP_LIST.writeId(packet); packet.writeQ(_player.getAdena()); final boolean premiumSlotEnabled = _player.getHenna(4) != null; - packet.writeD(premiumSlotEnabled ? 0x04 : 0x03); // seems to be max size + packet.writeD(premiumSlotEnabled ? 4 : 3); // seems to be max size packet.writeD((premiumSlotEnabled ? 4 : 3) - _player.getHennaEmptySlots()); // slots used for (Henna henna : _player.getHennaList()) { @@ -49,8 +49,8 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); packet.writeQ(henna.getCancelCount()); packet.writeQ(henna.getCancelFee()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index e7d3f6f386..e0d5fe7c3f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -67,14 +67,12 @@ public interface IClientOutgoingPacket extends IOutgoingPacket Inventory.PAPERDOLL_BROOCH_JEWEL5, Inventory.PAPERDOLL_BROOCH_JEWEL6 }; - int[] PAPERDOLL_ORDER_AUGMENT = new int[] { Inventory.PAPERDOLL_RHAND, Inventory.PAPERDOLL_LHAND, Inventory.PAPERDOLL_RHAND }; - int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 0c54e810f0..3378827f34 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -46,7 +46,6 @@ public class InventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index c4598a72e6..cef69ecb6f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -59,8 +59,8 @@ public class ItemList extends AbstractItemPacket } else { - packet.writeC(0x01); // _showWindow ? 0x01 : 0x00 - packet.writeD(0x00); + packet.writeC(1); // _showWindow ? 1 : 0 + packet.writeD(0); packet.writeD(_items.size()); } writeInventoryBlock(packet, _player.getInventory()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java index b32b4df4a3..c3b9918230 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java @@ -32,9 +32,8 @@ public class JoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PARTY.writeId(packet); - packet.writeD(_response); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java index 65e06efeb7..f347f7efcd 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java @@ -32,7 +32,6 @@ public class JoinPledge implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PLEDGE.writeId(packet); - packet.writeD(_pledgeId); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index 96f6d7c34d..996622b9e9 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -35,17 +35,16 @@ public class KeyPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VERSION_CHECK.writeId(packet); - packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok for (int i = 0; i < 8; i++) { packet.writeC(_key[i]); // key } - packet.writeD(0x01); + packet.writeD(1); packet.writeD(Config.SERVER_ID); // server id - packet.writeC(0x01); - packet.writeD(0x00); // obfuscation key - packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 0x01 : 0x00); // isClassic + packet.writeC(1); + packet.writeD(0); // obfuscation key + packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 1 : 0); // isClassic return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java index 484c10f0c4..62424fd03a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java @@ -40,7 +40,6 @@ public class L2FriendSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_SAY.writeId(packet); - packet.writeD(0); // ?? packet.writeS(_receiver); packet.writeS(_sender); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java index b875edb772..790d599b5b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java @@ -32,11 +32,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ListPartyWaiting implements IClientOutgoingPacket { + private static final int NUM_PER_PAGE = 64; + private final List _rooms = new LinkedList<>(); private final int _size; - private static final int NUM_PER_PAGE = 64; - public ListPartyWaiting(PartyMatchingRoomLevelType type, int location, int page, int requestorLevel) { final List rooms = MatchingRoomManager.getInstance().getPartyMathchingRooms(location, type, requestorLevel); @@ -57,7 +57,6 @@ public class ListPartyWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_PARTY_WATING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java index 4f8f9adc64..bb0ac61dbd 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java @@ -54,7 +54,6 @@ public class LoginFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LOGIN_FAIL.writeId(packet); - packet.writeD(_success); packet.writeD(_reason); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java index 18a522c315..6743e3e66f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java @@ -32,7 +32,6 @@ public class MagicSkillCanceld implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_CANCELED.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java index d56de10079..7ab29cc1a8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java @@ -66,7 +66,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // MagicSkillUse castingType packet.writeD(_objectId); packet.writeD(_skillId); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java index 3df8463279..a86626cfa6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java @@ -84,7 +84,6 @@ public class MagicSkillUse implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_USE.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // Casting bar type: 0 - default, 1 - default up, 2 - blue, 3 - green, 4 - red. packet.writeD(_creature.getObjectId()); packet.writeD(_target.getObjectId()); @@ -111,7 +110,7 @@ public class MagicSkillUse implements IClientOutgoingPacket packet.writeD(_target.getX()); packet.writeD(_target.getY()); packet.writeD(_target.getZ()); - packet.writeD(_actionId >= 0 ? 0x01 : 0x00); // 1 when ID from RequestActionUse is used + packet.writeD(_actionId >= 0 ? 1 : 0); // 1 when ID from RequestActionUse is used packet.writeD(_actionId >= 0 ? _actionId : 0); // ID from RequestActionUse. Used to set cooldown on summon skills. return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java index 6b710c692e..12e2488f24 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java @@ -37,11 +37,9 @@ public class ManagePledgePower implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet); - packet.writeD(_rank); packet.writeD(_action); packet.writeD(_clan.getRankPrivs(_rank).getBitmask()); - return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 95f4b6f201..4e2ab3f00b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -42,11 +42,9 @@ public class MonRaceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MON_RACE_INFO.writeId(packet); - packet.writeD(_unknown1); packet.writeD(_unknown2); - packet.writeD(0x08); - + packet.writeD(8); for (int i = 0; i < 8; i++) { packet.writeD(_monsters[i].getObjectId()); // npcObjectID @@ -68,7 +66,7 @@ public class MonRaceInfo implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java index 0093b3edc9..e6386921ff 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java @@ -45,13 +45,10 @@ public class MoveToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_xDst); packet.writeD(_yDst); packet.writeD(_zDst); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java index b1fb3ea003..59103c6c4c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java @@ -48,7 +48,6 @@ public class MoveToLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java index 30ff3c96af..aa261f924f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java @@ -50,11 +50,9 @@ public class MoveToPawn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_PAWN.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetId); packet.writeD(_distance); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index e1da19cc8f..50ff0191b8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -58,18 +58,16 @@ public class MultiSellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.MULTI_SELL_LIST.writeId(packet); - - packet.writeC(0x00); // Helios + packet.writeC(0); // Helios packet.writeD(_list.getId()); // list id - packet.writeC(0x00); // GOD Unknown + packet.writeC(0); // GOD Unknown packet.writeD(1 + (_index / PAGE_SIZE)); // page started from 1 - packet.writeD(_finished ? 0x01 : 0x00); // finished + packet.writeD(_finished ? 1 : 0); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - packet.writeC(0x00); // Grand Crusade - packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window - packet.writeD(0x20); // Helios - Always 32 - + packet.writeC(0); // Grand Crusade + packet.writeC(_list.isChanceMultisell() ? 1 : 0); // new multisell window + packet.writeD(32); // Helios - Always 32 while (_size-- > 0) { ItemInfo itemEnchantment = _list.getItemEnchantment(_index); @@ -86,19 +84,15 @@ public class MultiSellList extends AbstractItemPacket } } } - packet.writeD(_index); // Entry ID. Start from 1. packet.writeC(entry.isStackable() ? 1 : 0); - // Those values will be passed down to MultiSellChoose packet. packet.writeH(itemEnchantment != null ? itemEnchantment.getEnchantLevel() : 0); // enchant level writeItemAugment(packet, itemEnchantment); writeItemElemental(packet, itemEnchantment); writeItemEnsoulOptions(packet, itemEnchantment); - packet.writeH(entry.getProducts().size()); packet.writeH(entry.getIngredients().size()); - for (ItemChanceHolder product : entry.getProducts()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(product.getId()); @@ -122,7 +116,6 @@ public class MultiSellList extends AbstractItemPacket writeItemElemental(packet, displayItemEnchantment); writeItemEnsoulOptions(packet, displayItemEnchantment); } - for (ItemChanceHolder ingredient : entry.getIngredients()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(ingredient.getId()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java index 6e85f5348c..cd46aac3aa 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java @@ -45,11 +45,10 @@ public class MyTargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MY_TARGET_SELECTED.writeId(packet); - - packet.writeD(0x01); // Grand Crusade + packet.writeD(1); // Grand Crusade packet.writeD(_objectId); packet.writeH(_color); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java index 1901ad1297..166c5c1e00 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java @@ -36,7 +36,6 @@ public class NewCharacterSuccess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NEW_CHARACTER_SUCCESS.writeId(packet); - packet.writeD(_chars.size()); for (PlayerTemplate chr : _chars) { @@ -44,31 +43,24 @@ public class NewCharacterSuccess implements IClientOutgoingPacket { continue; } - // TODO: Unhardcode these packet.writeD(chr.getRace().ordinal()); packet.writeD(chr.getClassId().getId()); - packet.writeD(99); packet.writeD(chr.getBaseSTR()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseDEX()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseCON()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseINT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseWIT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseMEN()); packet.writeD(1); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java index be1605f679..6061ea26ef 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java @@ -38,7 +38,6 @@ public class NicknameChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NICK_NAME_CHANGED.writeId(packet); - packet.writeD(_objectId); packet.writeS(_title); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index f9cd107e2c..3e4837b4a4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -54,24 +54,20 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public NpcHtmlMessage(int npcObjId, int itemId) { super(npcObjId); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } public NpcHtmlMessage(int npcObjId, int itemId, String html) { super(npcObjId, html); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } @@ -79,11 +75,10 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java index 61f195e35d..05489103cb 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java @@ -47,10 +47,8 @@ public class NpcInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -58,7 +56,6 @@ public class NpcInfo extends AbstractMaskPacket private int _clanId = 0; private int _statusMask = 0; private final Set _abnormalVisualEffects; - private String[] _localisation; public void setLang(String lang) @@ -101,112 +98,90 @@ public class NpcInfo extends AbstractMaskPacket { addComponentType(NpcInfoType.HEADING); } - if ((npc.getStat().getPAtkSpd() > 0) || (npc.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (npc.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((npc.getLeftHandItem() > 0) || (npc.getRightHandItem() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (npc.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (npc.getDisplayEffect() > 0) { addComponentType(NpcInfoType.DISPLAY_EFFECT); } - if (npc.isInsideZone(ZoneId.WATER) || npc.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (npc.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (npc.getCloneObjId() > 0) { addComponentType(NpcInfoType.CLONE); } - if (npc.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (npc.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (npc.getCurrentHp() <= npc.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (npc.getCurrentMp() <= npc.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (npc.getTemplate().isUsingServerSideName()) { addComponentType(NpcInfoType.NAME); } - if (npc.getTemplate().isUsingServerSideTitle() || (npc.isMonster() && (Config.SHOW_NPC_LEVEL || Config.SHOW_NPC_AGGRESSION)) || npc.isChampion() || npc.isTrap()) { addComponentType(NpcInfoType.TITLE); } - if (npc.getNameString() != null) { addComponentType(NpcInfoType.NAME_NPCSTRINGID); } - if (npc.getTitleString() != null) { addComponentType(NpcInfoType.TITLE_NPCSTRINGID); } - if (_npc.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (!_abnormalVisualEffects.isEmpty() || npc.isInvisible()) { addComponentType(NpcInfoType.ABNORMALS); } - if (npc.getEnchantEffect() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (npc.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (npc.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (npc.getClanId() > 0) { final Clan clan = ClanTable.getInstance().getClan(npc.getClanId()); @@ -220,14 +195,11 @@ public class NpcInfo extends AbstractMaskPacket addComponentType(NpcInfoType.CLAN); } } - addComponentType(NpcInfoType.COLOR_EFFECT); - if (npc.getPvpFlag() > 0) { addComponentType(NpcInfoType.PVP_FLAG); } - // TODO: Confirm me if (npc.isInCombat()) { @@ -245,8 +217,7 @@ public class NpcInfo extends AbstractMaskPacket { _statusMask |= 0x08; } - - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -296,27 +267,23 @@ public class NpcInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO.writeId(packet); - packet.writeD(_npc.getObjectId()); - packet.writeC(_npc.isShowSummonAnimation() ? 0x02 : 0x00); // // 0=teleported 1=default 2=summoned + packet.writeC(_npc.isShowSummonAnimation() ? 2 : 0); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 0x01 : 0x00); + packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { String title = _npc.getTitle(); - // Localisation related. if ((_localisation != null) && !_localisation[1].equals("")) { @@ -329,10 +296,8 @@ public class NpcInfo extends AbstractMaskPacket title = title.replace(NpcData.getInstance().getTemplate(_npc.getId()).getTitle(), _localisation[1]); } } - packet.writeS(title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -351,7 +316,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -366,20 +331,20 @@ public class NpcInfo extends AbstractMaskPacket if (containsMask(NpcInfoType.EQUIPPED)) { packet.writeD(_npc.getRightHandItem()); - packet.writeD(0x00); // Armor id? + packet.writeD(0); // Armor id? packet.writeD(_npc.getLeftHandItem()); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_npc.isDead() ? 0x00 : 0x01); + packet.writeC(_npc.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); + packet.writeC(_npc.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 0x01 : _npc.isFlying() ? 0x02 : 0x00); + packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -391,7 +356,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_npc.isFlying() ? 0x01 : 0x00); + packet.writeD(_npc.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { @@ -427,12 +392,12 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(0x00); // 2 - do some animation on spawn + packet.writeC(0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -464,12 +429,10 @@ public class NpcInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java index c95a8e5274..923e9cebad 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class NpcInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_npc.getObjectId()); packet.writeD(_npc.getTransformationDisplayId()); - final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size()); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java index a294edc57a..2a0ba41eeb 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java @@ -38,7 +38,6 @@ public class NpcQuestHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NPC_QUEST_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_questId); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java index d3328ade97..fc6d0d4a3a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java @@ -106,7 +106,6 @@ public class NpcSay implements IClientOutgoingPacket { _parameters = new ArrayList<>(); } - for (String item : params) { if ((item != null) && (item.length() > 0)) @@ -127,11 +126,9 @@ public class NpcSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_SAY.writeId(packet); - packet.writeD(_objectId); packet.writeD(_textType.getClientId()); packet.writeD(_npcId); - // Localisation related. if (_lang != null) { @@ -147,7 +144,6 @@ public class NpcSay implements IClientOutgoingPacket } } } - packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java index 356e3f48a9..ac61f9d247 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java @@ -33,11 +33,10 @@ public class ObservationMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_START.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me packet.writeD(0xc0); // TODO: Find me return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java index 5c0a0766b3..896ccea02b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java @@ -33,7 +33,6 @@ public class ObservationReturn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_END.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java index c2f7ab404f..173772c870 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java @@ -37,7 +37,6 @@ public class OnEventTrigger implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EVENT_TRIGGER.writeId(packet); - packet.writeD(_emitterId); packet.writeC(_enabled); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index fbb5c84dfe..37d4fea9cf 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -45,7 +45,6 @@ public class PackageSendableList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java index a53f589386..e24d63f717 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java @@ -39,7 +39,6 @@ public class PackageToList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_TO_LIST.writeId(packet); - packet.writeD(_players.size()); for (Entry entry : _players.entrySet()) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 655c7abcd1..44b23b37f4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -55,7 +55,6 @@ public class PartyMemberPosition implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); - packet.writeD(locations.size()); for (Entry entry : locations.entrySet()) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java index 9e275ec246..c9d3595037 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java @@ -36,7 +36,6 @@ public class PartyRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java index b9c7d06769..8c97cac6b5 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java @@ -36,12 +36,10 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ADD.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); // c3 packet.writeD(_party.getDistributionType().getId()); // c3 packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); - packet.writeD((int) _member.getCurrentCp()); // c4 packet.writeD(_member.getMaxCp()); // c4 packet.writeD((int) _member.getCurrentHp()); @@ -51,7 +49,7 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket packet.writeD(_member.getVitalityPoints()); packet.writeC(_member.getLevel()); packet.writeH(_member.getClassId().getId()); - packet.writeC(0x00); + packet.writeC(0); packet.writeH(_member.getRace().ordinal()); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java index 65d0c60c2e..5ad91f5463 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java @@ -37,21 +37,17 @@ public class PartySmallWindowAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ALL.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); packet.writeC(_party.getDistributionType().getId()); packet.writeC(_party.getMemberCount() - 1); - for (Player member : _party.getMembers()) { if ((member != null) && (member != _exclude)) { packet.writeD(member.getObjectId()); packet.writeS(member.getName()); - packet.writeD((int) member.getCurrentCp()); // c4 packet.writeD(member.getMaxCp()); // c4 - packet.writeD((int) member.getCurrentHp()); packet.writeD(member.getMaxHp()); packet.writeD((int) member.getCurrentMp()); @@ -59,7 +55,7 @@ public class PartySmallWindowAll implements IClientOutgoingPacket packet.writeD(member.getVitalityPoints()); packet.writeC(member.getLevel()); packet.writeH(member.getClassId().getId()); - packet.writeC(0x01); // Unk + packet.writeC(1); // Unk packet.writeH(member.getRace().ordinal()); final Summon pet = member.getPet(); packet.writeD(member.getServitors().size() + (pet != null ? 1 : 0)); // Summon size, one only atm diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java index 94a8a5a2ce..09ce132af4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java @@ -33,7 +33,6 @@ public class PartySmallWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_DELETE.writeId(packet); - packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java index c53c6c7779..e9ea2efbbe 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java @@ -42,7 +42,6 @@ public class PartySmallWindowUpdate extends AbstractMaskPacket _summon.getStat().getExp()) { packet.writeQ(_summon.getStat().getExp()); // 0% absolute value @@ -160,9 +148,7 @@ public class PetInfo implements IClientOutgoingPacket { packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value } - packet.writeQ(_summon.getExpForNextLevel()); // 100% absoulte value - packet.writeD(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight packet.writeD(_summon.getMaxLoad()); // max weight it can carry packet.writeD(_summon.getPAtk()); // patk @@ -178,25 +164,20 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD((int) _summon.getStat().getMoveSpeed()); // speed packet.writeD(_summon.getPAtkSpd()); // atkspeed packet.writeD(_summon.getMAtkSpd()); // casting speed - packet.writeC(0); // TODO: Check me, might be ride status packet.writeC(_summon.getTeam().getId()); // Confirmed packet.writeC(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed packet.writeC(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed - - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. - + packet.writeD(0); // TODO: Find me + packet.writeD(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. packet.writeC(_summon.getOwner().getSummonPoints()); // Used Summon Points packet.writeC(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points - final Set aves = _summon.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeH(aves.size()); // Confirmed for (AbnormalVisualEffect ave : aves) { packet.writeH(ave.getClientId()); // Confirmed } - packet.writeC(_statusMask); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 5b43daa74b..1f60ec39d1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -46,7 +46,6 @@ public class PetInventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.PET_INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index e4cf35779f..16dc83b7ed 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -35,7 +35,6 @@ public class PetItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java index fdb00ddbb1..913f65d470 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java @@ -38,7 +38,6 @@ public class PetStatusShow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_SHOW.writeId(packet); - packet.writeD(_summonType); packet.writeD(_summonObjectId); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 25c2c74292..823a8c405a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -52,7 +52,6 @@ public class PetStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_UPDATE.writeId(packet); - packet.writeD(_summon.getSummonType()); packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getX()); @@ -69,7 +68,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket packet.writeQ(_summon.getStat().getExp()); packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value packet.writeQ(_summon.getExpForNextLevel()); // 100% absolute value - packet.writeD(0x01); // TODO: Find me! + packet.writeD(1); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java index 4bc3570779..0898b01f67 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java @@ -63,7 +63,6 @@ public class PlaySound implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLAY_SOUND.writeId(packet); - packet.writeD(_unknown1); // unknown 0 for quest and ship; packet.writeS(_soundFile); packet.writeD(_unknown3); // unknown 0 for quest; 1 for ship; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java index fbe57d4aaf..5108fe7e1b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java @@ -44,7 +44,6 @@ public class PledgeCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java index aa11b1213e..6805f64d7c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java @@ -34,7 +34,6 @@ public class PledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_INFO.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getId()); packet.writeS(_clan.getName()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java index 7ae6a0d284..b28dbf33c3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java @@ -36,7 +36,6 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_MEMBER_INFO.writeId(packet); - packet.writeD(_member.getPledgeType()); packet.writeS(_member.getName()); packet.writeS(_member.getTitle()); // title diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java index eefd482979..6aa5067c8f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java @@ -36,7 +36,6 @@ public class PledgeReceivePowerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_POWER_INFO.writeId(packet); - packet.writeD(_member.getPowerGrade()); // power grade packet.writeS(_member.getName()); packet.writeD(_member.getClan().getRankPrivs(_member.getPowerGrade()).getBitmask()); // privileges diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 79d478aff9..f9387ea1d8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -40,8 +40,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_SUB_PLEDGE_CREATED.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); packet.writeD(_subPledge.getId()); packet.writeS(_subPledge.getName()); packet.writeS(getLeaderName()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java index 4d0efeb82a..7649947064 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java @@ -43,7 +43,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(packet); - packet.writeD(_tab); // page packet.writeD(_clanList.size()); for (ClanWar clanWar : _clanList) @@ -53,7 +52,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket { continue; } - packet.writeS(clan.getName()); packet.writeD(clanWar.getState().ordinal()); // type: 0 = Declaration, 1 = Blood Declaration, 2 = In War, 3 = Victory, 4 = Defeat, 5 = Tie, 6 = Error packet.writeD(clanWar.getRemainingTime()); // Time if friends to start remaining diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java index 2cbbdbf046..80d10fcb66 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java @@ -34,26 +34,25 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_INFO_UPDATE.writeId(packet); - // sending empty data so client will ask all the info in response ;) packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getLevel()); // clan level packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); // castle state ? + packet.writeD(0); // castle state ? packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); // clan reputation score - packet.writeD(0x00); // ? - packet.writeD(0x00); // ? + packet.writeD(0); // ? + packet.writeD(0); // ? packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); // c5 packet.writeD(_clan.getAllyCrestId()); // c5 packet.writeD(_clan.isAtWar() ? 1 : 0); // c5 - packet.writeD(0x00); // TODO: Find me! - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java index ae26e50dbb..2fa9f26d4a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java @@ -51,12 +51,11 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ADD.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); - packet.writeD(0x00); - packet.writeD(0x01); + packet.writeD(0); + packet.writeD(1); packet.writeD(_isOnline); // 1 = online 0 = offline packet.writeD(_pledgeType); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index 971d88c53d..8880e7853d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -57,30 +57,27 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(packet); - - packet.writeD(0x00); // _isSubPledge + packet.writeD(0); // _isSubPledge packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_name); packet.writeS(_leaderName); - packet.writeD(_clan.getCrestId()); // crest id .. is used again packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); // 0 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(0); // 0 packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.isAtWar() ? 1 : 0); // new c3 - packet.writeD(0x00); // Territory castle ID - + packet.writeD(0); // Territory castle ID packet.writeD(_members.size()); for (ClanMember m : _members) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java index 0fd387e419..154bcc610d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java @@ -32,7 +32,6 @@ public class PledgeShowMemberListDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_DELETE.writeId(packet); - packet.writeS(_player); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java index 9789e1e951..beefd2b6bd 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java @@ -50,7 +50,6 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index 4e89797e45..09f70ea024 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -62,14 +62,14 @@ public class PledgeSkillList implements IClientOutgoingPacket { packet.writeD(sk.getDisplayId()); packet.writeH(sk.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } for (SubPledgeSkill sk : _subSkills) { packet.writeD(sk._subType); // Clan Sub-unit types packet.writeD(sk._skillId); packet.writeH(sk._skillLevel); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java index f3b8d4c26c..a94601294f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java @@ -37,7 +37,6 @@ public class PledgeSkillListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST_ADD.writeId(packet); - packet.writeD(_id); packet.writeD(_level); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java index 9e1b4843ac..5f32f2bf54 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java @@ -33,15 +33,14 @@ public class PledgeStatusChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_STATUS_CHANGED.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getLeaderId()); packet.writeD(_clan.getId()); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getAllyId()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.getCrestLargeId()); - packet.writeD(0x00); // pledge type ? + packet.writeD(0); // pledge type ? return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java index 5b56d0b28d..41d0f9f7d8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java @@ -44,12 +44,10 @@ public class PrivateStoreListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_LIST.writeId(packet); - packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); // Viewer's item count? + packet.writeD(0); // Viewer's item count? packet.writeD(_items.size()); - int slotNumber = 0; for (TradeItem item : _items) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 67b6ba8d94..d72050283e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -43,11 +43,10 @@ public class PrivateStoreListSell extends AbstractItemPacket else { OutgoingPackets.PRIVATE_STORE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index d05590cbde..df056c2e43 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -60,13 +60,13 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket { packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); + packet.writeD(0); for (Item item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item2 : _buyList) { writeItem(packet, item2); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index d8768104a4..6bbabb282b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -63,13 +63,13 @@ public class PrivateStoreManageListSell extends AbstractItemPacket packet.writeD(_objId); packet.writeD(_packageSale ? 1 : 0); packet.writeQ(_playerAdena); - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item2 : _sellList) { writeItem(packet, item2); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java index 8a5b9eef92..0d7bcbea16 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgBuy implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java index b00bd2add2..8fdb5701b8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgSell implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java index c3958367e8..5ddaa46ba0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java @@ -40,7 +40,6 @@ public class RadarControl implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RADAR_CONTROL.writeId(packet); - packet.writeD(_showRadar); packet.writeD(_type); // maybe type packet.writeD(_x); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java index c7e4525bf2..bcfd911f58 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java @@ -40,10 +40,8 @@ public class RecipeBookItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_BOOK_ITEM_LIST.writeId(packet); - - packet.writeD(_isDwarvenCraft ? 0x00 : 0x01); // 0 = Dwarven - 1 = Common + packet.writeD(_isDwarvenCraft ? 0 : 1); // 0 = Dwarven - 1 = Common packet.writeD(_maxMp); - if (_recipes == null) { packet.writeD(0); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index d9c2621c84..a4e4641944 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -78,7 +78,6 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(_offeringMaximumAdena); // Adena worth of items for maximum offering. return true; } - PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java index a24ba356ef..ab67f9bff3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java @@ -50,7 +50,6 @@ public class RecipeShopItemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_ITEM_INFO.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD(_recipeId); packet.writeD((int) _manufacturer.getCurrentMp()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java index aac30faf53..ec67224b1e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java @@ -57,11 +57,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MANAGE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD((int) _seller.getAdena()); - packet.writeD(_isDwarven ? 0x00 : 0x01); - + packet.writeD(_isDwarven ? 0 : 1); if ((_recipes == null) || _recipes.isEmpty()) { packet.writeD(0); @@ -69,7 +67,6 @@ public class RecipeShopManageList implements IClientOutgoingPacket else { packet.writeD(_recipes.size()); // number of items in recipe book - int i = 1; for (RecipeHolder recipe : _recipes) { @@ -77,10 +74,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket packet.writeD(i++); } } - if ((_manufacture == null) || _manufacture.isEmpty()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -88,7 +84,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket for (Entry item : _manufacture) { packet.writeD(item.getKey()); - packet.writeD(0x00); // CanCraft? + packet.writeD(0); // CanCraft? packet.writeQ(item.getValue()); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java index c025b5e4ed..2b9bc5b6e7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java @@ -33,7 +33,6 @@ public class RecipeShopMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MSG.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeS(_player.getStoreName()); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java index 07ba331de9..8f504ce103 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java @@ -37,14 +37,13 @@ public class RecipeShopSellList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_SELL_LIST.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD((int) _manufacturer.getCurrentMp()); // Creator's MP packet.writeD(_manufacturer.getMaxMp()); // Creator's MP packet.writeQ(_buyer.getAdena()); // Buyer Adena if (!_manufacturer.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -52,7 +51,7 @@ public class RecipeShopSellList implements IClientOutgoingPacket for (Entry item : _manufacturer.getManufactureItems().entrySet()) { packet.writeD(item.getKey()); - packet.writeD(0x00); // CanCreate? + packet.writeD(0); // CanCreate? packet.writeQ(item.getValue()); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 74700e29b0..269e14d50b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -88,7 +88,6 @@ public class RelationChanged implements IClientOutgoingPacket { return; } - final Relation r = new Relation(); r._objId = activeChar.getObjectId(); r._relation = relation; @@ -102,7 +101,6 @@ public class RelationChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RELATION_CHANGED.writeId(packet); - packet.writeC(_mask); if (_multi == null) { @@ -122,7 +120,6 @@ public class RelationChanged implements IClientOutgoingPacket private void writeRelation(PacketWriter packet, Relation relation) { packet.writeD(relation._objId); - if ((_mask & SEND_DEFAULT) != SEND_DEFAULT) { packet.writeD(relation._relation); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java index b4e9dc25c5..4477cfb705 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java @@ -35,7 +35,6 @@ public class RequestEnchant implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java index 4ef15fb74c..7a0a6cbe58 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java @@ -33,7 +33,6 @@ public class Revive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.REVIVE.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java index 9c409601e3..b9ddf7733f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java @@ -42,7 +42,6 @@ public class Ride implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RIDE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_mounted); packet.writeD(_rideType); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 813ce03f4d..13ef62f55f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -49,11 +49,9 @@ public class SellListProcure implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SELL_LIST_PROCURE.writeId(packet); - packet.writeQ(_money); // money - packet.writeD(0x00); // lease ? + packet.writeD(0); // lease ? packet.writeH(_sellList.size()); // list size - for (Entry entry : _sellList.entrySet()) { final Item item = entry.getKey(); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java index baa37a8507..75b5b07854 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java @@ -39,12 +39,10 @@ public class SendMacroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MACRO_LIST.writeId(packet); - packet.writeC(_updateType.getId()); - packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0x00); // modified, created or deleted macro's id + packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0); // modified, created or deleted macro's id packet.writeC(_count); // count of Macros packet.writeC(_macro != null ? 1 : 0); // unknown - if ((_macro != null) && (_updateType != MacroUpdateType.DELETE)) { packet.writeD(_macro.getId()); // Macro ID @@ -52,9 +50,7 @@ public class SendMacroList implements IClientOutgoingPacket packet.writeS(_macro.getDescr()); // Desc packet.writeS(_macro.getAcronym()); // acronym packet.writeD(_macro.getIcon()); // icon - packet.writeC(_macro.getCommands().size()); // count - int i = 1; for (MacroCmd cmd : _macro.getCommands()) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java index 47fada25be..21622b5f19 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java @@ -32,7 +32,6 @@ public class SendTradeRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_REQUEST.writeId(packet); - packet.writeD(_senderId); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java index 69aa749406..1513a0e3d1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java @@ -55,7 +55,6 @@ public class ServerObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SERVER_OBJECT_INFO.writeId(packet); - packet.writeD(_activeChar.getObjectId()); packet.writeD(_displayId + 1000000); packet.writeS(_name); // name @@ -70,8 +69,8 @@ public class ServerObjectInfo implements IClientOutgoingPacket packet.writeF(_collisionHeight); packet.writeD((int) (_isAttackable ? _activeChar.getCurrentHp() : 0)); packet.writeD(_isAttackable ? _activeChar.getMaxHp() : 0); - packet.writeD(0x01); // object type - packet.writeD(0x00); // special effects + packet.writeD(1); // object type + packet.writeD(0); // special effects return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java index 88b370ad8b..0164e5c4a2 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java @@ -34,7 +34,6 @@ public class SetSummonRemainTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SET_SUMMON_REMAIN_TIME.writeId(packet); - packet.writeD(_maxTime); packet.writeD(_remainingTime); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java index db28b72acf..016f5a0c9a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java @@ -38,7 +38,6 @@ public class ShopPreviewInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_INFO.writeId(packet); - packet.writeD(Inventory.PAPERDOLL_TOTALSLOTS); // Slots packet.writeD(getFromList(Inventory.PAPERDOLL_UNDER)); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index 4d605cfbb4..0cc66729ca 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -52,11 +52,9 @@ public class ShopPreviewList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_LIST.writeId(packet); - packet.writeD(5056); packet.writeQ(_money); // current money packet.writeD(_listId); - int newlength = 0; for (Product product : _list) { @@ -66,23 +64,20 @@ public class ShopPreviewList implements IClientOutgoingPacket } } packet.writeH(newlength); - for (Product product : _list) { if (!product.getItem().getCrystalType().isGreater(_expertise) && product.getItem().isEquipable()) { packet.writeD(product.getItemId()); packet.writeH(product.getItem().getType2()); // item type2 - if (product.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { packet.writeQ(product.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } else { - packet.writeQ(0x00); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand + packet.writeQ(0); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } - packet.writeQ(Config.WEAR_PRICE); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 298301ed0d..b13080ff28 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -40,7 +40,6 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_BUFF_STATUS_UPDATE.writeId(packet); - packet.writeD(_skillId); packet.writeH(_skillLevel); packet.writeH(_skillSubLevel); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index c6a67fb97c..b8624ce4cd 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -33,7 +33,6 @@ public class ShortCutInit implements IClientOutgoingPacket { return; } - _shortCuts = player.getAllShortCuts(); } @@ -41,24 +40,22 @@ public class ShortCutInit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); packet.writeD(sc.getSlot() + (sc.getPage() * 12)); - switch (sc.getType()) { case ITEM: { packet.writeD(sc.getId()); - packet.writeD(0x01); // Enabled or not + packet.writeD(1); // Enabled or not packet.writeD(sc.getSharedReuseGroup()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeQ(0x00); // Augment id - packet.writeD(0x00); // Visual id + packet.writeD(0); + packet.writeD(0); + packet.writeQ(0); // Augment id + packet.writeD(0); // Visual id break; } case SKILL: @@ -67,8 +64,8 @@ public class ShortCutInit implements IClientOutgoingPacket packet.writeH(sc.getLevel()); packet.writeH(sc.getSubLevel()); packet.writeD(sc.getSharedReuseGroup()); - packet.writeC(0x00); // C5 - packet.writeD(0x01); // C6 + packet.writeC(0); // C5 + packet.writeD(1); // C6 break; } case ACTION: @@ -77,7 +74,7 @@ public class ShortCutInit implements IClientOutgoingPacket case BOOKMARK: { packet.writeD(sc.getId()); - packet.writeD(0x01); // C6 + packet.writeD(1); // C6 } } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java index 43d61af661..f099eab47e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java @@ -37,7 +37,6 @@ public class ShortCutRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_REGISTER.writeId(packet); - packet.writeD(_shortcut.getType().ordinal()); packet.writeD(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client switch (_shortcut.getType()) @@ -47,10 +46,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeD(_shortcut.getId()); packet.writeD(_shortcut.getCharacterType()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeD(0x00); // unknown - packet.writeD(0x00); // unknown - packet.writeD(0x00); // item augment id - packet.writeD(0x00); // TODO: Find me, item visual id ? + packet.writeD(0); // unknown + packet.writeD(0); // unknown + packet.writeD(0); // item augment id + packet.writeD(0); // TODO: Find me, item visual id ? break; } case SKILL: @@ -59,10 +58,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeH(_shortcut.getLevel()); packet.writeH(_shortcut.getSubLevel()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeC(0x00); // C5 + packet.writeC(0); // C5 packet.writeD(_shortcut.getCharacterType()); - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me + packet.writeD(0); // TODO: Find me break; } case ACTION: diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java index d6f71b5f70..cfae3b3fad 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java @@ -54,7 +54,6 @@ public class ShowBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - packet.writeC(_showBoard); // c4 1 to show community 00 to hide packet.writeS("bypass _bbshome"); // top packet.writeS("bypass _bbsgetfav"); // favorite diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java index 4b62a7001b..4d62e99d7a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java @@ -32,7 +32,6 @@ public class ShowCalculator implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_CALC.writeId(packet); - packet.writeD(_calculatorId); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java index 55f58d5375..4574762467 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java @@ -32,9 +32,8 @@ public class ShowMiniMap implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_MINIMAP.writeId(packet); - packet.writeD(_mapId); - packet.writeC(0x00); // Seven Signs state + packet.writeC(0); // Seven Signs state return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java index 303eab4e8a..97100d09d2 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java @@ -34,7 +34,6 @@ public class ShowPCCafeCouponShowUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_PCCAFE_COUPON_SHOW_UI.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java index d86958e586..0a0f3ae861 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java @@ -35,7 +35,6 @@ public class ShowXMasSeal implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_XMAS_SEAL.writeId(packet); - packet.writeD(_item); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java index 66eccc7fbf..1baa030c4d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java @@ -28,9 +28,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = ca
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Attackers Clans?
* d = Number of Attackers Clans
* { //repeats
@@ -58,11 +58,10 @@ public class SiegeAttackerList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _castle.getSiege().getAttackerClans().size(); if (size > 0) { @@ -76,12 +75,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -90,8 +88,8 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index 5d5c831f14..8afd1f38ce 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -29,9 +29,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = 0xcb
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Defending Clans?
* d = Number of Defending Clans
* { //repeats
@@ -60,16 +60,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // Unknown - packet.writeD(0x01); // Unknown - packet.writeD(0x00); // Unknown - + packet.writeD(0); // Unknown + packet.writeD(1); // Unknown + packet.writeD(0); // Unknown final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0); packet.writeD(size); packet.writeD(size); - // Add owners final Clan ownerClan = _castle.getOwner(); if (ownerClan != null) @@ -78,14 +75,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket packet.writeS(ownerClan.getName()); packet.writeS(ownerClan.getLeaderName()); packet.writeD(ownerClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.OWNER.ordinal()); packet.writeD(ownerClan.getAllyId()); packet.writeS(ownerClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(ownerClan.getAllyCrestId()); } - // List of confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans()) { @@ -94,19 +90,17 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(defendingClan.getAllyCrestId()); } - // List of not confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans()) { @@ -115,12 +109,11 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER_PENDING.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 0a3fe46cb7..dfeefdaecf 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -59,13 +59,11 @@ public class SiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_INFO.writeId(packet); - if (_castle != null) { packet.writeD(_castle.getResidenceId()); - final int ownerId = _castle.getOwnerId(); - packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 0x01 : 0x00); + packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0); packet.writeD(ownerId); if (ownerId > 0) { @@ -89,7 +87,6 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { @@ -97,7 +94,7 @@ public class SiegeInfo implements IClientOutgoingPacket cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis()); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(Config.SIEGE_HOUR_LIST.size()); for (int hour : Config.SIEGE_HOUR_LIST) { @@ -108,7 +105,7 @@ public class SiegeInfo implements IClientOutgoingPacket else { packet.writeD((int) (_castle.getSiegeDate().getTimeInMillis() / 1000)); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index d11b3817c0..3c4c475339 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -51,12 +51,11 @@ public class SkillCoolTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SKILL_COOL_TIME.writeId(packet); - packet.writeD(_skillReuseTimeStamps.size()); for (TimeStamp ts : _skillReuseTimeStamps) { packet.writeD(ts.getSkillId()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD((int) ts.getReuse() / 1000); packet.writeD((int) Math.max(ts.getStamp() - _currentTime, 0) / 1000); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index de54232b51..ed4615c403 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -41,10 +41,9 @@ public class Snoop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SNOOP.writeId(packet); - packet.writeD(_convoId); packet.writeS(_name); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_type.getClientId()); packet.writeS(_speaker); packet.writeS(_msg); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java index 37827bdf6c..52f15519a5 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java @@ -37,10 +37,9 @@ public class SocialAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SOCIAL_ACTION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_actionId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index fd7e43a153..19066f5f85 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -33,16 +33,15 @@ public class SpawnItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPAWN_ITEM.writeId(packet); - packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeD(_item.isStackable() ? 0x01 : 0x00); + packet.writeD(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java index ccae75b850..04f3ad716c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java @@ -110,7 +110,6 @@ public class SpecialCamera implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPECIAL_CAMERA.writeId(packet); - packet.writeD(_id); packet.writeD(_force); packet.writeD(_angle1); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java index cdd3821740..281756e793 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java @@ -34,7 +34,6 @@ public class StartPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_PLEDGE_WAR.writeId(packet); - packet.writeS(_playerName); packet.writeS(_pledgeName); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java index 48b4238eea..27fb4f606b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java @@ -38,7 +38,6 @@ public class StartRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_side); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java index b4f421df36..067bdeb082 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java @@ -72,7 +72,6 @@ public class StaticObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATIC_OBJECT.writeId(packet); - packet.writeD(_staticObjectId); packet.writeD(_objectId); packet.writeD(_type); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index 928b54aa48..40836e4af8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -46,7 +46,6 @@ public class StatusUpdate implements IClientOutgoingPacket public void addUpdate(StatusUpdateType type, int level) { _updates.put(type, level); - if (_isPlayable) { switch (type) @@ -75,10 +74,9 @@ public class StatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATUS_UPDATE.writeId(packet); - packet.writeD(_objectId); // casterId - packet.writeD(_isVisible ? _casterObjectId : 0x00); - packet.writeC(_isVisible ? 0x01 : 0x00); + packet.writeD(_isVisible ? _casterObjectId : 0); + packet.writeC(_isVisible ? 1 : 0); packet.writeC(_updates.size()); for (Entry entry : _updates.entrySet()) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java index 9919307366..cf2b71df5a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java @@ -53,7 +53,6 @@ public class StopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java index 50fdc3fe4c..78fdb5d70c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java @@ -43,7 +43,6 @@ public class StopMoveInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java index 9c828c3962..b254cad8b1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java @@ -34,7 +34,6 @@ public class StopPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java index b0392de226..ca69cd5346 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java @@ -36,7 +36,6 @@ public class StopRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FINISH_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_speed); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index c1feb37b2f..2d92796c75 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -43,10 +43,8 @@ public class SummonInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class SummonInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class SummonInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,11 +154,9 @@ public class SummonInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - // Show red aura? - // if (_statusMask != 0) + // if (_statusMask != 0x00) // { // addComponentType(NpcInfoType.VISUAL_STATE); // } @@ -229,28 +206,24 @@ public class SummonInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.SUMMON_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -269,7 +242,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -285,19 +258,19 @@ public class SummonInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -309,20 +282,20 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -346,12 +319,12 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -381,12 +354,10 @@ public class SummonInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java index 864462f76f..6f88551204 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java @@ -34,7 +34,6 @@ public class SurrenderPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SURRENDER_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 746b2da3f7..b509d599db 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -161,7 +161,6 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } - _params[_paramIndex++] = param; } @@ -267,7 +266,6 @@ public class SystemMessage implements IClientOutgoingPacket { return addString(item.getName()); } - append(new SMParam(TYPE_ITEM_NAME, id)); return this; } @@ -389,7 +387,6 @@ public class SystemMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SYSTEM_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -402,13 +399,12 @@ public class SystemMessage implements IClientOutgoingPacket params[i] = _params[i].getValue(); } packet.writeH(SystemMessageId.S1_2.getId()); - packet.writeC(0x01); + packet.writeC(1); packet.writeC(TYPE_TEXT); packet.writeS(sml.getLocalisation(params)); return true; } } - packet.writeH(getId()); packet.writeC(_params.length); for (SMParam param : _params) @@ -418,9 +414,7 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } - packet.writeC(param.getType()); - switch (param.getType()) { case TYPE_ELEMENT_NAME: diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java index a91da07e77..d357efbb0e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java @@ -47,13 +47,12 @@ public class TargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_SELECTED.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java index 3dadd249f6..3d7208c06f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java @@ -42,12 +42,11 @@ public class TargetUnselected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_UNSELECTED.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index 943b5078b6..13f9b9565a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -41,14 +41,13 @@ public class TeleportToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TELEPORT_TO_LOCATION.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // Fade 0, Instant 1. + packet.writeD(0); // Fade 0, Instant 1. packet.writeD(_heading); - packet.writeD(0x00); // Unknown. + packet.writeD(0); // Unknown. return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java index cb82f2da59..8d09576d9d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java @@ -32,7 +32,6 @@ public class TradeDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_DONE.writeId(packet); - packet.writeD(_num); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java index 716ed2a099..6a94d2463f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java @@ -41,9 +41,9 @@ public class TradeOtherAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java index 3d0ef0b501..7907f3d498 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java @@ -41,9 +41,9 @@ public class TradeOwnAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c59568bf1d..3822108c5a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -58,7 +58,6 @@ public class TradeStart extends AbstractItemPacket { _mask |= 0x08; } - // Does not shows level if (_partner.isGM()) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java index f8e2a191de..e5ec2376cc 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java @@ -44,10 +44,10 @@ public class TradeUpdate extends AbstractItemPacket { OutgoingPackets.TRADE_UPDATE.writeId(packet); packet.writeC(_sendType); - packet.writeD(0x01); + packet.writeD(1); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2); writeItem(packet, _item, _count); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java index c7102ca385..728020c0b1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java @@ -32,7 +32,6 @@ public class TutorialEnableClientEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_ENABLE_CLIENT_EVENT.writeId(packet); - packet.writeD(_eventId); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java index 92ac75afcf..7cc33a0f80 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java @@ -48,7 +48,6 @@ public class TutorialShowHtml extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_HTML.writeId(packet); - packet.writeD(_type); packet.writeS(getHtml()); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java index 75a57be38b..2ee62835db 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java @@ -37,7 +37,6 @@ public class TutorialShowQuestionMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_QUESTION_MARK.writeId(packet); - packet.writeC(_markType); packet.writeD(_markId); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index ebe4943eb7..0eb933e196 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -35,7 +35,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class UserInfo extends AbstractMaskPacket { private Player _player; - private int _relation; private int _runSpd; private int _walkSpd; @@ -49,14 +48,12 @@ public class UserInfo extends AbstractMaskPacket private int _enchantLevel; private int _armorEnchant; private String _title; - private final byte[] _masks = new byte[] { (byte) 0x00, (byte) 0x00, (byte) 0x00 }; - private int _initSize = 5; public UserInfo(Player player) @@ -80,6 +77,7 @@ public class UserInfo extends AbstractMaskPacket _enchantLevel = player.getInventory().getWeaponEnchant(); _armorEnchant = player.getInventory().getArmorMinEnchant(); _title = player.getTitle(); + if (player.isGM() && player.isInvisible()) { _title = "[Invisible]"; @@ -135,29 +133,25 @@ public class UserInfo extends AbstractMaskPacket } OutgoingPackets.USER_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_initSize); packet.writeH(24); packet.writeB(_masks); - if (containsMask(UserInfoType.RELATION)) { packet.writeD(_relation); } - if (containsMask(UserInfoType.BASIC_INFO)) { packet.writeH(16 + (_player.getAppearance().getVisibleName().length() * 2)); packet.writeString(_player.getName()); - packet.writeC(_player.isGM() ? 0x01 : 0x00); + packet.writeC(_player.isGM() ? 1 : 0); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } - if (containsMask(UserInfoType.BASE_STATS)) { packet.writeH(18); @@ -170,7 +164,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getLUC()); packet.writeH(_player.getCHA()); } - if (containsMask(UserInfoType.MAX_HPCPMP)) { packet.writeH(14); @@ -178,7 +171,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMaxMp()); packet.writeD(_player.getMaxCp()); } - if (containsMask(UserInfoType.CURRENT_HPMPCP_EXP_SP)) { packet.writeH(38); @@ -189,23 +181,20 @@ public class UserInfo extends AbstractMaskPacket packet.writeQ(_player.getExp()); packet.writeF((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel()))); } - if (containsMask(UserInfoType.ENCHANTLEVEL)) { packet.writeH(4); packet.writeC(_enchantLevel); packet.writeC(_armorEnchant); } - if (containsMask(UserInfoType.APPAREANCE)) { packet.writeH(15); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); } - if (containsMask(UserInfoType.STATUS)) { packet.writeH(6); @@ -214,7 +203,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.getCrystallizeGrade() != ItemGrade.NONE ? 1 : 0); packet.writeC(_player.getAbilityPoints() - _player.getAbilityPointsUsed()); } - if (containsMask(UserInfoType.STATS)) { packet.writeH(56); @@ -233,7 +221,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); } - if (containsMask(UserInfoType.ELEMENTALS)) { packet.writeH(14); @@ -244,7 +231,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getDefenseElementValue(AttributeType.HOLY)); packet.writeH(_player.getDefenseElementValue(AttributeType.DARK)); } - if (containsMask(UserInfoType.POSITION)) { packet.writeH(18); @@ -253,7 +239,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getZ()); packet.writeD(_player.isInVehicle() ? _player.getVehicle().getObjectId() : 0); } - if (containsMask(UserInfoType.SPEED)) { packet.writeH(18); @@ -266,21 +251,18 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_flyRunSpd); packet.writeH(_flyWalkSpd); } - if (containsMask(UserInfoType.MULTIPLIER)) { packet.writeH(18); packet.writeF(_moveMultiplier); packet.writeF(_player.getAttackSpeedMultiplier()); } - if (containsMask(UserInfoType.COL_RADIUS_HEIGHT)) { packet.writeH(18); packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); } - if (containsMask(UserInfoType.ATK_ELEMENTAL)) { packet.writeH(5); @@ -288,7 +270,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); } - if (containsMask(UserInfoType.CLAN)) { packet.writeH(32 + (_title.length() * 2)); @@ -298,12 +279,11 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getClanCrestLargeId()); packet.writeD(_player.getClanCrestId()); packet.writeD(_player.getClanPrivileges().getBitmask()); - packet.writeC(_player.isClanLeader() ? 0x01 : 0x00); + packet.writeC(_player.isClanLeader() ? 1 : 0); packet.writeD(_player.getAllyId()); packet.writeD(_player.getAllyCrestId()); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); } - if (containsMask(UserInfoType.SOCIAL)) { packet.writeH(22); @@ -317,70 +297,62 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); } - if (containsMask(UserInfoType.VITA_FAME)) { packet.writeH(15); packet.writeD(_player.getVitalityPoints()); - packet.writeC(0x00); // Vita Bonus + packet.writeC(0); // Vita Bonus packet.writeD(_player.getFame()); packet.writeD(_player.getRaidbossPoints()); } - if (containsMask(UserInfoType.SLOTS)) { packet.writeH(11); // 140 packet.writeC(_player.getInventory().getTalismanSlots()); packet.writeC(_player.getInventory().getBroochJewelSlots()); packet.writeC(_player.getTeam().getId()); - packet.writeC(0x00); - packet.writeC(0x00); - packet.writeC(0x00); - packet.writeC(0x00); - + packet.writeC(0); + packet.writeC(0); + packet.writeC(0); + packet.writeC(0); if (_player.getInventory().getAgathionSlots() > 0) { - packet.writeC(0x01); + packet.writeC(1); packet.writeC(_player.getInventory().getAgathionSlots() - 1); } else { - packet.writeC(0x00); - packet.writeC(0x00); + packet.writeC(0); + packet.writeC(0); } } - if (containsMask(UserInfoType.MOVEMENTS)) { packet.writeH(4); packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); - packet.writeC(_player.isRunning() ? 0x01 : 0x00); + packet.writeC(_player.isRunning() ? 1 : 0); } - if (containsMask(UserInfoType.COLOR)) { packet.writeH(10); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); } - if (containsMask(UserInfoType.INVENTORY_LIMIT)) { packet.writeH(9); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); packet.writeH(_player.getInventoryLimit()); packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); } - if (containsMask(UserInfoType.TRUE_HERO)) { packet.writeH(9); - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeC(_player.isTrueHero() ? 100 : 0x00); + packet.writeD(0); + packet.writeH(0); + packet.writeC(_player.isTrueHero() ? 100 : 0); } - return true; } @@ -397,7 +369,6 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x10; // Party leader } } - if (clan != null) { relation |= 0x20; // Clan member @@ -406,12 +377,10 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x40; // Clan leader } } - if (player.isInSiege()) { relation |= 0x80; // In siege } - return relation; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java index 283bcf1614..90c416726a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java @@ -36,7 +36,6 @@ public class ValidateLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java index 4d8f9683d0..83f72bf981 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java @@ -40,7 +40,6 @@ public class ValidateLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java index b684e70bdc..71367cd26d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java @@ -36,7 +36,6 @@ public class VehicleCheckLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_CHECK_LOCATION.writeId(packet); - packet.writeD(_boat.getObjectId()); packet.writeD(_boat.getX()); packet.writeD(_boat.getY()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java index a4a5780f30..5b565c08b7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java @@ -46,7 +46,6 @@ public class VehicleDeparture implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_DEPARTURE.writeId(packet); - packet.writeD(_objId); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java index ec611028bf..4a995a6352 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java @@ -44,7 +44,6 @@ public class VehicleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java index 207a6fd899..bf629dcbbc 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java @@ -42,7 +42,6 @@ public class VehicleStarted implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_START.writeId(packet); - packet.writeD(_objectId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 35ca986d35..5eb9eb7ab9 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -30,6 +30,7 @@ public class WareHouseDepositList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; public static final int FREIGHT = 1; + private final int _sendType; private final long _playerAdena; private final List _items = new ArrayList<>(); @@ -49,7 +50,6 @@ public class WareHouseDepositList extends AbstractItemPacket _sendType = sendType; _whType = type; _playerAdena = player.getAdena(); - final boolean isPrivate = _whType == PRIVATE; for (Item temp : player.getInventory().getAvailableItems(true, isPrivate, false)) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 7af1cd273c..5ece99310a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -32,6 +32,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private final int _sendType; private Player _player; private long _playerAdena; @@ -60,7 +61,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } - _items = _player.getActiveWarehouse().getItems(); for (Item item : _items) { @@ -78,15 +78,15 @@ public class WareHouseWithdrawalList extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeH(0x00); + packet.writeH(0); packet.writeD(_invSize); packet.writeD(_items.size()); for (Item item : _items) { writeItem(packet, item); packet.writeD(item.getObjectId()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } else diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java index 7442882a70..bd10e174c6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java @@ -59,7 +59,6 @@ public class ExAcquireAPSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_AP_SKILL_LIST.writeId(packet); - packet.writeD(_enable ? 1 : 0); packet.writeQ(Config.ABILITY_POINTS_RESET_SP); // Changed to from Adena to SP on Grand Crusade // packet.writeQ(_price); Removed on Grand Crusade diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java index f9af89e4db..ff296bf632 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java @@ -35,7 +35,6 @@ public class ExCloseAPListWnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_AP_LIST_WND.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java index d72baf2a44..69c47ce99f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java @@ -35,7 +35,6 @@ public class ExShowAPListWnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AP_LIST_WND.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java index 5f2dd05f3b..aea1476fb2 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java @@ -35,8 +35,7 @@ public class ExDivideAdenaCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_CANCEL.writeId(packet); - - packet.writeC(0x00); // TODO: Find me + packet.writeC(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java index 6af912cebf..de4e955aba 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java @@ -46,9 +46,8 @@ public class ExDivideAdenaDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_DONE.writeId(packet); - - packet.writeC(_isPartyLeader ? 0x01 : 0x00); - packet.writeC(_isCCLeader ? 0x01 : 0x00); + packet.writeC(_isPartyLeader ? 1 : 0); + packet.writeC(_isCCLeader ? 1 : 0); packet.writeD(_memberCount); packet.writeQ(_distributedAdenaCount); packet.writeQ(_adenaCount); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java index ab8a7471d6..32f99abfdc 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java @@ -38,8 +38,7 @@ public class ExAlchemyConversion implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_CONVERSION.writeId(packet); - - packet.writeC((_successCount == 0) && (_failureCount == 0) ? 0x01 : 0x00); + packet.writeC((_successCount == 0) && (_failureCount == 0) ? 1 : 0); packet.writeD(_successCount); packet.writeD(_failureCount); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java index be4a2a57e6..cb3cf4b3e0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java @@ -47,7 +47,6 @@ public class ExTryMixCube implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TRY_MIX_CUBE.writeId(packet); - packet.writeC(_type.ordinal()); packet.writeD(_items.size()); for (AlchemyResult holder : _items) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index 549def456e..84b5fead76 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -43,7 +43,6 @@ public class ExChooseShapeShiftingItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_SHAPE_SHIFTING_ITEM.writeId(packet); - packet.writeD(_targetType != null ? _targetType.ordinal() : 0); packet.writeD(_type != null ? _type.ordinal() : 0); packet.writeD(_itemId); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java index 33fb439aa5..ba55887a1a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java @@ -45,7 +45,6 @@ public class ExCuriousHouseMemberUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_UPDATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_maxHp); packet.writeD(_maxCp); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java index 8ad3659725..be2d29d864 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPacket { - public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0x00); - public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(0x01); + public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0); + public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(1); private final int _result; @@ -39,7 +39,6 @@ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPa public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_EXTRACTION_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java index ec82cc14f3..e84d7a7255 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; public static final ExPutShapeShiftingTargetItemResult FAILED = new ExPutShapeShiftingTargetItemResult(RESULT_FAILED, 0); @@ -43,7 +43,6 @@ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_resultId); packet.writeQ(_price); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java index f4d3118cc4..038eae0042 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExShapeShiftingResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; - public static final int RESULT_CLOSE = 0x02; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; + public static final int RESULT_CLOSE = 2; public static final ExShapeShiftingResult FAILED = new ExShapeShiftingResult(RESULT_FAILED, 0, 0); public static final ExShapeShiftingResult CLOSE = new ExShapeShiftingResult(RESULT_CLOSE, 0, 0); @@ -47,7 +47,6 @@ public class ExShapeShiftingResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHAPE_SHIFTING_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_targetItemId); packet.writeD(_extractItemId); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java index eaf0d209fd..4b48b09002 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java @@ -38,7 +38,7 @@ public class ExConfirmVipAttendanceCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CONFIRM_VIP_ATTENDANCE_CHECK.writeId(packet); - packet.writeC(_available ? 0x01 : 0x00); // can receive reward today? 1 else 0 + packet.writeC(_available ? 1 : 0); // can receive reward today? 1 else 0 packet.writeC(_index); // active reward index packet.writeD(0); packet.writeD(0); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java index 9d61fe68d6..dd94df023f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java @@ -45,10 +45,10 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket OutgoingPackets.EX_VIP_ATTENDANCE_ITEM_LIST.writeId(packet); packet.writeC(_available ? _index + 1 : _index); // index to receive? packet.writeC(_index); // last received index? - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeC(0x01); - packet.writeC(_available ? 0x01 : 0x00); // player can receive reward today? + packet.writeD(0); + packet.writeD(0); + packet.writeC(1); + packet.writeC(_available ? 1 : 0); // player can receive reward today? packet.writeC(250); packet.writeC(AttendanceRewardData.getInstance().getRewardsCount()); // reward size int rewardCounter = 0; @@ -57,11 +57,11 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket rewardCounter++; packet.writeD(reward.getId()); packet.writeQ(reward.getCount()); - packet.writeC(0x01); // is unknown? - packet.writeC((rewardCounter % 7) == 0 ? 0x01 : 0x00); // is last in row? + packet.writeC(1); // is unknown? + packet.writeC((rewardCounter % 7) == 0 ? 1 : 0); // is last in row? } - packet.writeC(0x00); - packet.writeD(0x00); + packet.writeC(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java index 7f1d6d60d1..73f93335ef 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java @@ -43,7 +43,6 @@ public class ExCuriousHouseMemberList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_LIST.writeId(packet); - packet.writeD(_id); packet.writeD(_maxPlayers); packet.writeD(_players.size()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java index b71caa5f14..5d9b34db61 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java @@ -37,7 +37,6 @@ public class ExCuriousHouseRemainTime implements IClientOutgoingPacket { OutgoingPackets.EX_CURIOUS_HOUSE_REMAIN_TIME.writeId(packet); packet.writeD(_time); - return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java index 4c3ae253ea..c79b68becc 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java @@ -39,7 +39,6 @@ public class ExResponseCommissionBuyInfo extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_INFO.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java index ddfa8b6db1..c1d29735b8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java @@ -40,7 +40,6 @@ public class ExResponseCommissionBuyItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_ITEM.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java index aa4bbbde24..01e4782408 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java @@ -39,7 +39,6 @@ public class ExResponseCommissionDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_DELETE.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java index e7e3c39816..b915574175 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java @@ -55,7 +55,6 @@ public class ExResponseCommissionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_INFO.writeId(packet); - packet.writeD(_result); packet.writeD(_itemId); packet.writeQ(_presetPricePerUnit); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java index 4963393b42..a012b3ab30 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java @@ -64,7 +64,6 @@ public class ExResponseCommissionList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_LIST.writeId(packet); - packet.writeD(_replyType.getClientId()); switch (_replyType) { @@ -73,13 +72,11 @@ public class ExResponseCommissionList extends AbstractItemPacket { packet.writeD((int) Instant.now().getEpochSecond()); packet.writeD(_chunkId); - int chunkSize = _items.size() - _listIndexStart; if (chunkSize > MAX_CHUNK_SIZE) { chunkSize = MAX_CHUNK_SIZE; } - packet.writeD(chunkSize); for (int i = _listIndexStart; i < (_listIndexStart + chunkSize); i++) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java index b1b0a97d7a..183547af06 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java @@ -39,7 +39,6 @@ public class ExResponseCommissionRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_REGISTER.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java index 74d8a95587..b68386e4ed 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java @@ -35,8 +35,7 @@ public class ExShowCommission implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_COMMISSION.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java index 0c267ecf34..11b1ff1e0a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExEnchantFail implements IClientOutgoingPacket { public static final ExEnchantFail STATIC_PACKET = new ExEnchantFail(0, 0); + private final int _itemOne; private final int _itemTwo; @@ -39,7 +40,6 @@ public class ExEnchantFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_FAIL.writeId(packet); - packet.writeD(_itemOne); packet.writeD(_itemTwo); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java index 71ba811ed5..87d29a8e7c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java @@ -36,7 +36,6 @@ public class ExEnchantSucess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SUCESS.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java index eb4eb8b26c..ec67d50fb6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java @@ -39,7 +39,6 @@ public class ExGetCrystalizingEstimation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - packet.writeD(_items.size()); for (ItemChanceHolder holder : _items) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java index 586d77c13f..2fb9bb65a1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java @@ -40,11 +40,9 @@ public class ExFactionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FACTION_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_openDialog ? 1 : 0); packet.writeD(Faction.values().length); - for (Faction faction : Faction.values()) { packet.writeC(faction.getId()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java index fa605b548a..a99ad7f4e3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java @@ -52,7 +52,7 @@ public class ExFishingStart implements IClientOutgoingPacket packet.writeD(_baitLocation.getX()); packet.writeD(_baitLocation.getY()); packet.writeD(_baitLocation.getZ()); - packet.writeC(0x01); // 0 = newbie, 1 = normal, 2 = night + packet.writeC(1); // 0 = newbie, 1 = normal, 2 = night return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java index 046ad04cb6..74501fe7ff 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java @@ -49,7 +49,6 @@ public class ExUserInfoFishing implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_FISHING.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_isFishing ? 1 : 0); if (_baitLocation == null) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index dc0e3e05bc..336a384bcc 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -47,9 +47,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FRIEND_DETAIL_INFO.writeId(packet); - packet.writeD(_objectId); - if (_friend == null) { packet.writeS(_name); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java index 0d4bb47ff0..a90b7b6083 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java @@ -33,8 +33,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x00); + packet.writeC(0); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java index 9add9c9caa..d24139644c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java @@ -49,7 +49,6 @@ public class FriendAddRequestResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_charId); packet.writeS(_charName); @@ -57,7 +56,7 @@ public class FriendAddRequestResult implements IClientOutgoingPacket packet.writeD(_charObjectId); packet.writeD(_charLevel); packet.writeD(_charClassId); - packet.writeH(0x00); // Always 0 on retail + packet.writeH(0); // Always 0 on retail return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java index a135944662..13a7d01967 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java @@ -86,12 +86,10 @@ public class FriendList implements IClientOutgoingPacket } continue; } - if (player1.isOnline()) { online = true; } - classid = player1.getClassId().getId(); level = player1.getLevel(); _info.add(new FriendInfo(objId, name, online, classid, level)); @@ -102,14 +100,13 @@ public class FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._classid); packet.writeD(info._level); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java index 07c23f9fd2..1bb4142e34 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java @@ -38,7 +38,6 @@ public class FriendRemove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_REMOVE.writeId(packet); - packet.writeD(_responce); packet.writeS(_charName); return true; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java index e8dbddcd63..a3990c0879 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java @@ -52,7 +52,6 @@ public class FriendStatus implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_STATUS.writeId(packet); - packet.writeD(_type); packet.writeS(_name); switch (_type) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java index 8752104e06..78da5850b8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java @@ -50,7 +50,6 @@ public class L2Friend implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND.writeId(packet); - packet.writeD(_action ? 1 : 3); // 1-add 3-remove packet.writeD(_objid); packet.writeS(_name); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java index b69a253635..e50693cb11 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java @@ -81,17 +81,16 @@ public class L2FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._level); packet.writeD(info._classId); - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java index 677c09091f..706c179a9c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java @@ -37,7 +37,6 @@ public class ExMentorAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_ADD.writeId(packet); - packet.writeS(_mentor.getName()); packet.writeD(_mentor.getActiveClass()); packet.writeD(_mentor.getLevel()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java index 4722a9cab3..18c1cdeedf 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java @@ -64,9 +64,8 @@ public class ExMentorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_LIST.writeId(packet); - packet.writeD(_type); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mentees.size()); for (Mentee mentee : _mentees) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java index d739dd94b7..2283920b98 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ListMenteeWaiting implements IClientOutgoingPacket { private static final int PLAYERS_PER_PAGE = 64; + private final List _possibleCandiates = new ArrayList<>(); private final int _page; @@ -51,18 +52,15 @@ public class ListMenteeWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_MENTEE_WAITING.writeId(packet); - - packet.writeD(0x01); // always 1 in retail + packet.writeD(1); // always 1 in retail if (_possibleCandiates.isEmpty()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } - packet.writeD(_possibleCandiates.size()); packet.writeD(_possibleCandiates.size() % PLAYERS_PER_PAGE); - for (Player player : _possibleCandiates) { if ((1 <= (PLAYERS_PER_PAGE * _page)) && (1 > (PLAYERS_PER_PAGE * (_page - 1)))) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java index e33e29a487..fc80b0a6c0 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java @@ -41,7 +41,6 @@ public class ExPledgeContributionInfo implements IClientOutgoingPacket { return false; } - OutgoingPackets.EX_PLEDGE_CONTRIBUTION_INFO.writeId(packet); packet.writeD(_player.getClanContribution()); packet.writeD(_player.getClanContribution()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java index e65c0ced20..64b1bfd2e6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java @@ -44,10 +44,8 @@ public class ExPledgeContributionRank implements IClientOutgoingPacket { return false; } - OutgoingPackets.EX_PLEDGE_CONTRIBUTION_RANK.writeId(packet); packet.writeC(_cycle); - packet.writeD(_clan.getMembersCount()); int order = 1; for (ClanMember member : _clan.getMembers()) @@ -70,7 +68,6 @@ public class ExPledgeContributionRank implements IClientOutgoingPacket packet.writeD(member.getClanContributionTotal()); } } - return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java index c235245d89..e66b814d06 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java @@ -42,9 +42,7 @@ public class ExPledgeItemList extends AbstractItemPacket { return false; } - OutgoingPackets.EX_PLEDGE_ITEM_LIST.writeId(packet); - packet.writeH(ClanShopData.getInstance().getProducts().size()); // Product count. for (ClanShopProductHolder product : ClanShopData.getInstance().getProducts()) { @@ -61,7 +59,6 @@ public class ExPledgeItemList extends AbstractItemPacket packet.writeH(0); // Current stock packet.writeH(0); // Total stock } - return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java index e4df4b523e..21c5ba1724 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java @@ -44,9 +44,7 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket { return false; } - OutgoingPackets.EX_PLEDGE_MASTERY_INFO.writeId(packet); - packet.writeD(clan.getUsedDevelopmentPoints()); // Consumed development points packet.writeD(clan.getTotalDevelopmentPoints()); // Total development points packet.writeD(16); // Mastery count @@ -56,8 +54,7 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket { final int id = mastery.getId(); packet.writeD(id); // Mastery - packet.writeD(0x00); // ? - + packet.writeD(0); // ? boolean available = true; if (clan.getLevel() < mastery.getClanLevel()) { @@ -76,11 +73,9 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket available = clan.hasMastery(previous); } } - - packet.writeC(clan.hasMastery(id) ? 0x02 : available ? 0x01 : 0x00); // Availability. + packet.writeC(clan.hasMastery(id) ? 2 : available ? 1 : 0); // Availability. } } - return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java index d31a014aea..568aa70f70 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java @@ -46,15 +46,12 @@ public class ExPledgeMissionInfo implements IClientOutgoingPacket { return true; } - OutgoingPackets.EX_PLEDGE_MISSION_INFO.writeId(packet); - packet.writeD(_rewards.size()); for (DailyMissionDataHolder reward : _rewards) { int progress = reward.getProgress(_player); int status = reward.getStatus(_player); - // TODO: Figure out this. if (reward.isLevelUpMission()) { @@ -76,12 +73,10 @@ public class ExPledgeMissionInfo implements IClientOutgoingPacket { status = 2; } - packet.writeD(reward.getId()); packet.writeD(progress); packet.writeC(status); } - return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java index ce1d6327e7..604181c6ed 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java @@ -41,10 +41,8 @@ public class ExPledgeMissionRewardCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_MISSION_REWARD_COUNT.writeId(packet); - packet.writeD(Math.min(_availableMissionsCount, _doneMissionsCount)); // Received missions rewards. packet.writeD(_availableMissionsCount); // Available missions rewards. 18 - for noble, 20 - for honnorable noble. - return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java index e59ebcfaab..22cf060348 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java @@ -43,7 +43,6 @@ public class ExPledgeShowInfoUpdate extends AbstractItemPacket { return false; } - OutgoingPackets.EX_PLEDGE_SHOW_INFO_UPDATE.writeId(packet); packet.writeD(clan.getId()); // Clan ID packet.writeD(ClanLevelData.getLevelRequirement(clan.getLevel())); // Next level cost diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index fb735b8925..e75426e598 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -69,7 +69,6 @@ public class ExBRBuyProduct implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUY_PRODUCT.writeId(packet); - packet.writeD(_reply); return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java index 742b3eba9d..91a186b81d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java @@ -39,10 +39,9 @@ public class ExBRGamePoint implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_GAME_POINT.writeId(packet); - packet.writeD(_charId); packet.writeQ(_charPoints); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java index 50f21df46a..e36f2ff502 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java @@ -45,7 +45,6 @@ public class ExBRProductInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_INFO.writeId(packet); - packet.writeD(_item.getBrId()); packet.writeD(_item.getPrice()); packet.writeD(_item.getItems().size()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java index dc851ffd43..0f042ba043 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java @@ -45,9 +45,8 @@ public class ExBRProductList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); // Adena - packet.writeQ(0x00); // Hero coins + packet.writeQ(0); // Hero coins packet.writeC(_type); // Type 0 - Home, 1 - History, 2 - Favorites packet.writeD(_primeList.size()); for (PrimeShopGroup brItem : _primeList) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java index b23e9fa8a9..f4406c1407 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java @@ -38,7 +38,6 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RAID_BOSS_SPAWN_INFO.writeId(packet); - packet.writeD(_bossIds.size()); // alive count for (int id : _bossIds) // alive ids { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java index 2463589c81..c09b3e899d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java @@ -47,18 +47,15 @@ public class ExFlyMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_mapId); - packet.writeD(_locations.size()); for (SayuneEntry loc : _locations) { packet.writeD(loc.getId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(loc.getX()); packet.writeD(loc.getY()); packet.writeD(loc.getZ()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java index 03fc6b580d..70b3fb25d2 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java @@ -47,16 +47,13 @@ public class ExFlyMoveBroadcast implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE_BROADCAST.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); packet.writeD(_mapId); - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD(_currentLoc.getX()); packet.writeD(_currentLoc.getY()); packet.writeD(_currentLoc.getZ()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java index cfe11a27e0..49e5d86910 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java @@ -35,7 +35,6 @@ public class ExNotifyFlyMoveStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_FLY_MOVE_START.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java index d5640a47ef..0efa37ae8c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java @@ -51,7 +51,6 @@ public class ExMoveToLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_SUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_targetX); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java index 0cbe2c3e02..a0314c39aa 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java @@ -46,7 +46,6 @@ public class ExShuttleGetOff implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_OFF.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_x); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java index 5211bef5ba..061bcafed9 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java @@ -43,7 +43,6 @@ public class ExShuttleGetOn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_ON.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java index 97d54a9019..c8aee1fde7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java @@ -43,7 +43,6 @@ public class ExShuttleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHUTTLE_INFO.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD(_shuttle.getX()); packet.writeD(_shuttle.getY()); @@ -60,8 +59,8 @@ public class ExShuttleInfo implements IClientOutgoingPacket packet.writeD(loc.getY()); packet.writeD(loc.getZ()); } - packet.writeD(stop.isDoorOpen() ? 0x01 : 0x00); - packet.writeD(stop.hasDoorChanged() ? 0x01 : 0x00); + packet.writeD(stop.isDoorOpen() ? 1 : 0); + packet.writeD(stop.hasDoorChanged() ? 1 : 0); } return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java index 6ba38f29a1..28b33b998e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java @@ -43,7 +43,6 @@ public class ExShuttleMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_MOVE.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD((int) _shuttle.getStat().getMoveSpeed()); packet.writeD((int) _shuttle.getStat().getRotationSpeed()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java index bf2b6ea6eb..6c31189d6a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java @@ -44,7 +44,6 @@ public class ExStopMoveInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_SHUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java index f7f6849732..8492f42a6e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java @@ -44,7 +44,6 @@ public class ExValidateLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_SHUTTLE.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java index 1d59c6d002..e7654ed911 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java @@ -60,7 +60,7 @@ public class AccountKicked implements IOutgoingPacket { OutgoingPackets.ACCOUNT_KICKED.writeId(packet); packet.writeD(_reason.getCode()); - return true; } } + diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 2e3a1f6163..1fe813e393 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: response + * Format: d d: response */ public class GGAuth implements IOutgoingPacket { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/network/serverpackets/Init.java index 4b3f71f30e..d725f45ca2 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/network/serverpackets/Init.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/network/serverpackets/Init.java @@ -52,7 +52,6 @@ public class Init implements IOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.INIT.writeId(packet); - packet.writeD(_sessionId); // session id packet.writeD(0x0000c621); // protocol revision diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index 8c534554a8..f4dcd22b00 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: the failure reason + * Format: d d: the failure reason */ public class LoginFail implements IOutgoingPacket { diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index c700328f3d..f8b05abb47 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -529,7 +529,7 @@ public class Lindvior extends AbstractNpcAI for (Location loc : CONTROL_GENERATOR_SPAWNS) { guard = (FriendlyNpc) addSpawn(NPC_GENERATOR, loc, true); - guard.setDisplayEffect(0x01); + guard.setDisplayEffect(1); guard.setScriptValue(i++); _generatorSpawn.add(guard); } @@ -685,7 +685,7 @@ public class Lindvior extends AbstractNpcAI if (!hasFlag(_activeMask, 1 << index)) { _activeMask |= 1 << index; - npc.setDisplayEffect(0x02); + npc.setDisplayEffect(2); sendEventTrigger(true, GENERATOR_TRIGERS[index]); _zoneLair.getPlayersInside().stream().forEach(p -> p.broadcastPacket(new Earthquake(p.getX(), p.getY(), p.getZ(), 20, 10))); if (hasFlag(_activeMask, 0xf)) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/BaseRecievePacket.java index c682cb741d..a6ed15ce32 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/BaseRecievePacket.java @@ -73,7 +73,7 @@ public abstract class BaseRecievePacket try { result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE); - result = result.substring(0, result.indexOf(0x00)); + result = result.substring(0, result.indexOf(0)); _off += (result.length() * 2) + 2; } catch (Exception e) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/BaseSendablePacket.java index a9d918de4c..8fa8491cbf 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/commons/network/BaseSendablePacket.java @@ -117,16 +117,16 @@ public abstract class BaseSendablePacket public byte[] getBytes() { // if (this instanceof Init) - // writeD(0x00); // reserve for XOR initial key + // writeD(0); // reserve for XOR initial key - writeD(0x00); // reserve for checksum + writeD(0); // reserve for checksum final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++) { - writeC(0x00); + writeC(0); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/AttackType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/AttackType.java index 6064b10ed7..e9983f15e3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/AttackType.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/AttackType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum AttackType { - MISSED(0x01), - BLOCKED(0x02), - CRITICAL(0x04), - SHOT_USED(0x08); + MISSED(1), + BLOCKED(2), + CRITICAL(4), + SHOT_USED(8); private final int _mask; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/GroupType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/GroupType.java index 954aaace8b..916a14fd05 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/GroupType.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/GroupType.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum GroupType implements IUpdateTypeComponent { - NONE(0x01), - PARTY(0x02), - COMMAND_CHANNEL(0x04); + NONE(1), + PARTY(2), + COMMAND_CHANNEL(4); private int _mask; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/ItemListType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/ItemListType.java index 2d38c8f5b1..c80234439f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/ItemListType.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/ItemListType.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum ItemListType implements IUpdateTypeComponent { - AUGMENT_BONUS(0x01), - ELEMENTAL_ATTRIBUTE(0x02), - ENCHANT_EFFECT(0x04), - VISUAL_ID(0x08), - SOUL_CRYSTAL(0x10); + AUGMENT_BONUS(1), + ELEMENTAL_ATTRIBUTE(2), + ENCHANT_EFFECT(4), + VISUAL_ID(8), + SOUL_CRYSTAL(16); private final int _mask; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java index b3d08596c6..29403b783d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum MacroUpdateType { - ADD(0x01), - LIST(0x01), - MODIFY(0x02), - DELETE(0x00); + ADD(1), + LIST(1), + MODIFY(2), + DELETE(0); private final int _id; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java index 86c6159869..7776721c0f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java @@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum PartySmallWindowUpdateType implements IUpdateTypeComponent { - CURRENT_CP(0x01), - MAX_CP(0x02), - CURRENT_HP(0x04), - MAX_HP(0x08), - CURRENT_MP(0x10), - MAX_MP(0x20), - LEVEL(0x40), - CLASS_ID(0x80), - PARTY_SUBSTITUTE(0x100), - VITALITY_POINTS(0x200); + CURRENT_CP(1), + MAX_CP(2), + CURRENT_HP(4), + MAX_HP(8), + CURRENT_MP(16), + MAX_MP(32), + LEVEL(64), + CLASS_ID(128), + PARTY_SUBSTITUTE(256), + VITALITY_POINTS(512); private final int _mask; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 00bb331778..667ce7f17c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.Broadcast; import org.l2jmobius.gameserver.util.Util; /** - * Fromat:(ch) dddddc + * Format:(ch) dddddc * @author -Wooden- */ public class RequestExMagicSkillUseGround implements IClientIncomingPacket diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java index ec60042793..6054868de7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java @@ -39,7 +39,6 @@ public class AbnormalStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ABNORMAL_STATUS_UPDATE.writeId(packet); - packet.writeH(_effects.size()); for (BuffInfo info : _effects) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 1b8ddb2042..bec794bef3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -44,7 +44,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; } @@ -60,7 +59,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; setHtml(html); } @@ -77,13 +75,11 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } - if (!html.contains(""; return; } - _html = html; } @@ -96,7 +92,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } - setHtml(content); return true; } @@ -138,12 +133,10 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { player.clearHtmlActions(getScope()); } - if (_disabledValidation) { return; } - if (player != null) { Util.buildHtmlActionCache(player, getScope(), _npcObjId, _html); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index e9cd6a88b8..b99d4d3348 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -86,8 +86,8 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket= 0) || (item.getAttributeDefence(AttributeType.FIRE) > 0) || (item.getAttributeDefence(AttributeType.WATER) > 0) || (item.getAttributeDefence(AttributeType.WIND) > 0) || (item.getAttributeDefence(AttributeType.EARTH) > 0) || (item.getAttributeDefence(AttributeType.HOLY) > 0) || (item.getAttributeDefence(AttributeType.DARK) > 0)) { mask |= ItemListType.ELEMENTAL_ATTRIBUTE.getMask(); } - if (item.getEnchantOptions() != null) { for (int id : item.getEnchantOptions()) @@ -184,17 +182,14 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket 0) { mask |= ItemListType.VISUAL_ID.getMask(); } - if (((item.getSoulCrystalOptions() != null) && !item.getSoulCrystalOptions().isEmpty()) || ((item.getSoulCrystalSpecialOptions() != null) && !item.getSoulCrystalSpecialOptions().isEmpty())) { mask |= ItemListType.SOUL_CRYSTAL.getMask(); } - return mask; } @@ -262,7 +257,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); packet.writeC(removeSkills.size()); for (Skill removed : removeSkills) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java index 8fa6259f64..6451dffd02 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ActionFailed implements IClientOutgoingPacket { public static final ActionFailed STATIC_PACKET = new ActionFailed(); - private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); + private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); static { for (SkillCastingType castingType : SkillCastingType.values()) @@ -57,7 +57,6 @@ public class ActionFailed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ACTION_FAIL.writeId(packet); - packet.writeD(_castingType); // MagicSkillUse castingType return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java index 6e868368c9..30ce58da60 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java @@ -44,9 +44,8 @@ public class AgitDecoInfo implements IClientOutgoingPacket { continue; } - packet.writeC(_residense.hasFunction(type) ? 0x01 : 0x00); + packet.writeC(_residense.hasFunction(type) ? 1 : 0); } - // Unknown packet.writeD(0); // TODO: Find me! packet.writeD(0); // TODO: Find me! diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java index 6cb71fc985..4683fb30f0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java @@ -44,7 +44,6 @@ public class AllianceInfo implements IClientOutgoingPacket _name = leader.getAllyName(); _leaderC = leader.getName(); _leaderP = leader.getLeaderName(); - final Collection allies = ClanTable.getInstance().getClanAllies(allianceId); _allies = new ClanInfo[allies.size()]; int idx = 0; @@ -57,7 +56,6 @@ public class AllianceInfo implements IClientOutgoingPacket total += ci.getTotal(); online += ci.getOnline(); } - _total = total; _online = online; } @@ -66,18 +64,16 @@ public class AllianceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_INFO.writeId(packet); - packet.writeS(_name); packet.writeD(_total); packet.writeD(_online); packet.writeS(_leaderC); packet.writeS(_leaderP); - packet.writeD(_allies.length); for (ClanInfo aci : _allies) { packet.writeS(aci.getClan().getName()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(aci.getClan().getLevel()); packet.writeS(aci.getClan().getLeaderName()); packet.writeD(aci.getTotal()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java index f9d08f6600..186fd12e81 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java @@ -44,7 +44,6 @@ public class AllyCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java index 6218f1717f..1ae4653f91 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java @@ -38,7 +38,6 @@ public class AskJoinAlly implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_ALLIANCE.writeId(packet); - packet.writeD(_requestorObjId); packet.writeS(null); // Ally Name ? packet.writeS(null); // TODO: Find me! diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java index a66bb3cd33..b9cfbe81b9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java @@ -39,7 +39,6 @@ public class AskJoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_PARTY.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 05c420ff59..227ab571be 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -45,7 +45,6 @@ public class Attack implements IClientOutgoingPacket _attackerObjId = attacker.getObjectId(); _attackerLoc = new Location(attacker); _targetLoc = new Location(target); - final Player player = attacker.getActingPlayer(); if (player == null) { @@ -111,7 +110,6 @@ public class Attack implements IClientOutgoingPacket final Iterator it = _hits.iterator(); final Hit firstHit = it.next(); OutgoingPackets.ATTACK.writeId(packet); - packet.writeD(_attackerObjId); packet.writeD(firstHit.getTargetId()); packet.writeD(_soulshotVisualSubstitute); // Ertheia @@ -121,13 +119,11 @@ public class Attack implements IClientOutgoingPacket packet.writeD(_attackerLoc.getX()); packet.writeD(_attackerLoc.getY()); packet.writeD(_attackerLoc.getZ()); - packet.writeH(_hits.size() - 1); while (it.hasNext()) { writeHit(packet, it.next()); } - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java index bd6878eb42..8b85fe85e3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java @@ -35,7 +35,6 @@ public class AutoAttackStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_START.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java index e767d1877a..a294b1e212 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java @@ -35,7 +35,6 @@ public class AutoAttackStop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_STOP.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java index 3f329415df..0c79677eae 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java @@ -38,7 +38,6 @@ public class BlockListPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BLOCK_LIST.writeId(packet); - packet.writeD(_playersId.size()); for (int playerId : _playersId) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index f610cdc6aa..d95f0543b9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -45,8 +45,7 @@ public class BuyList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x00); // Type BUY + packet.writeD(0); // Type BUY packet.writeQ(_money); // current money packet.writeD(_listId); packet.writeD(_inventorySlots); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index cd25af908d..7cb2bf4425 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -50,36 +50,34 @@ public class BuyListSeed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BUY_LIST_SEED.writeId(packet); - packet.writeQ(_money); // current money - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeD(_manorId); // manor id - if (!_list.isEmpty()) { packet.writeH(_list.size()); // list length for (SeedProduction s : _list) { - packet.writeC(0x00); // mask item 0 to print minimal item information + packet.writeC(0); // mask item 0 to print minimal item information packet.writeD(s.getId()); // ObjectId packet.writeD(s.getId()); // ItemId packet.writeC(0xFF); // T1 packet.writeQ(s.getAmount()); // Quantity - packet.writeC(0x05); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item - packet.writeC(0x00); // Filler (always 0) - packet.writeH(0x00); // Equipped : 00-No, 01-yes - packet.writeQ(0x00); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand - packet.writeH(0x00); // Enchant level (pet level shown in control item) + packet.writeC(5); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item + packet.writeC(0); // Filler (always 0) + packet.writeH(0); // Equipped : 00-No, 01-yes + packet.writeQ(0); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand + packet.writeH(0); // Enchant level (pet level shown in control item) packet.writeD(-1); packet.writeD(-9999); - packet.writeC(0x01); // GOD Item enabled = 1 disabled (red) = 0 + packet.writeC(1); // GOD Item enabled = 1 disabled (red) = 0 packet.writeQ(s.getPrice()); // price } _list.clear(); } else { - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java index 3a7b67af23..f3dc872dca 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java @@ -32,8 +32,7 @@ public class CSShowComBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - - packet.writeC(0x01); // c4 1 to show community 00 to hide + packet.writeC(1); // c4 1 to show community 00 to hide packet.writeB(_html); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java index eacc27aa07..b18dac4cc3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java @@ -36,7 +36,6 @@ public class CameraMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CAMERA_MODE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java index 1682f5bc62..adea754676 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java @@ -39,7 +39,6 @@ public class ChairSit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAIR_SIT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_staticObjectId); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java index 2bc31a285a..de141fa067 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java @@ -38,7 +38,6 @@ public class ChangeMoveType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_MOVE_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_running ? RUN : WALK); packet.writeD(0); // c2 diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index 73277d923d..fbe5e39e2e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -22,17 +22,17 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ChangeWaitType implements IClientOutgoingPacket { + public static final int WT_SITTING = 0; + public static final int WT_STANDING = 1; + public static final int WT_START_FAKEDEATH = 2; + public static final int WT_STOP_FAKEDEATH = 3; + private final int _objectId; private final int _moveType; private final int _x; private final int _y; private final int _z; - public static final int WT_SITTING = 0; - public static final int WT_STANDING = 1; - public static final int WT_START_FAKEDEATH = 2; - public static final int WT_STOP_FAKEDEATH = 3; - public ChangeWaitType(Creature creature, int newMoveType) { _objectId = creature.getObjectId(); @@ -46,7 +46,6 @@ public class ChangeWaitType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_WAIT_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_moveType); packet.writeD(_x); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index 41180bac50..aa2e7b2eaa 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -30,7 +30,6 @@ public class CharCreateFail implements IClientOutgoingPacket public static final int REASON_CREATE_NOT_ALLOWED = 0x05; // "Characters cannot be created from this server." public static final int REASON_CHOOSE_ANOTHER_SVR = 0x06; // "Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please // choose another server." - private final int _error; public CharCreateFail(int errorCode) @@ -42,7 +41,6 @@ public class CharCreateFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index f0e99885ad..768617e558 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -31,8 +31,7 @@ public class CharCreateOk implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_SUCCESS.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index bed289ca0a..1674eef343 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -33,7 +33,6 @@ public class CharDeleteFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_DELETE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 95a808c69e..5311ae5093 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -33,6 +33,22 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { + private static final int[] PAPERDOLL_ORDER = new int[] + { + Inventory.PAPERDOLL_UNDER, + Inventory.PAPERDOLL_HEAD, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_LHAND, + Inventory.PAPERDOLL_GLOVES, + Inventory.PAPERDOLL_CHEST, + Inventory.PAPERDOLL_LEGS, + Inventory.PAPERDOLL_FEET, + Inventory.PAPERDOLL_CLOAK, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_HAIR, + Inventory.PAPERDOLL_HAIR2 + }; + private final Player _player; private final Clan _clan; private int _objId; @@ -55,22 +71,6 @@ public class CharInfo implements IClientOutgoingPacket private int _vehicleId = 0; private final boolean _gmSeeInvis; - private static final int[] PAPERDOLL_ORDER = new int[] - { - Inventory.PAPERDOLL_UNDER, - Inventory.PAPERDOLL_HEAD, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_LHAND, - Inventory.PAPERDOLL_GLOVES, - Inventory.PAPERDOLL_CHEST, - Inventory.PAPERDOLL_LEGS, - Inventory.PAPERDOLL_FEET, - Inventory.PAPERDOLL_CLOAK, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_HAIR, - Inventory.PAPERDOLL_HAIR2 - }; - public CharInfo(Player player, boolean gmSeeInvis) { _player = player; @@ -119,16 +119,15 @@ public class CharInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); // Confirmed packet.writeD(_y); // Confirmed packet.writeD(_z); // Confirmed packet.writeD(_vehicleId); // Confirmed packet.writeD(_objId); // Confirmed packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed - packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) @@ -152,10 +151,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.getPvpFlag()); packet.writeD(_player.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -166,53 +163,40 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); - packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeS(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle()); - packet.writeD(_player.getAppearance().getVisibleClanId()); packet.writeD(_player.getAppearance().getVisibleClanCrestId()); packet.writeD(_player.getAppearance().getVisibleAllyId()); packet.writeD(_player.getAppearance().getVisibleAllyCrestId()); - - packet.writeC(_player.isSitting() ? 0x00 : 0x01); // Confirmed - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // Confirmed - packet.writeC(_player.isInCombat() ? 0x01 : 0x00); // Confirmed - - packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 0x01 : 0x00); // Confirmed - - packet.writeC(_player.isInvisible() ? 0x01 : 0x00); - + packet.writeC(_player.isSitting() ? 0 : 1); // Confirmed + packet.writeC(_player.isRunning() ? 1 : 0); // Confirmed + packet.writeC(_player.isInCombat() ? 1 : 0); // Confirmed + packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 1 : 0); // Confirmed + packet.writeC(_player.isInvisible() ? 1 : 0); packet.writeC(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount packet.writeC(_player.getPrivateStoreType().getId()); // Confirmed packet.writeH(_player.getCubics().size()); // Confirmed _player.getCubics().keySet().forEach(packet::writeH); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); // Confirmed packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); packet.writeH(_player.getRecomHave()); // Confirmed packet.writeD(_player.getMountNpcId() == 0 ? 0 : _player.getMountNpcId() + 1000000); - packet.writeD(_player.getClassId().getId()); // Confirmed - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeC(_player.isMounted() ? 0 : _enchantLevel); // Confirmed - packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeD(_player.getClanCrestLargeId()); packet.writeC(_player.getNobleLevel()); // Confirmed packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 2 : 0); // 152 - Value for enabled changed to 2? packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed - final ILocational baitLocation = _player.getFishing().getBaitLocation(); if (baitLocation != null) { @@ -228,29 +212,21 @@ public class CharInfo implements IClientOutgoingPacket } packet.writeD(_player.getAppearance().getNameColor()); // Confirmed - packet.writeD(_heading); // Confirmed - packet.writeC(_player.getPledgeClass()); packet.writeH(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); // Confirmed - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - - packet.writeC(0x00); // nPvPRestrainStatus - + packet.writeC(0); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentHp())); // Confirmed packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - - packet.writeC(0x00); // cBRLectureMark + packet.writeC(0); // cBRLectureMark final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed @@ -262,8 +238,9 @@ public class CharInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } + packet.writeC(_player.isTrueHero() ? 100 : 0); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); // Hair accessory + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); // Hair accessory packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 7187b73184..11f5f4df52 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -40,17 +40,16 @@ public class CharSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTED.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getTitle()); packet.writeD(_sessionId); packet.writeD(_player.getClanId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x01); // active ?? + packet.writeD(1); // active ?? packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -62,25 +61,20 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_player.getReputation()); packet.writeD(_player.getPkKills()); packet.writeD(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_player.getClassId().getId()); - packet.writeB(new byte[16]); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeB(new byte[28]); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 88a0e7803b..815217150e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -45,10 +45,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { private static final Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); - private final String _loginName; - private final int _sessionId; - private int _activeId; - private final List _characterPackages; private static final int[] PAPERDOLL_ORDER = new int[] { @@ -113,7 +109,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_ARTIFACT20, // 152 Inventory.PAPERDOLL_ARTIFACT21 // 152 }; - private static final int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, @@ -127,6 +122,11 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_HAIR2, }; + private final String _loginName; + private final int _sessionId; + private int _activeId; + private final List _characterPackages; + /** * Constructor for CharSelectionInfo. * @param loginName @@ -157,16 +157,13 @@ public class CharSelectionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.size(); packet.writeD(size); // Created character count - packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) - packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 0x01 : 0x00); // if 1 can't create new char - packet.writeC(0x01); // 0=can't play, 1=can play free until level 85, 2=100% free play - packet.writeD(0x02); // if 1, Korean client - packet.writeC(0x00); // Gift message for inactive accounts // 152 - + packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 1 : 0); // if 1 can't create new char + packet.writeC(1); // 0=can't play, 1=can play free until level 85, 2=100% free play + packet.writeD(2); // if 1, Korean client + packet.writeC(0); // Gift message for inactive accounts // 152 // Balthus Knights if (Config.BALTHUS_KNIGHTS_ENABLED) { @@ -175,23 +172,22 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (Config.PREMIUM_SYSTEM_ENABLED) { PremiumManager.getInstance().loadPremiumData(_loginName); - packet.writeC(PremiumManager.getInstance().getPremiumExpiration(_loginName) > 0 ? 0x01 : 0x00); + packet.writeC(PremiumManager.getInstance().getPremiumExpiration(_loginName) > 0 ? 1 : 0); } else { - packet.writeC(0x00); + packet.writeC(0); } } else { - packet.writeC(0x01); + packet.writeC(1); } } else { - packet.writeC(0x00); + packet.writeC(0); } - long lastAccess = 0; if (_activeId == -1) { @@ -204,7 +200,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - for (int i = 0; i < size; i++) { final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); @@ -212,89 +207,72 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name packet.writeD(_sessionId); // Account ID - packet.writeD(0x00); // Clan ID - packet.writeD(0x00); // Builder level - + packet.writeD(0); // Clan ID + packet.writeD(0); // Builder level packet.writeD(charInfoPackage.getSex()); // Sex packet.writeD(charInfoPackage.getRace()); // Race packet.writeD(charInfoPackage.getBaseClassId()); - - packet.writeD(0x01); // GameServerName - + packet.writeD(1); // GameServerName packet.writeD(charInfoPackage.getX()); packet.writeD(charInfoPackage.getY()); packet.writeD(charInfoPackage.getZ()); packet.writeF(charInfoPackage.getCurrentHp()); packet.writeF(charInfoPackage.getCurrentMp()); - packet.writeQ(charInfoPackage.getSp()); packet.writeQ(charInfoPackage.getExp()); packet.writeF((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel()))); packet.writeD(charInfoPackage.getLevel()); - packet.writeD(charInfoPackage.getReputation()); packet.writeD(charInfoPackage.getPkKills()); packet.writeD(charInfoPackage.getPvPKills()); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); // Ertheia - packet.writeD(0x00); // Ertheia - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); // Ertheia + packet.writeD(0); // Ertheia for (int slot : getPaperdollOrder()) { packet.writeD(charInfoPackage.getPaperdollItemId(slot)); } - for (int slot : getPaperdollOrderVisualId()) { packet.writeD(charInfoPackage.getPaperdollItemVisualId(slot)); } - packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_CHEST)); // Upper Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_LEGS)); // Lower Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_HEAD)); // Headgear enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_GLOVES)); // Gloves enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_FEET)); // Boots enchant level - packet.writeD(charInfoPackage.getHairStyle()); packet.writeD(charInfoPackage.getHairColor()); packet.writeD(charInfoPackage.getFace()); - packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); - packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption1Id() : 0); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption2Id() : 0); - // packet.writeD(charInfoPackage.getTransformId()); // Used to display Transformations - packet.writeD(0x00); // Currently on retail when you are on character select you don't see your transformation. - - packet.writeD(0x00); // Pet NpcId - packet.writeD(0x00); // Pet level - packet.writeD(0x00); // Pet Food - packet.writeD(0x00); // Pet Food Level - packet.writeF(0x00); // Current pet HP - packet.writeF(0x00); // Current pet MP - + packet.writeD(0); // Currently on retail when you are on character select you don't see your transformation. + packet.writeD(0); // Pet NpcId + packet.writeD(0); // Pet level + packet.writeD(0); // Pet Food + packet.writeD(0); // Pet Food Level + packet.writeF(0); // Current pet HP + packet.writeF(0); // Current pet MP packet.writeD(charInfoPackage.getVitalityPoints()); // Vitality packet.writeD((int) Config.RATE_VITALITY_EXP_MULTIPLIER * 100); // Vitality Percent packet.writeD(charInfoPackage.getVitalityItemsUsed()); // Remaining vitality item uses - packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0x00 : 0x01); // Char is active or not - packet.writeC(charInfoPackage.isNoble() ? 0x01 : 0x00); - packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 0x02 : 0x00); // Hero glow - packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 0x01 : 0x00); // Show hair accessory if enabled + packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0 : 1); // Char is active or not + packet.writeC(charInfoPackage.isNoble() ? 1 : 0); + packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 2 : 0); // Hero glow + packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 1 : 0); // Show hair accessory if enabled } return true; } @@ -303,7 +281,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); - try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate")) { @@ -316,7 +293,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (charInfopackage != null) { characterList.add(charInfopackage); - final Player player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { @@ -330,7 +306,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return characterList; } @@ -372,7 +347,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { clan.removeClanMember(objectId, 0); } - GameClient.deleteCharByObjId(objectId); return null; } @@ -391,20 +365,16 @@ public class CharSelectionInfo implements IClientOutgoingPacket charInfopackage.setHairStyle(chardata.getInt("hairstyle")); charInfopackage.setHairColor(chardata.getInt("haircolor")); charInfopackage.setSex(chardata.getInt("sex")); - charInfopackage.setExp(chardata.getLong("exp")); charInfopackage.setSp(chardata.getLong("sp")); charInfopackage.setVitalityPoints(chardata.getInt("vitality_points")); charInfopackage.setClanId(chardata.getInt("clanid")); - charInfopackage.setRace(chardata.getInt("race")); - final int baseClassId = chardata.getInt("base_class"); final int activeClassId = chardata.getInt("classid"); charInfopackage.setX(chardata.getInt("x")); charInfopackage.setY(chardata.getInt("y")); charInfopackage.setZ(chardata.getInt("z")); - final int faction = chardata.getInt("faction"); if (faction == 1) { @@ -414,7 +384,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setEvil(); } - if (Config.MULTILANG_ENABLE) { String lang = chardata.getString("language"); @@ -424,22 +393,18 @@ public class CharSelectionInfo implements IClientOutgoingPacket } charInfopackage.setHtmlPrefix("data/lang/" + lang + "/"); } - // if is in subclass, load subclass exp, sp, level info if (baseClassId != activeClassId) { loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId); } - charInfopackage.setClassId(activeClassId); - // Get the augmentation id for equipped weapon int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); if (weaponObjId < 1) { weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); } - if (weaponObjId > 0) { try (Connection con = DatabaseFactory.getConnection(); @@ -465,7 +430,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } - // Check if the base class is set to zero and also doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly. if ((baseClassId == 0) && (activeClassId > 0)) { @@ -475,7 +439,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setBaseClassId(baseClassId); } - charInfopackage.setDeleteTimer(deletetime); charInfopackage.setLastAccess(chardata.getLong("lastAccess")); charInfopackage.setNoble(chardata.getInt("nobless") == 1); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java index 847e24db87..d59df7911a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java @@ -32,7 +32,6 @@ public class ChooseInventoryItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHOOSE_INVENTORY_ITEM.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java index 12a3940521..ac66c2fa0f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java @@ -32,7 +32,6 @@ public class ClientSetTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CLIENT_SET_TIME.writeId(packet); - packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // time in client minutes packet.writeD(6); // constant to match the server time( this determines the speed of the client clock) return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java index 195824578b..5fdb62f544 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java @@ -68,7 +68,6 @@ public class ConfirmDlg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CONFIRM_DLG.writeId(packet); - final SMParam[] params = _systemMessage.getParams(); packet.writeD(_systemMessage.getId()); packet.writeD(params.length); @@ -130,7 +129,6 @@ public class ConfirmDlg implements IClientOutgoingPacket } } } - packet.writeD(_time); packet.writeD(_requesterId); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 2a98428740..85d5630327 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -71,7 +71,6 @@ public class CreatureSay implements IClientOutgoingPacket _mask |= 0x08; } } - // Does not shows level if (sender.isGM()) { @@ -123,7 +122,6 @@ public class CreatureSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_sender == null ? 0 : _sender.getObjectId()); packet.writeD(_chatType.getClientId()); if (_senderName != null) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index dfc40d995f..a307b06e4b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -38,9 +38,8 @@ public class DeleteObject implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DELETE_OBJECT.writeId(packet); - packet.writeD(_objectId); - packet.writeC(0x00); // c2 + packet.writeC(0); // c2 return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java index 982c8f3311..3b5917e55b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java @@ -50,7 +50,6 @@ public class Dice implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DICE.writeId(packet); - packet.writeD(_objectId); // object id of player packet.writeD(_itemId); // item id of dice (spade) 4625,4626,4627,4628 packet.writeD(_number); // number rolled diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 3d741a86a6..ebc93d0fc4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -68,7 +68,6 @@ public class Die implements IClientOutgoingPacket siegeClan = fort.getSiege().getAttackerClan(clan); isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan); } - _toVillage = creature.canRevive() && !creature.isPendingRevive(); _toClanHall = (clan != null) && (clan.getHideoutId() > 0); _toCastle = ((clan != null) && (clan.getCastleId() > 0)) || isInCastleDefense; @@ -76,7 +75,6 @@ public class Die implements IClientOutgoingPacket _useFeather = creature.getAccessLevel().allowFixedRes() || creature.getInventory().haveItemForSelfResurrection(); _toFortress = ((clan != null) && (clan.getFortId() > 0)) || isInFortDefense; } - _isSweepable = creature.isAttackable() && creature.isSweepActive(); } @@ -91,7 +89,6 @@ public class Die implements IClientOutgoingPacket { _items = new ArrayList<>(8); } - if (_items.size() < 8) { _items.add(itemId); @@ -116,20 +113,18 @@ public class Die implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DIE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_toVillage ? 0x01 : 0x00); - packet.writeD(_toClanHall ? 0x01 : 0x00); - packet.writeD(_toCastle ? 0x01 : 0x00); - packet.writeD(_toOutpost ? 0x01 : 0x00); - packet.writeD(_isSweepable ? 0x01 : 0x00); - packet.writeD(_useFeather ? 0x01 : 0x00); - packet.writeD(_toFortress ? 0x01 : 0x00); - packet.writeD(0x00); // Disables use Feather button for X seconds - packet.writeD(0x00); // Adventure's Song - packet.writeC(_hideAnimation ? 0x01 : 0x00); - - packet.writeD(_itemsEnabled ? 0x01 : 0x00); + packet.writeD(_toVillage ? 1 : 0); + packet.writeD(_toClanHall ? 1 : 0); + packet.writeD(_toCastle ? 1 : 0); + packet.writeD(_toOutpost ? 1 : 0); + packet.writeD(_isSweepable ? 1 : 0); + packet.writeD(_useFeather ? 1 : 0); + packet.writeD(_toFortress ? 1 : 0); + packet.writeD(0); // Disables use Feather button for X seconds + packet.writeD(0); // Adventure's Song + packet.writeC(_hideAnimation ? 1 : 0); + packet.writeD(_itemsEnabled ? 1 : 0); packet.writeD(getItems().size()); getItems().forEach(packet::writeD); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java index 15404f9dee..5837faec19 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java @@ -33,7 +33,6 @@ public class DoorInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_INFO.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.getId()); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java index 54f8742a73..14d41afee7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java @@ -33,7 +33,6 @@ public class DoorStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_STATUS_UPDATE.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.isOpen() ? 0 : 1); packet.writeD(_door.getDamage()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index b12458e719..3035890956 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -40,20 +40,17 @@ public class DropItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DROP_ITEM.writeId(packet); - packet.writeD(_objectId); packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeC(_item.isStackable() ? 0x01 : 0x00); + packet.writeC(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - - packet.writeC(0x00); - // packet.writeD(0x01); if above C == true (1) then packet.readD() + packet.writeC(0); + // packet.writeD(1); if above C == true (1) then packet.readD() packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java index 631c43ba0c..99bd80d97e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java @@ -62,13 +62,12 @@ public class Earthquake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EARTHQUAKE.writeId(packet); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_intensity); packet.writeD(_duration); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index db168592f1..335ea9dced 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -58,7 +58,6 @@ public class EnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_crystal); packet.writeQ(_count); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java index 837be1f5e3..169410245b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java @@ -41,7 +41,6 @@ public class EtcStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ETC_STATUS_UPDATE.writeId(packet); - packet.writeC(_player.getCharges()); // 1-7 increase force, level packet.writeD(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%) packet.writeC(_player.getExpertiseWeaponPenalty()); // Weapon Grade Penalty [1-4] diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java index 5dca90f960..9f8d576148 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java @@ -24,13 +24,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class Ex2ndPasswordAck implements IClientOutgoingPacket { + // TODO: Enum + public static final int SUCCESS = 0; + public static final int WRONG_PATTERN = 1; + private final int _status; private final int _response; - // TODO: Enum - public static final int SUCCESS = 0x00; - public static final int WRONG_PATTERN = 0x01; - public Ex2ndPasswordAck(int status, int response) { _status = status; @@ -41,10 +41,9 @@ public class Ex2ndPasswordAck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_ACK.writeId(packet); - packet.writeC(_status); - packet.writeD(_response == WRONG_PATTERN ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(_response == WRONG_PATTERN ? 1 : 0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java index 48bde5161d..c86b5185d0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordCheck implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_NEW = 0x00; - public static final int PASSWORD_PROMPT = 0x01; - public static final int PASSWORD_OK = 0x02; + public static final int PASSWORD_NEW = 0; + public static final int PASSWORD_PROMPT = 1; + public static final int PASSWORD_OK = 2; private final int _windowType; @@ -40,9 +40,8 @@ public class Ex2ndPasswordCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_CHECK.writeId(packet); - packet.writeD(_windowType); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java index 1abf50ab01..f6731bf18f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordVerify implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_OK = 0x00; - public static final int PASSWORD_WRONG = 0x01; - public static final int PASSWORD_BAN = 0x02; + public static final int PASSWORD_OK = 0; + public static final int PASSWORD_WRONG = 1; + public static final int PASSWORD_BAN = 2; private final int _wrongTentatives; private final int _mode; @@ -42,7 +42,6 @@ public class Ex2ndPasswordVerify implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_VERIFY.writeId(packet); - packet.writeD(_mode); packet.writeD(_wrongTentatives); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java index 8f3d5ec764..528988ab5f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java @@ -45,10 +45,8 @@ public class ExAbnormalStatusUpdateFromTarget implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ABNORMAL_STATUS_UPDATE_FROM_TARGET.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeH(_effects.size()); - for (BuffInfo info : _effects) { packet.writeD(info.getSkill().getDisplayId()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java index c4b9cd8356..f3abd6ec5c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java @@ -41,7 +41,6 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRABLE_SKILL_LIST_BY_CLASS.writeId(packet); - packet.writeH(_type.getId()); packet.writeH(_learnable.size()); for (SkillLearn skill : _learnable) @@ -54,7 +53,7 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket packet.writeC(skill.getRequiredItems().size()); if (_type == AcquireSkillType.SUBPLEDGE) { - packet.writeH(0x00); + packet.writeH(0); } } return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java index fd0e2fc97c..8555bb6e86 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java @@ -61,7 +61,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_SKILL_INFO.writeId(packet); - packet.writeD(_id); packet.writeD(_level); packet.writeQ(_spCost); @@ -73,7 +72,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket packet.writeD(holder.getId()); packet.writeQ(holder.getCount()); } - packet.writeD(_skillRem.size()); for (Skill skill : _skillRem) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java index 29793f4d6c..ff8c526ec4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java @@ -36,7 +36,6 @@ public class ExAdenaInvenCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ADENA_INVEN_COUNT.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeH(_player.getInventory().getSize()); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java index 2aa2d85bc5..5ef11e0f1e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java @@ -50,13 +50,11 @@ public class ExAirShipInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_INFO.writeId(packet); - packet.writeD(_ship.getObjectId()); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(_captain); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); @@ -73,14 +71,13 @@ public class ExAirShipInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - packet.writeD(_ship.getFuel()); packet.writeD(_ship.getMaxFuel()); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java index 4cfc76bfba..8b37f4fc0a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java @@ -42,7 +42,6 @@ public class ExAirShipStopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_airShipId); packet.writeD(_playerId); packet.writeD(_x); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java index 33c57712da..52958f931b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java @@ -37,12 +37,10 @@ public class ExAirShipTeleportList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_TELEPORT_LIST.writeId(packet); - packet.writeD(_dockId); if (_teleports != null) { packet.writeD(_teleports.length); - for (int i = 0; i < _teleports.length; i++) { packet.writeD(i - 1); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java index 392b228f0d..7918022c72 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java @@ -50,13 +50,12 @@ public class ExAlchemySkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_SKILL_LIST.writeId(packet); - packet.writeD(_skills.size()); for (Skill skill : _skills) { packet.writeD(skill.getId()); packet.writeD(skill.getLevel()); - packet.writeQ(0x00); // Always 0 on Naia, SP i guess? + packet.writeQ(0); // Always 0 on Naia, SP i guess? packet.writeC(skill.getId() == CommonSkill.ALCHEMY_CUBE.getId() ? 0 : 1); // This is type in flash, visible or not } return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java index 3bfadd2650..ed7f8d4255 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java @@ -47,12 +47,10 @@ public class ExAlterSkillRequest implements IClientOutgoingPacket { return true; } - OutgoingPackets.EX_ALTER_SKILL_REQUEST.writeId(packet); packet.writeD(_nextSkillId); packet.writeD(_currentSkillId); packet.writeD(_alterTime); - if (_alterTime > 0) { _player.setAlterSkillActive(true); @@ -62,7 +60,6 @@ public class ExAlterSkillRequest implements IClientOutgoingPacket _player.setAlterSkillActive(false); }, _alterTime * 1000); } - return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java index 3d7ee12a81..1990e1e701 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java @@ -37,7 +37,6 @@ public class ExAskCoupleAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_COUPLE_ACTION.writeId(packet); - packet.writeD(_actionId); packet.writeD(_objectId); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java index 61cabedd98..45615daf5a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java @@ -39,9 +39,8 @@ public class ExAskJoinMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_MPCC.writeId(packet); - packet.writeS(_requestorName); // name of CCLeader - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java index 17fa9d028f..908022ff7e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java @@ -38,7 +38,6 @@ public class ExAskJoinPartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_PARTY_ROOM.writeId(packet); - packet.writeS(_charName); packet.writeS(_roomName); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java index 2a6b958dc9..1551840013 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java @@ -38,7 +38,6 @@ public class ExAskModifyPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_MODIFY_PARTY_LOOTING.writeId(packet); - packet.writeS(_requestor); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java index 958e7c3d06..fa62c8a207 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java @@ -45,7 +45,6 @@ public class ExAttributeEnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ATTRIBUTE_ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeC(_isWeapon); packet.writeH(_type); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java index 1a3a1ef3fe..3d65055b3c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java @@ -41,9 +41,8 @@ public class ExAutoSoulShot implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AUTO_SOUL_SHOT.writeId(packet); - packet.writeD(_itemId); - packet.writeD(_enable ? 0x01 : 0x00); + packet.writeD(_enable ? 1 : 0); packet.writeD(_type); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java index 8680c6bd7a..a8137347ec 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java @@ -37,8 +37,7 @@ public class ExBaseAttributeCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASE_ATTRIBUTE_CANCEL_RESULT.writeId(packet); - - packet.writeD(0x01); // result + packet.writeD(1); // result packet.writeD(_objId); packet.writeD(_attribute); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java index acbad69599..27f7fb5a63 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java @@ -75,7 +75,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 1149, 1150, 1151, 1152, 1153, 1154, 1155 }; - public static final int[] DEFAULT_ACTION_LIST = { 0, 1, 2, 3, @@ -145,7 +144,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 5012, 5013, 5014, 5015 }; //@formatter:on - public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST); private final int[] _actionIds; @@ -159,7 +157,6 @@ public class ExBasicActionList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASIC_ACTION_LIST.writeId(packet); - packet.writeD(_actionIds.length); for (int _actionId : _actionIds) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java index 4c4fac8c91..d32dca4d21 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java @@ -34,13 +34,14 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBeautyItemList implements IClientOutgoingPacket { - private int _colorCount; - private final BeautyData _beautyData; - private final Map> _colorData = new HashMap<>(); private static final int HAIR_TYPE = 0; private static final int FACE_TYPE = 1; private static final int COLOR_TYPE = 2; + private int _colorCount; + private final BeautyData _beautyData; + private final Map> _colorData = new HashMap<>(); + public ExBeautyItemList(Player player) { _beautyData = BeautyShopData.getInstance().getBeautyData(player.getRace(), player.getAppearance().getSexType()); @@ -60,7 +61,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BEAUTY_ITEM_LIST.writeId(packet); - packet.writeD(HAIR_TYPE); packet.writeD(_beautyData.getHairList().size()); for (BeautyItem hair : _beautyData.getHairList().values()) @@ -72,7 +72,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(hair.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(FACE_TYPE); packet.writeD(_beautyData.getFaceList().size()); for (BeautyItem face : _beautyData.getFaceList().values()) @@ -84,7 +83,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(face.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(COLOR_TYPE); packet.writeD(_colorCount); for (Entry> entry : _colorData.entrySet()) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java index 1825236886..6d4c45cb2b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java @@ -34,7 +34,6 @@ public class ExBirthdayPopup implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_BIRTH_DAY.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java index 7d2f17e697..43e525f05f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java @@ -26,6 +26,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBrBroadcastEventState implements IClientOutgoingPacket { + public static final int APRIL_FOOLS = 20090401; + public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) + public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) + public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) + public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) + private final int _eventId; private final int _eventState; private int _param0; @@ -36,12 +42,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket private String _param5; private String _param6; - public static final int APRIL_FOOLS = 20090401; - public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) - public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) - public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) - public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) - public ExBrBroadcastEventState(int eventId, int eventState) { _eventId = eventId; @@ -65,7 +65,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BROADCAST_EVENT_STATE.writeId(packet); - packet.writeD(_eventId); packet.writeD(_eventState); packet.writeD(_param0); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java index 1fd7ec663a..c0683c8797 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java @@ -44,7 +44,6 @@ public class ExBrBuffEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUFF_EVENT_STATE.writeId(packet); - packet.writeD(_type); packet.writeD(_value); packet.writeD(_state); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java index 943aae8a62..8e009d7b09 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java @@ -43,7 +43,6 @@ public class ExBrLoadEventTopRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_LOAD_EVENT_TOP_RANKERS.writeId(packet); - packet.writeD(_eventId); packet.writeD(_day); packet.writeD(_count); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java index 6a98c01654..9105e39efe 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java @@ -36,9 +36,8 @@ public class ExBrPremiumState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PREMIUM_STATE.writeId(packet); - packet.writeD(_player.getObjectId()); - packet.writeC(_player.hasPremiumStatus() ? 0x01 : 0x00); + packet.writeC(_player.hasPremiumStatus() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 381dd859ad..567cfc70f9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -59,10 +59,8 @@ public class ExBuySellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x01); // Type SELL + packet.writeD(1); // Type SELL packet.writeD(_inventorySlots); - if ((_sellList != null)) { packet.writeH(_sellList.size()); @@ -74,9 +72,8 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - if ((_refundList != null) && !_refundList.isEmpty()) { packet.writeH(_refundList.size()); @@ -90,10 +87,9 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - - packet.writeC(_done ? 0x01 : 0x00); + packet.writeC(_done ? 1 : 0); return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java index 2b43c0ce4b..e0ec81e0e7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java @@ -39,7 +39,6 @@ public class ExCastleState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CASTLE_STATE.writeId(packet); - packet.writeD(_castleId); packet.writeD(_castleSide.ordinal()); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java index b7f90d261b..a8196c7a83 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java @@ -52,7 +52,6 @@ public class ExChangeClientEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_CLIENT_EFFECT_INFO.writeId(packet); - packet.writeD(_type); packet.writeD(_key); packet.writeD(_value); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java index 472abc88df..eea59162ee 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java @@ -37,7 +37,6 @@ public class ExChangeNpcState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NPC_STATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java index 8cdcb4460d..45f2805517 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java @@ -49,7 +49,6 @@ public class ExChangePostState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_POST_STATE.writeId(packet); - packet.writeD(_receivedBoard ? 1 : 0); packet.writeD(_changedMsgIds.length); for (int postId : _changedMsgIds) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java index fc58ec9a2e..d765ab54e0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java @@ -35,7 +35,6 @@ public class ExChangeToAwakenedClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_TO_AWAKENED_CLASS.writeId(packet); - packet.writeD(_classId); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index f51a3eb3ae..1e9b8e9dc8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -47,7 +47,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket throw new IllegalArgumentException("Undefined Atribute item: " + stone); } _level = ElementalAttributeData.getInstance().getMaxElementLevel(_itemId); - // Register only items that can be put an attribute stone/crystal for (Item item : player.getInventory().getItems()) { @@ -62,7 +61,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_INVENTORY_ATTRIBUTE_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeQ(_count); packet.writeD(_atribute == AttributeType.FIRE ? 1 : 0); // Fire diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java index a272d85469..238882cd11 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java @@ -35,7 +35,6 @@ public class ExCloseMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java index d2ecd70952..877bca760a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java @@ -34,7 +34,6 @@ public class ExClosePartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_PARTY_ROOM.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java index 27c112776b..1d02c972b5 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java @@ -54,7 +54,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLOSSEUM_FENCE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_clientState); packet.writeD(_x); @@ -62,7 +61,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_width); packet.writeD(_length); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java index 766d3619ad..b72bef93e8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java @@ -37,9 +37,8 @@ public class ExConfirmAddingContact implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AGIT_AUCTION_CMD.writeId(packet); - packet.writeS(_charName); - packet.writeD(_added ? 0x01 : 0x00); + packet.writeD(_added ? 1 : 0); return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java index beded32254..c832d507ed 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameAddPlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x01); - + packet.writeD(1); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java index 5f36f730d0..847ea93e6a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java @@ -45,9 +45,7 @@ public class ExCubeGameChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java index 66abbf4b75..a2f2e61ded 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java @@ -43,12 +43,10 @@ public class ExCubeGameChangeTeam implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x05); - + packet.writeD(5); packet.writeD(_player.getObjectId()); - packet.writeD(_fromRedTeam ? 0x01 : 0x00); - packet.writeD(_fromRedTeam ? 0x00 : 0x01); + packet.writeD(_fromRedTeam ? 1 : 0); + packet.writeD(_fromRedTeam ? 0 : 1); return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java index 5273b2099a..136b439283 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java @@ -39,9 +39,7 @@ public class ExCubeGameChangeTimeToStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x03); - + packet.writeD(3); packet.writeD(_seconds); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java index f81a302941..9bdba49029 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java @@ -35,7 +35,6 @@ public class ExCubeGameCloseUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0xffffffff); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java index 259a0e9407..3177e7a488 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java @@ -40,11 +40,9 @@ public class ExCubeGameEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x01); - - packet.writeD(_isRedTeamWin ? 0x01 : 0x00); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(1); + packet.writeD(_isRedTeamWin ? 1 : 0); + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java index 4d89e621ce..8b96bb545f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java @@ -55,14 +55,11 @@ public class ExCubeGameExtendedChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeD(_playerPoints); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java index e5a00f1ab7..c084789f13 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameRemovePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java index 00be884d2f..35a3f289d1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java @@ -35,8 +35,7 @@ public class ExCubeGameRequestReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x04); + packet.writeD(4); return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java index 1bc89e0c32..8b755dd3cc 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java @@ -30,7 +30,6 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket // Players Lists private final List _bluePlayers; private final List _redPlayers; - // Common Values private final int _roomNumber; @@ -51,12 +50,9 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_roomNumber); packet.writeD(0xffffffff); - packet.writeD(_bluePlayers.size()); for (Player player : _bluePlayers) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java index 2f2c092c08..d000112787 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java @@ -31,7 +31,6 @@ public class ExCursedWeaponList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet); - final Set ids = CursedWeaponsManager.getInstance().getCursedWeaponsIds(); packet.writeD(ids.size()); ids.forEach(packet::writeD); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java index 2f60a1b80c..5bc7ff3238 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java @@ -39,7 +39,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet); - if (!_cursedWeaponInfo.isEmpty()) { packet.writeD(_cursedWeaponInfo.size()); @@ -47,7 +46,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { packet.writeD(w.id); packet.writeD(w.activated); - packet.writeD(w.pos.getX()); packet.writeD(w.pos.getY()); packet.writeD(w.pos.getZ()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java index f475a02b28..0456fb9dae 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java @@ -34,7 +34,6 @@ public class ExDissmissMPCCRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DISSMISS_MPCC_ROOM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java index 258010f717..c731b7c7a9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java @@ -37,7 +37,6 @@ public class ExDuelAskStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_ASK_START.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDuel); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java index 043c82c0db..e9a31bee57 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java @@ -38,7 +38,6 @@ public class ExDuelEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_END.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java index 264409b3d6..e1fa1cea88 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java @@ -38,7 +38,6 @@ public class ExDuelReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_READY.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java index 488aafcb7d..ecdd528a16 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java @@ -38,7 +38,6 @@ public class ExDuelStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_START.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java index 7df040c5e7..5ed0c09675 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java @@ -36,7 +36,6 @@ public class ExDuelUpdateUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_UPDATE_USER_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeD(_player.getClassId().getId()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 7ab055a3d8..f58c0573a8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExEnchantSkillInfo implements IClientOutgoingPacket { private final Set _routes; - private final int _skillId; private final int _skillLevel; private final int _skillSubLevel; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 41368a8efb..e4ee350e64 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -50,7 +50,6 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_INFO_DETAIL.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java index 5cedcd6284..1d32f0d725 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java @@ -43,7 +43,6 @@ public class ExEnchantSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_LIST.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skills.size()); for (Skill skill : _skills) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java index 6ab5e869f2..853d74039f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java @@ -38,7 +38,6 @@ public class ExEnchantSkillResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_RESULT.writeId(packet); - packet.writeD(_enchanted ? 1 : 0); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java index 7b7d2d008d..410bf16510 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java @@ -42,7 +42,6 @@ public class ExEventMatchMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_EVENT_MATCH_MESSAGE.writeId(packet); - packet.writeC(_type); packet.writeS(_message); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java index 7264e90233..1946758bf5 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java @@ -37,11 +37,9 @@ public class ExGetBookMarkInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOOK_MARK_INFO.writeId(packet); - - packet.writeD(0x00); // Dummy + packet.writeD(0); // Dummy packet.writeD(_player.getBookMarkSlot()); packet.writeD(_player.getTeleportBookmarks().size()); - for (TeleportBookmark tpbm : _player.getTeleportBookmarks()) { packet.writeD(tpbm.getId()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java index 36e7bb81af..201e8eb49b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java @@ -42,15 +42,14 @@ public class ExGetBossRecord implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOSS_RECORD.writeId(packet); - packet.writeD(_ranking); packet.writeD(_totalPoints); if (_bossRecordInfo == null) { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } else { @@ -59,7 +58,7 @@ public class ExGetBossRecord implements IClientOutgoingPacket { packet.writeD(entry.getKey()); packet.writeD(entry.getValue()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? } } return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java index ea0a5f8b18..85ccad0758 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java @@ -41,7 +41,6 @@ public class ExGetOffAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_OFF_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_x); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java index f8e16a4191..9a02e49223 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java @@ -39,7 +39,6 @@ public class ExGetOnAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_ON_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java index 51197344a5..704b3212a1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExGetPremiumItemList implements IClientOutgoingPacket { private final Player _player; - private final Map _map; public ExGetPremiumItemList(Player player) @@ -43,7 +42,6 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_PREMIUM_ITEM_LIST.writeId(packet); - packet.writeD(_map.size()); for (Entry entry : _map.entrySet()) { @@ -51,7 +49,7 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket packet.writeQ(entry.getKey()); packet.writeD(item.getItemId()); packet.writeQ(item.getCount()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeS(item.getSender()); } return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index a005fa8ad8..0200bdee08 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -40,7 +40,6 @@ public class ExHeroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HERO_LIST.writeId(packet); - packet.writeD(_heroList.size()); for (StatSet hero : _heroList.values()) { @@ -51,7 +50,7 @@ public class ExHeroList implements IClientOutgoingPacket packet.writeS(hero.getString(Hero.ALLY_NAME, "")); packet.writeD(hero.getInt(Hero.ALLY_CREST, 0)); packet.writeD(hero.getInt(Hero.COUNT)); - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index d5b5430142..0baca7cd86 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -48,8 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); - - packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade + packet.writeC(_hide ? 0 : 1); // Grand Crusade packet.writeD(_currentTemplateId); packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java index 81db66b88f..323c0cdf1e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java @@ -35,7 +35,6 @@ public class ExIsCharNameCreatable implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_IS_CHAR_NAME_CREATABLE.writeId(packet); - packet.writeD(_allowed); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java index ecc751eab3..45def9e0be 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java @@ -38,7 +38,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { throw new NullPointerException(); } - if (currentAuction.getAuctionState() != ItemAuctionState.STARTED) { _timeRemaining = 0; @@ -47,7 +46,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { _timeRemaining = (int) (currentAuction.getFinishingTimeRemaining() / 1000); // in seconds } - _refresh = refresh; _currentAuction = currentAuction; _nextAuction = nextAuction; @@ -57,16 +55,12 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_AUCTION_INFO.writeId(packet); - - packet.writeC(_refresh ? 0x00 : 0x01); + packet.writeC(_refresh ? 0 : 1); packet.writeD(_currentAuction.getInstanceId()); - final ItemAuctionBid highestBid = _currentAuction.getHighestBid(); packet.writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid()); - packet.writeD(_timeRemaining); writeItem(packet, _currentAuction.getItemInfo()); - if (_nextAuction != null) { packet.writeQ(_nextAuction.getAuctionInitBid()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java index f66c77509f..e40ebdb90b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java @@ -44,7 +44,6 @@ public class ExItemAuctionStatus implements IClientOutgoingPacket _x = spawn.getX(); _y = spawn.getY(); _z = spawn.getZ(); - final ItemAuctionInstance manager = ItemAuctionManager.getInstance().getManagerInstance(AUCTION_MANAGER); if (manager != null) { @@ -64,7 +63,7 @@ public class ExItemAuctionStatus implements IClientOutgoingPacket packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); + packet.writeD(0); packet.writeH(_status); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java index 53ad8abd58..1c5e38cbab 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListMpccWaiting implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _rooms = new LinkedList<>(); @@ -53,7 +54,6 @@ public class ExListMpccWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_MPCC_WAITING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 78f2fec636..eafea24fa6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _players = new LinkedList<>(); @@ -60,7 +61,6 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(packet); - packet.writeD(_size); packet.writeD(_players.size()); for (Player player : _players) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java index 786c616875..c8723a9fc0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java @@ -46,7 +46,6 @@ public class ExMPCCPartyInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCPARTY_INFO_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_LeaderOID); packet.writeD(_memberCount); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java index 4bf07f0133..08259e4e6c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java @@ -37,7 +37,6 @@ public class ExMPCCPartymasterList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_PARTYMASTER_LIST.writeId(packet); - packet.writeD(_leadersName.size()); _leadersName.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java index abbdc8fe76..f021ef5f1f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java @@ -36,7 +36,6 @@ public class ExMPCCRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java index 154e156270..2eec590cb4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java @@ -41,7 +41,6 @@ public class ExMPCCRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java index 06e3027bfc..a0e9d0a4b0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java @@ -37,7 +37,6 @@ public class ExMPCCShowPartyMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCSHOW_PARTY_MEMBER_INFO.writeId(packet); - packet.writeD(_party.getMemberCount()); for (Player pc : _party.getMembers()) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java index e454a746f3..771b2f22cb 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java @@ -49,7 +49,6 @@ public class ExMagicAttackInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAGIC_ATTACK_INFO.writeId(packet); - packet.writeD(_caster); packet.writeD(_target); packet.writeD(_type); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java index 9cfbeb5aee..1aaa5b6520 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java @@ -35,7 +35,6 @@ public class ExMailArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAIL_ARRIVED.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java index 983ff22b92..48156c0600 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java @@ -44,7 +44,6 @@ public class ExManageMpccRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MANAGE_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java index f710c006e8..9d7d14211e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java @@ -45,7 +45,6 @@ public class ExMoveToLocationAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_objId); packet.writeD(_tx); packet.writeD(_ty); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java index 3e3bdc9fed..87e44b51cd 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java @@ -43,7 +43,6 @@ public class ExMoveToLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java index 7ab0d1c7da..3c1902892a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java @@ -40,11 +40,9 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet); - packet.writeS(_channel.getLeader().getName()); - packet.writeD(0x00); // Channel loot 0 or 1 + packet.writeD(0); // Channel loot 0 or 1 packet.writeD(_channel.getMemberCount()); - packet.writeD(_channel.getParties().size()); for (Party p : _channel.getParties()) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java index 1536bd5f9b..f2a32bb6e8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java @@ -43,7 +43,6 @@ public class ExNeedToChangeName implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEED_TO_CHANGE_NAME.writeId(packet); - packet.writeD(_type); packet.writeD(_subType); packet.writeS(_name); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java index be9bec8559..d18b4606b3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java @@ -35,7 +35,6 @@ public class ExNevitAdventEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CHANNELING_EFFECT.writeId(packet); - packet.writeD(_timeLeft); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java index 3a0367c178..09f6250f51 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java @@ -35,7 +35,6 @@ public class ExNevitAdventPointInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_AGATHION_ENERGY_INFO.writeId(packet); - packet.writeD(_points); // 72 = 1%, max 7200 = 100% return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java index 88fdaae499..ef220d86de 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java @@ -37,9 +37,8 @@ public class ExNevitAdventTimeChange implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - // state 0 - pause 1 - started - packet.writeC(_paused ? 0x00 : 0x01); + packet.writeC(_paused ? 0 : 1); // left time in ms max is 16000 its 4m and state is automatically changed to quit packet.writeD(_time); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java index fccdf510cc..4025bf78fa 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java @@ -34,7 +34,6 @@ public class ExNewSkillToLearnByLevelUp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEW_SKILL_TO_LEARN_BY_LEVEL_UP.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java index 324c18a517..f2ce8614dc 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java @@ -43,8 +43,7 @@ public class ExNoticePostArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTICE_POST_ARRIVED.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java index afe3719d9b..050c7ccea5 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java @@ -43,8 +43,7 @@ public class ExNoticePostSent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_WRITE_POST.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java index 5d98c20b09..e0bd08d39a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java @@ -30,7 +30,6 @@ public class ExNotifyPremiumItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_PREMIUM_ITEM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java index 6cb3724448..ba3c0cfeaa 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java @@ -34,7 +34,6 @@ public class ExOlympiadMatchEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MATCH_END.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java index 264d5aa484..7ffd5ed3bd 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java @@ -55,19 +55,15 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x00); // Type 0 = Match List, 1 = Match Result - + packet.writeD(0); // Type 0 = Match List, 1 = Match Result packet.writeD(_games.size()); - packet.writeD(0x00); - + packet.writeD(0); for (OlympiadGameTask curGame : _games) { final AbstractOlympiadGame game = curGame.getGame(); if (game != null) { packet.writeD(game.getStadiumId()); // Stadium Id (Arena 1 = 0) - if (game instanceof OlympiadGameNonClassed) { packet.writeD(1); @@ -80,8 +76,7 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket { packet.writeD(0); } - - packet.writeD(curGame.isRunning() ? 0x02 : 0x01); // (1 = Standby, 2 = Playing) + packet.writeD(curGame.isRunning() ? 2 : 1); // (1 = Standby, 2 = Playing) packet.writeS(game.getPlayerNames()[0]); // Player 1 Name packet.writeS(game.getPlayerNames()[1]); // Player 2 Name } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java index 712651603d..b387271fba 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java @@ -53,9 +53,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x01); // Type 0 = Match List, 1 = Match Result - + packet.writeD(1); // Type 0 = Match List, 1 = Match Result packet.writeD(_tie ? 1 : 0); // 0 - win, 1 - tie packet.writeS(_winnerList.get(0).getName()); packet.writeD(_winTeam); @@ -69,9 +67,8 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } - packet.writeD(_loseTeam); packet.writeD(_loserList.size()); for (OlympiadInfo info : _loserList) @@ -83,7 +80,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java index 34d81d1f53..712b9e06c6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java @@ -38,7 +38,6 @@ public class ExOlympiadMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MODE.writeId(packet); - packet.writeC(_mode); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java index ebea6c56f3..5b4f2c2523 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java @@ -53,7 +53,6 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_SPELLED_INFO.writeId(packet); - packet.writeD(_playerId); packet.writeD(_effects.size() + _effects2.size()); for (BuffInfo info : _effects) @@ -62,7 +61,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(info.getSkill().getDisplayId()); packet.writeH(info.getSkill().getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(info.getSkill().getAbnormalType().getClientId()); writeOptionalD(packet, info.getSkill().isAura() ? -1 : info.getTime()); } @@ -73,7 +72,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(skill.getDisplayId()); packet.writeH(skill.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(skill.getAbnormalType().getClientId()); packet.writeH(-1); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java index 18c34fe9de..ca473edfcf 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java @@ -76,7 +76,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_USER_INFO.writeId(packet); - if (_player != null) { packet.writeC(_player.getOlympiadSide()); @@ -91,7 +90,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket packet.writeS(_par.getName()); packet.writeD(_par.getBaseClass()); } - packet.writeD(_curHp); packet.writeD(_maxHp); packet.writeD(_curCp); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java index e84d0251bd..7ec64cc8c3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java @@ -35,7 +35,6 @@ public class ExOpenMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OPEN_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java index 90349cc1a2..5661dc9f57 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java @@ -56,7 +56,6 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PCCAFE_POINT_INFO.writeId(packet); - packet.writeD(_points); // num points packet.writeD(_mAddPoint); // points inc display packet.writeC(_mPeriodType); // period(0=don't show window,1=acquisition,2=use points) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java index f7e8b4a99a..248a2f7d98 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_ADD.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java index 832bee0012..1f452f4bae 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_DELETE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_summon.getSummonType()); packet.writeD(_summon.getOwner().getObjectId()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java index 0646a67001..703694fa2f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_UPDATE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 0e3edb3ea7..e4c6b79ae0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -47,7 +47,6 @@ public class ExPartyRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2bffdec368..2ebf1dc7f0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -43,10 +43,8 @@ public class ExPetInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class ExPetInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class ExPetInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,9 +154,8 @@ public class ExPetInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -227,28 +205,24 @@ public class ExPetInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PET_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -267,7 +241,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -283,19 +257,19 @@ public class ExPetInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -307,20 +281,20 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -344,12 +318,12 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -379,12 +353,10 @@ public class ExPetInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java index 082f4c7662..0f72c05a3a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java @@ -34,7 +34,6 @@ public class ExPlayScene implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLAY_SCENE.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java index e98d317e14..7e3803bdaa 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java @@ -36,7 +36,6 @@ public class ExPledgeCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_COUNT.writeId(packet); - packet.writeD(_count); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java index 838029e284..4084de3481 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java @@ -38,7 +38,6 @@ public class ExPledgeDraftListSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_DRAFT_LIST_SEARCH.writeId(packet); - packet.writeD(_pledgeRecruitList.size()); for (PledgeWaitingInfo prl : _pledgeRecruitList) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java index fb956e9996..44e34004ea 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java @@ -25,11 +25,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExPledgeEmblem implements IClientOutgoingPacket { + private static final int TOTAL_SIZE = 65664; + private final int _crestId; private final int _clanId; private final byte[] _data; private final int _chunkId; - private static final int TOTAL_SIZE = 65664; public ExPledgeEmblem(int crestId, byte[] chunkedData, int clanId, int chunkId) { @@ -43,7 +44,6 @@ public class ExPledgeEmblem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clanId); packet.writeD(_crestId); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java index ed19bf976b..b32f8c0645 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitApplyInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_APPLY_INFO.writeId(packet); - packet.writeD(_status.ordinal()); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java index fc98b7b6f7..af4af9c9c1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitBoardDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_DETAIL.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClanId()); packet.writeD(_pledgeRecruitInfo.getKarma()); packet.writeS(_pledgeRecruitInfo.getInformation()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index b4d48373a6..eda808e754 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -34,7 +34,6 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket private final int _clanOnCurrentPage; private final int _startIndex; private final int _endIndex; - static final int CLAN_PER_PAGE = 12; public ExPledgeRecruitBoardSearch(List clanList, int currentPage) @@ -51,11 +50,9 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_SEARCH.writeId(packet); - packet.writeD(_currentPage); packet.writeD(_totalNumberOfPage); packet.writeD(_clanOnCurrentPage); - for (int i = _startIndex; i < _endIndex; i++) { packet.writeD(_clanList.get(i).getClanId()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 4ae5ffe316..b1f139226d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -40,7 +40,6 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java index 77080a3820..5844f220ec 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java @@ -39,7 +39,6 @@ public class ExPledgeWaitingList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST.writeId(packet); - packet.writeD(pledgePlayerRecruitInfos.size()); for (PledgeApplicantInfo recruitInfo : pledgePlayerRecruitInfos.values()) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java index a9245c1309..6b88572057 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java @@ -30,7 +30,6 @@ public class ExPledgeWaitingListAlarm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_ALARM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java index 60997b3da0..28c3967119 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java @@ -40,7 +40,6 @@ public class ExPledgeWaitingListApplied implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_APPLIED.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClan().getId()); packet.writeS(_pledgeRecruitInfo.getClan().getName()); packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java index 66a06892c2..1f53d1bb38 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java @@ -36,7 +36,6 @@ public class ExPledgeWaitingUser implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_USER.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getPlayerId()); packet.writeS(_pledgeRecruitInfo.getMessage()); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java index 49bc9b0995..5f404779f5 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java @@ -43,7 +43,6 @@ public class ExPrivateStoreSetWholeMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_objectId); packet.writeS(_msg); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java index cb5e8fbce9..ff996b5d0c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutCommissionResultForVariationMake implements IClientOutgoingPac public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_COMMISSION_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_gemstoneObjId); packet.writeD(_itemId); packet.writeQ(_gemstoneCount); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java index 81721e921f..098472b7ae 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantScrollItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SCROLL_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java index 871f377db2..ffea182a49 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java index c47a4bcff4..8016e128f4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java index c8b46be499..95c0c0e4e1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_INTENSIVE_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_refinerItemObjId); packet.writeD(_lifestoneItemId); packet.writeD(_gemstoneItemId); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 2128b2b19f..2970ca00a2 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -41,13 +41,12 @@ public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_CANCEL.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); packet.writeD(_itemAug1); packet.writeD(_itemAug2); packet.writeQ(_price); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java index 80541e65cd..c25dd16b01 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java @@ -34,10 +34,9 @@ public class ExPutItemResultForVariationMake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java index fe5eb74eb0..bc8896164d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java @@ -56,13 +56,12 @@ public class ExQuestNpcLogList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_NPC_LOG_LIST.writeId(packet); - packet.writeD(_questId); packet.writeC(_npcLogList.size()); for (NpcLogListHolder holder : _npcLogList) { packet.writeD(holder.isNpcString() ? holder.getId() : holder.getId() + 1000000); - packet.writeC(holder.isNpcString() ? 0x01 : 0x00); + packet.writeC(holder.isNpcString() ? 1 : 0); packet.writeD(holder.getCount()); } return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java index 62d622caff..60616b256d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java @@ -35,7 +35,6 @@ public class ExRedSky implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RED_SKY.writeId(packet); - packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java index ce40b1a792..163faff855 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java @@ -36,7 +36,6 @@ public class ExRegenMax implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REGEN_MAX.writeId(packet); - packet.writeD(1); packet.writeD(_time); packet.writeD(_tickInterval); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java index d864795cd6..a17525576b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java @@ -34,7 +34,6 @@ public class ExRemoveEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REMOVE_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 57ed88ac29..4e479e75a6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -56,7 +56,6 @@ public class ExReplyReceivedPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_RECEIVED_POST.writeId(packet); - packet.writeD(_msg.getMailType().ordinal()); // GOD if (_msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED) { @@ -76,11 +75,10 @@ public class ExReplyReceivedPost extends AbstractItemPacket } packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown packet.writeS(_msg.getSenderName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -92,9 +90,8 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeQ(_msg.getReqAdena()); packet.writeD(_msg.hasAttachments() ? 1 : 0); packet.writeD(_msg.isReturned() ? 1 : 0); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 75f6596194..ed490eae91 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -54,14 +54,12 @@ public class ExReplySentPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_SENT_POST.writeId(packet); - - packet.writeD(0x00); // GOD + packet.writeD(0); // GOD packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); packet.writeS(_msg.getReceiverName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -73,11 +71,11 @@ public class ExReplySentPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeQ(_msg.getReqAdena()); - packet.writeD(_msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(_msg.isReturned() ? 0x01 : 00); + packet.writeD(_msg.hasAttachments() ? 1 : 0); + packet.writeD(_msg.isReturned() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index cc4f7ce1d8..e6a3f9bca2 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -35,7 +35,6 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java index 2634aa1cdd..60201b177f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java @@ -35,7 +35,6 @@ public class ExRequestHackShield implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REQUEST_HACK_SHIELD.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java index c51ff31d0b..75e3b3a945 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java @@ -29,13 +29,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyList implements IClientOutgoingPacket { + public static final int SHOW_FACESHAPE = 1; + public static final int SHOW_HAIRSTYLE = 0; + private final Player _player; private final int _type; private final Map _beautyItem; - public static final int SHOW_FACESHAPE = 1; - public static final int SHOW_HAIRSTYLE = 0; - public ExResponseBeautyList(Player player, int type) { _player = player; @@ -54,7 +54,6 @@ public class ExResponseBeautyList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java index ca2ed360ab..4b19201833 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java @@ -25,16 +25,15 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket { + public static final int FAILURE = 0; + public static final int SUCCESS = 1; + public static final int CHANGE = 0; + public static final int RESTORE = 1; + private final Player _player; private final int _type; private final int _result; - public static final int FAILURE = 0; - public static final int SUCCESS = 1; - - public static final int CHANGE = 0; - public static final int RESTORE = 1; - public ExResponseBeautyRegistReset(Player player, int type, int result) { _player = player; @@ -46,7 +45,6 @@ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_REGIST_RESET.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java index 0e313ef3b7..c0922cfb04 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java @@ -36,10 +36,8 @@ public class ExResponseResetList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_RESET_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); - packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java index 01fe1945ef..a230033d67 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java @@ -37,7 +37,6 @@ public class ExRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ROTATION.writeId(packet); - packet.writeD(_charId); packet.writeD(_heading); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index c58ccfc233..2646a71e77 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -36,7 +36,6 @@ public class ExRpItemLink extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RP_ITEM_LINK.writeId(packet); - writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java index 04556bbed2..f0c6eba8e9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java @@ -34,7 +34,6 @@ public class ExSearchOrc implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEARCH_ORC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index 1e06cc2a3f..7a4dced122 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -38,7 +38,6 @@ public class ExSendManorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_MANOR_LIST.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java index b63c69f37e..2c25cc8bfc 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java @@ -124,7 +124,6 @@ public class ExSendUIEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_UIEVENT.writeId(packet); - packet.writeD(_objectId); packet.writeD(_type); // 0 = show, 1 = hide (there is 2 = pause and 3 = resume also but they don't work well you can only pause count down and you cannot resume it because resume hides the counter). packet.writeD(0); // unknown diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java index 4378479707..716a3e8623 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java @@ -385,16 +385,13 @@ public class ExServerPrimitive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SERVER_PRIMITIVE.writeId(packet); - packet.writeS(_name); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(65535); // has to do something with display range and angle packet.writeD(65535); // has to do something with display range and angle - packet.writeD(_points.size() + _lines.size()); - for (Point point : _points) { packet.writeC(1); // Its the type in this case Point @@ -408,7 +405,6 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(point.getY()); packet.writeD(point.getZ()); } - for (Line line : _lines) { packet.writeC(2); // Its the type in this case Line diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java index fb32e199b2..51fb91b643 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java @@ -46,7 +46,6 @@ public class ExSetCompassZoneCode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_COMPASS_ZONE_CODE.writeId(packet); - packet.writeD(_zoneType); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java index 1d0fbae3a4..34dee8bda0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java @@ -38,7 +38,6 @@ public class ExSetPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_PARTY_LOOTING.writeId(packet); - packet.writeD(_result); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java index 7b14ec8412..4e491af9d1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java @@ -34,7 +34,6 @@ public class ExShowAdventurerGuideBook implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_ADVENTURER_GUIDE_BOOK.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index 82554fdc5f..1f8df76083 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -39,7 +39,6 @@ public class ExShowAgitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AGIT_INFO.writeId(packet); - final Collection clanHalls = ClanHallData.getInstance().getClanHalls(); packet.writeD(clanHalls.size()); clanHalls.forEach(clanHall -> diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index dd11ee0150..51e6646ff5 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -44,7 +44,6 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BASE_ATTRIBUTE_CANCEL_WINDOW.writeId(packet); - packet.writeD(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java index 14e55d39f3..e22345c4fd 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java @@ -25,13 +25,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExShowBeautyMenu implements IClientOutgoingPacket { - private final Player _player; - private final int _type; - // TODO: Enum public static final int MODIFY_APPEARANCE = 0; public static final int RESTORE_APPEARANCE = 1; + private final Player _player; + private final int _type; + public ExShowBeautyMenu(Player player, int type) { _player = player; @@ -42,7 +42,6 @@ public class ExShowBeautyMenu implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BEAUTY_MENU.writeId(packet); - packet.writeD(_type); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 15d011befc..b0d2b90494 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -41,7 +41,6 @@ public class ExShowCastleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CASTLE_INFO.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) @@ -65,8 +64,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } packet.writeD(castle.getTaxPercent(TaxType.BUY)); packet.writeD((int) (castle.getSiege().getSiegeDate().getTimeInMillis() / 1000)); - - packet.writeC(castle.getSiege().isInProgress() ? 0x01 : 0x00); // Grand Crusade + packet.writeC(castle.getSiege().isInProgress() ? 1 : 0); // Grand Crusade packet.writeC(castle.getSide().ordinal()); // Grand Crusade } return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java index aeb4079f3a..f9a6ebe0e7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java @@ -38,7 +38,6 @@ public class ExShowContactList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_SHOW_POST_FRIEND.writeId(packet); - packet.writeD(_contacts.size()); _contacts.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index a079ea3129..94b989b583 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -37,7 +37,6 @@ public class ExShowCropInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _crops = (nextPeriod && !manor.isManorApproved()) ? null : manor.getCropProcure(manorId, nextPeriod); } @@ -46,10 +45,9 @@ public class ExShowCropInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Crop Sales" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Crop Sales" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); + packet.writeD(0); if (_crops != null) { packet.writeD(_crops.size()); @@ -64,17 +62,17 @@ public class ExShowCropInfo implements IClientOutgoingPacket if (seed == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(seed.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(seed.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(seed.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index a1e06eb2bf..1c65dde1a6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -62,10 +62,8 @@ public class ExShowCropSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getCropId()); // crop id diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index ee9fa9fd37..b625a1e4e7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -39,7 +39,6 @@ public class ExShowFortressInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_INFO.writeId(packet); - final Collection forts = FortManager.getInstance().getForts(); packet.writeD(forts.size()); for (Fort fort : forts) @@ -47,7 +46,7 @@ public class ExShowFortressInfo implements IClientOutgoingPacket final Clan clan = fort.getOwnerClan(); packet.writeD(fort.getResidenceId()); packet.writeS(clan != null ? clan.getName() : ""); - packet.writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00); + packet.writeD(fort.getSiege().isInProgress() ? 1 : 0); // Time of possession packet.writeD(fort.getOwnedTime()); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index f389b26ed5..678ab43e96 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -42,11 +42,9 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_MAP_INFO.writeId(packet); - packet.writeD(_fortress.getResidenceId()); packet.writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status packet.writeD(_fortress.getFortSize()); // barracks count - final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId()); if ((commanders != null) && !commanders.isEmpty() && _fortress.getSiege().isInProgress()) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 27da99cf41..da186103ae 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -51,7 +51,6 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_SIEGE_INFO.writeId(packet); - packet.writeD(_fortId); // Fortress Id packet.writeD(_size); // Total Barracks Count if (_csize > 0) @@ -64,22 +63,22 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { case 0: { - packet.writeD(0x03); + packet.writeD(3); break; } case 1: { - packet.writeD(0x02); + packet.writeD(2); break; } case 2: { - packet.writeD(0x01); + packet.writeD(1); break; } case 3: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -92,27 +91,27 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket // TODO: once control room supported, update packet.writeD(0x0x) to support 5th room case 0: { - packet.writeD(0x05); + packet.writeD(5); break; } case 1: { - packet.writeD(0x04); + packet.writeD(4); break; } case 2: { - packet.writeD(0x03); + packet.writeD(3); break; } case 3: { - packet.writeD(0x02); + packet.writeD(2); break; } case 4: { - packet.writeD(0x01); + packet.writeD(1); break; } } @@ -124,7 +123,7 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { for (int i = 0; i < _size; i++) { - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java index 8bb38fd28c..bc1e679418 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java @@ -41,8 +41,7 @@ public class ExShowManorDefaultInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_MANOR_DEFAULT_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" and "Crop Sales" buttons + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" and "Crop Sales" buttons packet.writeD(_crops.size()); for (Seed crop : _crops) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 1d3312d668..d03ce2a5fd 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -52,10 +52,8 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet); - packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java index cf38d18c1c..f41999329f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java @@ -34,7 +34,6 @@ public class ExShowQuestInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_INFO.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java index 70f31e318f..0fa64c401d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java @@ -37,7 +37,6 @@ public class ExShowQuestMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_MARK.writeId(packet); - packet.writeD(_questId); packet.writeD(_questState); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index ab85228caf..1a6ee00a10 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ExShowReceivedPostList implements IClientOutgoingPacket { - private final List _inbox; - private static final int MESSAGE_FEE = 100; private static final int MESSAGE_FEE_PER_SLOT = 1000; + private final List _inbox; + public ExShowReceivedPostList(int objectId) { _inbox = MailManager.getInstance().getInbox(objectId); @@ -45,7 +45,6 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { @@ -64,18 +63,18 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getSenderName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); + packet.writeD(msg.isUnread() ? 1 : 0); packet.writeD(((msg.getMailType() == MailType.COMMISSION_ITEM_SOLD) || (msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED)) ? 0 : 1); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(msg.isReturned() ? 0x01 : 0x00); - packet.writeD(0x00); // SysString in some case it seems + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(msg.isReturned() ? 1 : 0); + packet.writeD(0); // SysString in some case it seems } } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(MESSAGE_FEE); packet.writeD(MESSAGE_FEE_PER_SLOT); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java index 9679468789..deebb99c8f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java @@ -33,6 +33,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; */ public class ExShowScreenMessage implements IClientOutgoingPacket { + // Positions + public static final byte TOP_LEFT = 1; + public static final byte TOP_CENTER = 2; + public static final byte TOP_RIGHT = 3; + public static final byte MIDDLE_LEFT = 4; + public static final byte MIDDLE_CENTER = 5; + public static final byte MIDDLE_RIGHT = 6; + public static final byte BOTTOM_CENTER = 7; + public static final byte BOTTOM_RIGHT = 8; + private final int _type; private final int _sysMessageId; private final int _unk1; @@ -48,15 +58,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket private List _parameters; // Localisation related. private String _lang; - // Positions - public static final byte TOP_LEFT = 0x01; - public static final byte TOP_CENTER = 0x02; - public static final byte TOP_RIGHT = 0x03; - public static final byte MIDDLE_LEFT = 0x04; - public static final byte MIDDLE_CENTER = 0x05; - public static final byte MIDDLE_RIGHT = 0x06; - public static final byte BOTTOM_CENTER = 0x07; - public static final byte BOTTOM_RIGHT = 0x08; public void setLang(String lang) { @@ -265,7 +266,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SCREEN_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -284,9 +284,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(sml.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -308,9 +308,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -318,7 +318,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket } } } - packet.writeD(_type); packet.writeD(_sysMessageId); packet.writeD(_position); @@ -326,9 +325,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java index 29ab5d355f..6123b08991 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java @@ -37,7 +37,6 @@ public class ExShowSeedInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _seeds = (nextPeriod && !manor.isManorApproved()) ? null : manor.getSeedProduction(manorId, nextPeriod); } @@ -46,16 +45,14 @@ public class ExShowSeedInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown if (_seeds == null) { packet.writeD(0); return true; } - packet.writeD(_seeds.size()); for (SeedProduction seed : _seeds) { @@ -67,17 +64,17 @@ public class ExShowSeedInfo implements IClientOutgoingPacket if (s == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(s.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(s.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(s.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java index e628099700..eb6e686e10 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java @@ -32,13 +32,10 @@ public class ExShowSeedMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_MAP_INFO.writeId(packet); - packet.writeD(2); // seed count - // Seed of Destruction packet.writeD(1); // id 1? Grand Crusade packet.writeD(2770 + GraciaSeedsManager.getInstance().getSoDState()); // sys msg id - // Seed of Infinity packet.writeD(2); // id 2? Grand Crusade // Manager not implemented yet diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index c9bf485ee2..05c0401a7c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -62,10 +62,8 @@ public class ExShowSeedSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getSeedId()); // seed id diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 1994402da2..269bec5b97 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -47,7 +47,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _cropsItems.put(cropId, item); } } - for (CropProcure crop : CastleManorManager.getInstance().getCropProcure(_manorId, false)) { if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) @@ -61,7 +60,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_cropsItems.size()); // size for (Item item : _cropsItems.values()) @@ -70,9 +68,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket packet.writeD(item.getObjectId()); // Object id packet.writeD(item.getId()); // crop id packet.writeD(seed.getLevel()); // seed level - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(1)); // reward 1 id - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(2)); // reward 2 id if (_castleCrops.containsKey(item.getId())) { @@ -85,9 +83,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket else { packet.writeD(0xFFFFFFFF); // manor - packet.writeQ(0x00); // buy residual - packet.writeQ(0x00); // buy price - packet.writeC(0x00); // reward + packet.writeQ(0); // buy residual + packet.writeQ(0); // buy price + packet.writeC(0); // reward } packet.writeQ(item.getCount()); // my crops } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index db4bccc928..b61d5b2301 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -40,7 +40,6 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { @@ -50,17 +49,17 @@ public class ExShowSentPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getReceiverName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); - packet.writeD(0x01); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(msg.isUnread() ? 1 : 0); + packet.writeD(1); + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(0); } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java index 0e4e9fd2ef..0dca57f2f8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java @@ -48,7 +48,6 @@ public class ExShowTerritory implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TERRITORY.writeId(packet); - packet.writeD(_vertices.size()); packet.writeD(_minZ); packet.writeD(_maxZ); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java index 4e284f82c5..86e1009bbf 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java @@ -46,7 +46,6 @@ public class ExShowTrace implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TRACE.writeId(packet); - packet.writeH(0); // type broken in H5 packet.writeD(0); // time broken in H5 packet.writeH(_locations.size()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java index 3245767ed7..836a5c9624 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java @@ -44,7 +44,6 @@ public class ExShowUsm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_USM.writeId(packet); - packet.writeD(_videoId); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java index 4acdffa842..1f1a14c31b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java @@ -34,7 +34,6 @@ public class ExShowVariationCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_CANCEL_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java index 3a2298019e..9870424e26 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java @@ -35,7 +35,6 @@ public class ExShowVariationMakeWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_MAKE_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java index 169827bab3..86211c8d97 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java @@ -44,10 +44,9 @@ public class ExSpawnEmitter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SPAWN_EMITTER.writeId(packet); - packet.writeD(_npcObjectId); packet.writeD(_playerObjectId); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java index 620800c1c4..534549b4fe 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java @@ -36,7 +36,6 @@ public class ExStartScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_START_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java index 0bd990cf34..babac59129 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java index 0e2689d598..d3e67afe99 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipObjId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java index 44b064113f..f5b3e1340f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java @@ -36,7 +36,6 @@ public class ExStopScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index 8029930c9a..367ac79be4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -66,7 +66,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket } OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet); - packet.writeD(_inventory); packet.writeD(_warehouse); // packet.writeD(_freight); // Removed with 152. diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java index 3293a5b557..57563ca2f9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java @@ -39,7 +39,6 @@ public class ExSubPledgeSkillAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUB_PLEDGET_SKILL_ADD.writeId(packet); - packet.writeD(_type); packet.writeD(_skillId); packet.writeD(_skillLevel); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java index d61dfa20ab..816d6f16a6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java @@ -97,7 +97,6 @@ public class ExSubjobInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUBJOB_INFO.writeId(packet); - packet.writeC(_type); packet.writeD(_currClassId); packet.writeD(_currRace); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java index 85616016c7..b7a152629d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java @@ -38,7 +38,6 @@ public class ExTacticalSign implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TACTICAL_SIGN.writeId(packet); - packet.writeD(_target.getObjectId()); packet.writeD(_tokenId); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java index 3486e6281d..9e03a8bd0a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java @@ -39,7 +39,6 @@ public class ExTeleportToLocationActivate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_TO_LOCATION_ACTIVATE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java index f860c2a40f..aab66c2e48 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java @@ -44,7 +44,6 @@ public class ExTryEnchantArtifactResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TRY_ENCHANT_ARTIFACT_RESULT.writeId(packet); - packet.writeD(_state); packet.writeD(_enchant); packet.writeD(0); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java index a214c53a0f..7bcddd964d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java @@ -27,6 +27,7 @@ public class ExUISetting implements IClientOutgoingPacket { public static final String UI_KEY_MAPPING_VAR = "UI_KEY_MAPPING"; public static final String SPLIT_VAR = " "; + private final byte[] _uiKeyMapping; public ExUISetting(Player player) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java index 187770cfc8..eff4285a8b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java @@ -37,7 +37,6 @@ public class ExUnReadMailCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_UN_READ_MAIL_COUNT.writeId(packet); - packet.writeD(_mailUnreadCount); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java index f992b3c937..e59c651371 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java @@ -41,7 +41,6 @@ public class ExUseSharedGroupItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USE_SHARED_GROUP_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeD(_grpId); packet.writeD(_remainingTime); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java index 474fcc5208..f49d451587 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class ExUserInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getTransformationId()); - final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); final boolean isInvisible = _player.isInvisible(); packet.writeD(abnormalVisualEffects.size() + (isInvisible ? 1 : 0)); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java index b841449ab3..1069a64e3e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java @@ -36,12 +36,9 @@ public class ExUserInfoCubic implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_CUBIC.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(_player.getCubics().size()); - _player.getCubics().keySet().forEach(packet::writeH); - packet.writeD(_player.getAgathionId()); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java index 3e4afb995b..6ef31d6117 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java @@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExUserInfoEquipSlot extends AbstractMaskPacket { private final Player _player; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -66,11 +65,9 @@ public class ExUserInfoEquipSlot extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_EQUIP_SLOT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(InventorySlot.values().length); // 152 packet.writeB(_masks); - final PlayerInventory inventory = _player.getInventory(); for (InventorySlot slot : InventorySlot.values()) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java index 3eb1cf9578..d655e48843 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java @@ -36,7 +36,6 @@ public class ExUserInfoInvenWeight implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_INVEN_WEIGHT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java index 91e0e92338..16aa81e9c0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java @@ -44,7 +44,6 @@ public class ExValidateLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java index 727267c9d5..50cb4025e4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java @@ -35,7 +35,6 @@ public class ExVariationCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_CANCEL_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java index 5cdc1b8d0e..4fde190ae2 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java @@ -32,14 +32,13 @@ public class ExVariationResult implements IClientOutgoingPacket { _option1 = option1; _option2 = option2; - _success = success ? 0x01 : 0x00; + _success = success ? 1 : 0; } @Override public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_RESULT.writeId(packet); - packet.writeD(_option1); packet.writeD(_option2); packet.writeD(_success); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java index db0acfd5ff..60fb57c0b3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java @@ -41,10 +41,9 @@ public class ExVitalityEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_EFFECT_INFO.writeId(packet); - packet.writeD(_points); packet.writeD(_vitalityBonus); // Vitality Bonus - packet.writeH(0x00); // Vitality additional bonus in % + packet.writeH(0); // Vitality additional bonus in % packet.writeH(_vitalityItemsRemaining); // How much vitality items remaining for use packet.writeH(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java index 3cd9d26602..9a401c2321 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java @@ -35,7 +35,6 @@ public class ExVitalityPointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_POINT_INFO.writeId(packet); - packet.writeD(_vitalityPoints); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java index 71baff96ea..c4c5539ca4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java @@ -45,7 +45,6 @@ public class ExVoteSystemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VOTE_SYSTEM_INFO.writeId(packet); - packet.writeD(_recomLeft); packet.writeD(_recomHave); packet.writeD(_bonusTime); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java index 21411f5abc..452b0dc43a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java @@ -37,7 +37,6 @@ public class ExWorldChatCnt implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_WORLD_CHAT_CNT.writeId(packet); - packet.writeD(_points); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java index 5f935fe0dc..dc9c2288f8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java @@ -79,19 +79,17 @@ public class FakePlayerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // vehicleId + packet.writeD(0); // vehicleId packet.writeD(_objId); packet.writeS(_npc.getName()); - packet.writeH(_npc.getRace().ordinal()); - packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 0x01 : 0x00); + packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 1 : 0); packet.writeD(_fpcHolder.getClassId()); - - packet.writeD(0x00); // Inventory.PAPERDOLL_UNDER + packet.writeD(0); // Inventory.PAPERDOLL_UNDER packet.writeD(_fpcHolder.getEquipHead()); packet.writeD(_fpcHolder.getEquipRHand()); packet.writeD(_fpcHolder.getEquipLHand()); @@ -103,28 +101,22 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_fpcHolder.getEquipRHand()); // dual hand packet.writeD(_fpcHolder.getEquipHair()); packet.writeD(_fpcHolder.getEquipHair2()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderAugument()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } - packet.writeC(_fpcHolder.getArmorEnchantLevel()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderVisualId()) { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeC(_npc.getScriptValue()); // getPvpFlag() packet.writeD(_npc.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -135,16 +127,12 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_npc.getCollisionRadius()); packet.writeF(_npc.getCollisionHeight()); - packet.writeD(_fpcHolder.getHair()); packet.writeD(_fpcHolder.getHairColor()); packet.writeD(_fpcHolder.getFace()); - packet.writeS(_npc.getTemplate().getTitle()); - if (_clan != null) { packet.writeD(_clan.getId()); @@ -154,71 +142,51 @@ public class FakePlayerInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - - packet.writeC(0x01); // isSitting() ? 0x00 : 0x01 (at some initial tests it worked) - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); - packet.writeC(_npc.isInCombat() ? 0x01 : 0x00); - - packet.writeC(_npc.isAlikeDead() ? 0x01 : 0x00); - - packet.writeC(_npc.isInvisible() ? 0x01 : 0x00); - - packet.writeC(0x00); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount - packet.writeC(0x00); // getPrivateStoreType().getId() - - packet.writeH(0x00); // getCubics().size() + packet.writeC(1); // isSitting() ? 0 : 1 (at some initial tests it worked) + packet.writeC(_npc.isRunning() ? 1 : 0); + packet.writeC(_npc.isInCombat() ? 1 : 0); + packet.writeC(_npc.isAlikeDead() ? 1 : 0); + packet.writeC(_npc.isInvisible() ? 1 : 0); + packet.writeC(0); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount + packet.writeC(0); // getPrivateStoreType().getId() + packet.writeH(0); // getCubics().size() // getCubics().keySet().forEach(packet::writeH); - packet.writeC(0x00); - + packet.writeC(0); packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : 0); packet.writeH(_fpcHolder.getRecommends()); - packet.writeD(0x00); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 - + packet.writeD(0); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 packet.writeD(_fpcHolder.getClassId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(_fpcHolder.getWeaponEnchantLevel()); // isMounted() ? 0 : _enchantLevel - packet.writeC(_npc.getTeam().getId()); - - packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0x00); + packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0); packet.writeC(_fpcHolder.getNobleLevel()); - packet.writeC(_fpcHolder.isHero() ? 0x01 : 0x00); - - packet.writeC(_fpcHolder.isFishing() ? 0x01 : 0x00); - + packet.writeC(_fpcHolder.isHero() ? 1 : 0); + packet.writeC(_fpcHolder.isFishing() ? 1 : 0); packet.writeD(_fpcHolder.getBaitLocationX()); packet.writeD(_fpcHolder.getBaitLocationY()); packet.writeD(_fpcHolder.getBaitLocationZ()); - packet.writeD(_fpcHolder.getNameColor()); - packet.writeD(_heading); - packet.writeC(_fpcHolder.getPledgeStatus()); - packet.writeH(0x00); // getPledgeType() - + packet.writeH(0); // getPledgeType() packet.writeD(_fpcHolder.getTitleColor()); - - packet.writeC(0x00); // isCursedWeaponEquipped - - packet.writeD(0x00); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 - packet.writeD(0x00); // getTransformationDisplayId() + packet.writeC(0); // isCursedWeaponEquipped + packet.writeD(0); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 + packet.writeD(0); // getTransformationDisplayId() packet.writeD(_fpcHolder.getAgathionId()); - - packet.writeC(0x00); - - packet.writeD(0x00); // getCurrentCp() + packet.writeC(0); + packet.writeD(0); // getCurrentCp() packet.writeD(_npc.getMaxHp()); packet.writeD((int) Math.round(_npc.getCurrentHp())); packet.writeD(_npc.getMaxMp()); packet.writeD((int) Math.round(_npc.getCurrentMp())); - - packet.writeC(0x00); + packet.writeC(0); final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) @@ -229,9 +197,9 @@ public class FakePlayerInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(0x00); // cocPlayer.getPosition() - packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 0x01 : 0x00); - packet.writeC(0x00); // Used Ability Points + packet.writeC(0); // cocPlayer.getPosition() + packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 1 : 0); + packet.writeC(0); // Used Ability Points return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java index ae088538da..03223c8a3e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java @@ -62,7 +62,6 @@ public class FlyToLocation implements IClientOutgoingPacket _destY = destY; _destZ = destZ; _type = type; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -82,7 +81,6 @@ public class FlyToLocation implements IClientOutgoingPacket _flySpeed = flySpeed; _flyDelay = flyDelay; _animationSpeed = animationSpeed; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -103,7 +101,6 @@ public class FlyToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FLY_TO_LOCATION.writeId(packet); - packet.writeD(_chaObjId); packet.writeD(_destX); packet.writeD(_destY); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java index 1e52b0ef72..471d70f791 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java @@ -35,8 +35,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x01); + packet.writeC(1); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 81a384642c..fb7572fc5d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -50,7 +50,6 @@ public class GMHennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GMHENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON @@ -64,19 +63,19 @@ public class GMHennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(0x01); + packet.writeD(1); } if (_player.getHenna(4) != null) { packet.writeD(_player.getHenna(4).getDyeId()); - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 1 : 0); } else { - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid } return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java index 38ca4c7be0..59bf0d9d93 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java @@ -38,7 +38,6 @@ public class GMHide implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_HIDE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index a828a26584..117f9cf67d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -50,7 +50,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -79,28 +78,24 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); packet.writeD(_player.getPkKills()); - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollObjectId(slot)); } - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); } - for (int slot = 0; slot < 11; slot++) { final VariationInstance augment = _player.getInventory().getPaperdollAugmentation(slot); packet.writeD(augment != null ? augment.getOption1Id() : 0); // Confirmed packet.writeD(augment != null ? augment.getOption2Id() : 0); // Confirmed } - packet.writeC(_player.getInventory().getTalismanSlots()); // CT2.3 packet.writeC(_player.getInventory().canEquipCloak() ? 1 : 0); // CT2.3 - packet.writeD(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeH(0); packet.writeD(_player.getPAtk()); packet.writeD(_player.getPAtkSpd()); packet.writeD(_player.getPDef()); @@ -108,18 +103,14 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAccuracy()); packet.writeD(_player.getCriticalHit()); packet.writeD(_player.getMAtk()); - packet.writeD(_player.getMAtkSpd()); packet.writeD(_player.getPAtkSpd()); - packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicEvasionRate()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name packet.writeD(_player.getReputation()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -135,8 +126,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeD(_player.isGM() ? 0x01 : 0x00); // builder level - + packet.writeD(_player.isGM() ? 1 : 0); // builder level packet.writeS(_player.getTitle()); packet.writeD(_player.getClanId()); // pledge id packet.writeD(_player.getClanCrestId()); // pledge crest id @@ -146,26 +136,19 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeC(_player.getCreateItemLevel() > 0 ? 1 : 0); packet.writeD(_player.getPkKills()); packet.writeD(_player.getPvpKills()); - packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); - - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeC(321); - packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window - packet.writeC(_player.getNobleLevel()); - packet.writeC(_player.isHero() ? 0x01 : 0x00); - + packet.writeC(_player.isHero() ? 1 : 0); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); - final AttributeType attackAttribute = _player.getAttackElement(); packet.writeH(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); @@ -175,8 +158,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket } packet.writeD(_player.getFame()); packet.writeD(_player.getVitalityPoints()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index 1d88596096..552b6e6168 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -37,14 +37,12 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_player.getName()); packet.writeD(_clan.getId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); @@ -52,15 +50,14 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 packet.writeD(_clan.getAllyCrestId()); // c2 packet.writeD(_clan.isAtWar() ? 1 : 0); // c3 - packet.writeD(0x00); // T3 Unknown - + packet.writeD(0); // T3 Unknown packet.writeD(_clan.getMembers().size()); for (ClanMember member : _clan.getMembers()) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java index 93af10e254..3c155ff816 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -38,10 +38,8 @@ public class GMViewSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_SKILL_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_skills.size()); - final boolean isDisabled = (_player.getClan() != null) && (_player.getClan().getReputationScore() < 0); for (Skill skill : _skills) { @@ -49,7 +47,7 @@ public class GMViewSkillInfo implements IClientOutgoingPacket packet.writeH(skill.getDisplayLevel()); packet.writeH(skill.getSubLevel()); packet.writeD(skill.getDisplayId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(isDisabled && skill.isClanSkill() ? 1 : 0); packet.writeC(skill.isEnchantable() ? 1 : 0); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index f49138fafe..c909d5e6e1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -51,7 +51,6 @@ public class GMViewWarehouseWithdrawList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_WAREHOUSE_WITHDRAW_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java index d8c273f914..449271993b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java @@ -35,7 +35,6 @@ public class GameGuardQuery implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GAME_GUARD_QUERY.writeId(packet); - packet.writeD(0x27533DD9); packet.writeD(0x2E72A51D); packet.writeD(0x2017038B); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index b0c011b696..037b2e6b6b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -35,10 +35,8 @@ public class GetItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ITEM.writeId(packet); - packet.writeD(_playerId); packet.writeD(_item.getObjectId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java index f8c6126c87..5f4d7bf3ca 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java @@ -50,7 +50,6 @@ public class GetOffVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_OFF_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_x); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java index ffa8d5f310..77d1e6ba28 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java @@ -45,7 +45,6 @@ public class GetOnVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ON_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java index e5dcb9ded6..b1f5b588f9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java @@ -44,14 +44,13 @@ public class GmViewQuestInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_QUEST_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeH(_questList.size()); // quest count - for (Quest quest : _questList) { final QuestState qs = _player.getQuestState(quest.getName()); packet.writeD(quest.getId()); packet.writeD(qs == null ? 0 : qs.getCond()); } - packet.writeH(0x00); // some size + packet.writeH(0); // some size // for size; ddQQ return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 395487097c..4309e2d74f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -51,7 +51,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeQ(_player.getAdena()); // activeChar current amount of Adena packet.writeD(3); // available equip slot packet.writeD(_hennaEquipList.size()); - for (Henna henna : _hennaEquipList) { // Player must have at least one dye in inventory @@ -62,8 +61,8 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); // item Id of the dye packet.writeQ(henna.getWearCount()); // amount of dyes required packet.writeQ(henna.getWearFee()); // amount of Adena required - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not - packet.writeD(0x00); // TODO: Find me! + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // meet the requirement or not + packet.writeD(0); // TODO: Find me! } } return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 30dc837721..b84d2283e8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -51,7 +51,6 @@ public class HennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON @@ -65,9 +64,8 @@ public class HennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); } - final Henna premium = _player.getHenna(4); if (premium != null) { @@ -77,16 +75,15 @@ public class HennaInfo implements IClientOutgoingPacket final long currentTime = Chronos.currentTimeMillis(); duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000; } - packet.writeD(premium.getDyeId()); packet.writeD(duration); // Premium Slot Dye Time Left - packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 1 : 0); } else { - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid } return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index cf3d83263f..5b77709720 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -40,12 +40,11 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_ITEM_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getWearCount()); // total amount of dye require packet.writeQ(_henna.getWearFee()); // total amount of Adena require to draw symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to draw or not 0 is false and 1 is true + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to draw or not 0 is false and 1 is true packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() + _player.getHennaValue(BaseStat.INT)); // equip INT @@ -63,7 +62,7 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket packet.writeH(_player.getLUC() + _player.getHennaValue(BaseStat.LUC)); // equip LUC packet.writeD(_player.getCHA()); // current CHA packet.writeH(_player.getCHA() + _player.getHennaValue(BaseStat.CHA)); // equip CHA - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index cb1379ac29..fc93d02a73 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -40,12 +40,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getCancelCount()); // total amount of dye require packet.writeQ(_henna.getCancelFee()); // total amount of Adena require to remove symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to remove or not + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to remove or not packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() - _player.getHennaValue(BaseStat.INT)); // equip INT @@ -63,7 +62,7 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket packet.writeH(_player.getLUC() - _player.getHennaValue(BaseStat.LUC)); // equip LUC packet.writeD(_player.getCHA()); // current CHA packet.writeH(_player.getCHA() - _player.getHennaValue(BaseStat.CHA)); // equip CHA - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 844fad86c7..452d354ac4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -39,7 +39,7 @@ public class HennaRemoveList implements IClientOutgoingPacket OutgoingPackets.HENNA_UNEQUIP_LIST.writeId(packet); packet.writeQ(_player.getAdena()); final boolean premiumSlotEnabled = _player.getHenna(4) != null; - packet.writeD(premiumSlotEnabled ? 0x04 : 0x03); // seems to be max size + packet.writeD(premiumSlotEnabled ? 4 : 3); // seems to be max size packet.writeD((premiumSlotEnabled ? 4 : 3) - _player.getHennaEmptySlots()); // slots used for (Henna henna : _player.getHennaList()) { @@ -49,8 +49,8 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); packet.writeQ(henna.getCancelCount()); packet.writeQ(henna.getCancelFee()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index b5c8628b50..f2a9cf1822 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -89,14 +89,12 @@ public interface IClientOutgoingPacket extends IOutgoingPacket Inventory.PAPERDOLL_ARTIFACT20, Inventory.PAPERDOLL_ARTIFACT21, }; - int[] PAPERDOLL_ORDER_AUGMENT = new int[] { Inventory.PAPERDOLL_RHAND, Inventory.PAPERDOLL_LHAND, Inventory.PAPERDOLL_RHAND }; - int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 0c54e810f0..3378827f34 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -46,7 +46,6 @@ public class InventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index c4598a72e6..cef69ecb6f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -59,8 +59,8 @@ public class ItemList extends AbstractItemPacket } else { - packet.writeC(0x01); // _showWindow ? 0x01 : 0x00 - packet.writeD(0x00); + packet.writeC(1); // _showWindow ? 1 : 0 + packet.writeD(0); packet.writeD(_items.size()); } writeInventoryBlock(packet, _player.getInventory()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java index b32b4df4a3..c3b9918230 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java @@ -32,9 +32,8 @@ public class JoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PARTY.writeId(packet); - packet.writeD(_response); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java index 65e06efeb7..f347f7efcd 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java @@ -32,7 +32,6 @@ public class JoinPledge implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PLEDGE.writeId(packet); - packet.writeD(_pledgeId); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index 96f6d7c34d..996622b9e9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -35,17 +35,16 @@ public class KeyPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VERSION_CHECK.writeId(packet); - packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok for (int i = 0; i < 8; i++) { packet.writeC(_key[i]); // key } - packet.writeD(0x01); + packet.writeD(1); packet.writeD(Config.SERVER_ID); // server id - packet.writeC(0x01); - packet.writeD(0x00); // obfuscation key - packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 0x01 : 0x00); // isClassic + packet.writeC(1); + packet.writeD(0); // obfuscation key + packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 1 : 0); // isClassic return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java index 484c10f0c4..62424fd03a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java @@ -40,7 +40,6 @@ public class L2FriendSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_SAY.writeId(packet); - packet.writeD(0); // ?? packet.writeS(_receiver); packet.writeS(_sender); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java index b875edb772..790d599b5b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java @@ -32,11 +32,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ListPartyWaiting implements IClientOutgoingPacket { + private static final int NUM_PER_PAGE = 64; + private final List _rooms = new LinkedList<>(); private final int _size; - private static final int NUM_PER_PAGE = 64; - public ListPartyWaiting(PartyMatchingRoomLevelType type, int location, int page, int requestorLevel) { final List rooms = MatchingRoomManager.getInstance().getPartyMathchingRooms(location, type, requestorLevel); @@ -57,7 +57,6 @@ public class ListPartyWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_PARTY_WATING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java index 4f8f9adc64..bb0ac61dbd 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java @@ -54,7 +54,6 @@ public class LoginFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LOGIN_FAIL.writeId(packet); - packet.writeD(_success); packet.writeD(_reason); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java index 18a522c315..6743e3e66f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java @@ -32,7 +32,6 @@ public class MagicSkillCanceld implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_CANCELED.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java index d56de10079..7ab29cc1a8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java @@ -66,7 +66,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // MagicSkillUse castingType packet.writeD(_objectId); packet.writeD(_skillId); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java index 3df8463279..a86626cfa6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java @@ -84,7 +84,6 @@ public class MagicSkillUse implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_USE.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // Casting bar type: 0 - default, 1 - default up, 2 - blue, 3 - green, 4 - red. packet.writeD(_creature.getObjectId()); packet.writeD(_target.getObjectId()); @@ -111,7 +110,7 @@ public class MagicSkillUse implements IClientOutgoingPacket packet.writeD(_target.getX()); packet.writeD(_target.getY()); packet.writeD(_target.getZ()); - packet.writeD(_actionId >= 0 ? 0x01 : 0x00); // 1 when ID from RequestActionUse is used + packet.writeD(_actionId >= 0 ? 1 : 0); // 1 when ID from RequestActionUse is used packet.writeD(_actionId >= 0 ? _actionId : 0); // ID from RequestActionUse. Used to set cooldown on summon skills. return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java index 6b710c692e..12e2488f24 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java @@ -37,11 +37,9 @@ public class ManagePledgePower implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet); - packet.writeD(_rank); packet.writeD(_action); packet.writeD(_clan.getRankPrivs(_rank).getBitmask()); - return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 95f4b6f201..4e2ab3f00b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -42,11 +42,9 @@ public class MonRaceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MON_RACE_INFO.writeId(packet); - packet.writeD(_unknown1); packet.writeD(_unknown2); - packet.writeD(0x08); - + packet.writeD(8); for (int i = 0; i < 8; i++) { packet.writeD(_monsters[i].getObjectId()); // npcObjectID @@ -68,7 +66,7 @@ public class MonRaceInfo implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java index 0093b3edc9..e6386921ff 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java @@ -45,13 +45,10 @@ public class MoveToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_xDst); packet.writeD(_yDst); packet.writeD(_zDst); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java index b1fb3ea003..59103c6c4c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java @@ -48,7 +48,6 @@ public class MoveToLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java index 30ff3c96af..aa261f924f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java @@ -50,11 +50,9 @@ public class MoveToPawn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_PAWN.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetId); packet.writeD(_distance); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index e1da19cc8f..50ff0191b8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -58,18 +58,16 @@ public class MultiSellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.MULTI_SELL_LIST.writeId(packet); - - packet.writeC(0x00); // Helios + packet.writeC(0); // Helios packet.writeD(_list.getId()); // list id - packet.writeC(0x00); // GOD Unknown + packet.writeC(0); // GOD Unknown packet.writeD(1 + (_index / PAGE_SIZE)); // page started from 1 - packet.writeD(_finished ? 0x01 : 0x00); // finished + packet.writeD(_finished ? 1 : 0); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - packet.writeC(0x00); // Grand Crusade - packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window - packet.writeD(0x20); // Helios - Always 32 - + packet.writeC(0); // Grand Crusade + packet.writeC(_list.isChanceMultisell() ? 1 : 0); // new multisell window + packet.writeD(32); // Helios - Always 32 while (_size-- > 0) { ItemInfo itemEnchantment = _list.getItemEnchantment(_index); @@ -86,19 +84,15 @@ public class MultiSellList extends AbstractItemPacket } } } - packet.writeD(_index); // Entry ID. Start from 1. packet.writeC(entry.isStackable() ? 1 : 0); - // Those values will be passed down to MultiSellChoose packet. packet.writeH(itemEnchantment != null ? itemEnchantment.getEnchantLevel() : 0); // enchant level writeItemAugment(packet, itemEnchantment); writeItemElemental(packet, itemEnchantment); writeItemEnsoulOptions(packet, itemEnchantment); - packet.writeH(entry.getProducts().size()); packet.writeH(entry.getIngredients().size()); - for (ItemChanceHolder product : entry.getProducts()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(product.getId()); @@ -122,7 +116,6 @@ public class MultiSellList extends AbstractItemPacket writeItemElemental(packet, displayItemEnchantment); writeItemEnsoulOptions(packet, displayItemEnchantment); } - for (ItemChanceHolder ingredient : entry.getIngredients()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(ingredient.getId()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java index 6e85f5348c..cd46aac3aa 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java @@ -45,11 +45,10 @@ public class MyTargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MY_TARGET_SELECTED.writeId(packet); - - packet.writeD(0x01); // Grand Crusade + packet.writeD(1); // Grand Crusade packet.writeD(_objectId); packet.writeH(_color); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java index 1901ad1297..166c5c1e00 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java @@ -36,7 +36,6 @@ public class NewCharacterSuccess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NEW_CHARACTER_SUCCESS.writeId(packet); - packet.writeD(_chars.size()); for (PlayerTemplate chr : _chars) { @@ -44,31 +43,24 @@ public class NewCharacterSuccess implements IClientOutgoingPacket { continue; } - // TODO: Unhardcode these packet.writeD(chr.getRace().ordinal()); packet.writeD(chr.getClassId().getId()); - packet.writeD(99); packet.writeD(chr.getBaseSTR()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseDEX()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseCON()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseINT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseWIT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseMEN()); packet.writeD(1); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java index be1605f679..6061ea26ef 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java @@ -38,7 +38,6 @@ public class NicknameChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NICK_NAME_CHANGED.writeId(packet); - packet.writeD(_objectId); packet.writeS(_title); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index f9cd107e2c..3e4837b4a4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -54,24 +54,20 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public NpcHtmlMessage(int npcObjId, int itemId) { super(npcObjId); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } public NpcHtmlMessage(int npcObjId, int itemId, String html) { super(npcObjId, html); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } @@ -79,11 +75,10 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java index 61f195e35d..05489103cb 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java @@ -47,10 +47,8 @@ public class NpcInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -58,7 +56,6 @@ public class NpcInfo extends AbstractMaskPacket private int _clanId = 0; private int _statusMask = 0; private final Set _abnormalVisualEffects; - private String[] _localisation; public void setLang(String lang) @@ -101,112 +98,90 @@ public class NpcInfo extends AbstractMaskPacket { addComponentType(NpcInfoType.HEADING); } - if ((npc.getStat().getPAtkSpd() > 0) || (npc.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (npc.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((npc.getLeftHandItem() > 0) || (npc.getRightHandItem() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (npc.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (npc.getDisplayEffect() > 0) { addComponentType(NpcInfoType.DISPLAY_EFFECT); } - if (npc.isInsideZone(ZoneId.WATER) || npc.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (npc.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (npc.getCloneObjId() > 0) { addComponentType(NpcInfoType.CLONE); } - if (npc.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (npc.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (npc.getCurrentHp() <= npc.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (npc.getCurrentMp() <= npc.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (npc.getTemplate().isUsingServerSideName()) { addComponentType(NpcInfoType.NAME); } - if (npc.getTemplate().isUsingServerSideTitle() || (npc.isMonster() && (Config.SHOW_NPC_LEVEL || Config.SHOW_NPC_AGGRESSION)) || npc.isChampion() || npc.isTrap()) { addComponentType(NpcInfoType.TITLE); } - if (npc.getNameString() != null) { addComponentType(NpcInfoType.NAME_NPCSTRINGID); } - if (npc.getTitleString() != null) { addComponentType(NpcInfoType.TITLE_NPCSTRINGID); } - if (_npc.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (!_abnormalVisualEffects.isEmpty() || npc.isInvisible()) { addComponentType(NpcInfoType.ABNORMALS); } - if (npc.getEnchantEffect() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (npc.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (npc.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (npc.getClanId() > 0) { final Clan clan = ClanTable.getInstance().getClan(npc.getClanId()); @@ -220,14 +195,11 @@ public class NpcInfo extends AbstractMaskPacket addComponentType(NpcInfoType.CLAN); } } - addComponentType(NpcInfoType.COLOR_EFFECT); - if (npc.getPvpFlag() > 0) { addComponentType(NpcInfoType.PVP_FLAG); } - // TODO: Confirm me if (npc.isInCombat()) { @@ -245,8 +217,7 @@ public class NpcInfo extends AbstractMaskPacket { _statusMask |= 0x08; } - - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -296,27 +267,23 @@ public class NpcInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO.writeId(packet); - packet.writeD(_npc.getObjectId()); - packet.writeC(_npc.isShowSummonAnimation() ? 0x02 : 0x00); // // 0=teleported 1=default 2=summoned + packet.writeC(_npc.isShowSummonAnimation() ? 2 : 0); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 0x01 : 0x00); + packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { String title = _npc.getTitle(); - // Localisation related. if ((_localisation != null) && !_localisation[1].equals("")) { @@ -329,10 +296,8 @@ public class NpcInfo extends AbstractMaskPacket title = title.replace(NpcData.getInstance().getTemplate(_npc.getId()).getTitle(), _localisation[1]); } } - packet.writeS(title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -351,7 +316,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -366,20 +331,20 @@ public class NpcInfo extends AbstractMaskPacket if (containsMask(NpcInfoType.EQUIPPED)) { packet.writeD(_npc.getRightHandItem()); - packet.writeD(0x00); // Armor id? + packet.writeD(0); // Armor id? packet.writeD(_npc.getLeftHandItem()); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_npc.isDead() ? 0x00 : 0x01); + packet.writeC(_npc.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); + packet.writeC(_npc.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 0x01 : _npc.isFlying() ? 0x02 : 0x00); + packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -391,7 +356,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_npc.isFlying() ? 0x01 : 0x00); + packet.writeD(_npc.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { @@ -427,12 +392,12 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(0x00); // 2 - do some animation on spawn + packet.writeC(0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -464,12 +429,10 @@ public class NpcInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java index c95a8e5274..923e9cebad 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class NpcInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_npc.getObjectId()); packet.writeD(_npc.getTransformationDisplayId()); - final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size()); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java index a294edc57a..2a0ba41eeb 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java @@ -38,7 +38,6 @@ public class NpcQuestHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NPC_QUEST_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_questId); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java index d3328ade97..fc6d0d4a3a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java @@ -106,7 +106,6 @@ public class NpcSay implements IClientOutgoingPacket { _parameters = new ArrayList<>(); } - for (String item : params) { if ((item != null) && (item.length() > 0)) @@ -127,11 +126,9 @@ public class NpcSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_SAY.writeId(packet); - packet.writeD(_objectId); packet.writeD(_textType.getClientId()); packet.writeD(_npcId); - // Localisation related. if (_lang != null) { @@ -147,7 +144,6 @@ public class NpcSay implements IClientOutgoingPacket } } } - packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java index 356e3f48a9..ac61f9d247 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java @@ -33,11 +33,10 @@ public class ObservationMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_START.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me packet.writeD(0xc0); // TODO: Find me return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java index 5c0a0766b3..896ccea02b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java @@ -33,7 +33,6 @@ public class ObservationReturn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_END.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java index c2f7ab404f..173772c870 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java @@ -37,7 +37,6 @@ public class OnEventTrigger implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EVENT_TRIGGER.writeId(packet); - packet.writeD(_emitterId); packet.writeC(_enabled); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index fbb5c84dfe..37d4fea9cf 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -45,7 +45,6 @@ public class PackageSendableList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java index a53f589386..e24d63f717 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java @@ -39,7 +39,6 @@ public class PackageToList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_TO_LIST.writeId(packet); - packet.writeD(_players.size()); for (Entry entry : _players.entrySet()) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 655c7abcd1..44b23b37f4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -55,7 +55,6 @@ public class PartyMemberPosition implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); - packet.writeD(locations.size()); for (Entry entry : locations.entrySet()) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java index 9e275ec246..c9d3595037 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java @@ -36,7 +36,6 @@ public class PartyRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java index b9c7d06769..8c97cac6b5 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java @@ -36,12 +36,10 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ADD.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); // c3 packet.writeD(_party.getDistributionType().getId()); // c3 packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); - packet.writeD((int) _member.getCurrentCp()); // c4 packet.writeD(_member.getMaxCp()); // c4 packet.writeD((int) _member.getCurrentHp()); @@ -51,7 +49,7 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket packet.writeD(_member.getVitalityPoints()); packet.writeC(_member.getLevel()); packet.writeH(_member.getClassId().getId()); - packet.writeC(0x00); + packet.writeC(0); packet.writeH(_member.getRace().ordinal()); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java index 65d0c60c2e..5ad91f5463 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java @@ -37,21 +37,17 @@ public class PartySmallWindowAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ALL.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); packet.writeC(_party.getDistributionType().getId()); packet.writeC(_party.getMemberCount() - 1); - for (Player member : _party.getMembers()) { if ((member != null) && (member != _exclude)) { packet.writeD(member.getObjectId()); packet.writeS(member.getName()); - packet.writeD((int) member.getCurrentCp()); // c4 packet.writeD(member.getMaxCp()); // c4 - packet.writeD((int) member.getCurrentHp()); packet.writeD(member.getMaxHp()); packet.writeD((int) member.getCurrentMp()); @@ -59,7 +55,7 @@ public class PartySmallWindowAll implements IClientOutgoingPacket packet.writeD(member.getVitalityPoints()); packet.writeC(member.getLevel()); packet.writeH(member.getClassId().getId()); - packet.writeC(0x01); // Unk + packet.writeC(1); // Unk packet.writeH(member.getRace().ordinal()); final Summon pet = member.getPet(); packet.writeD(member.getServitors().size() + (pet != null ? 1 : 0)); // Summon size, one only atm diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java index 94a8a5a2ce..09ce132af4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java @@ -33,7 +33,6 @@ public class PartySmallWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_DELETE.writeId(packet); - packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java index c53c6c7779..e9ea2efbbe 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java @@ -42,7 +42,6 @@ public class PartySmallWindowUpdate extends AbstractMaskPacket _summon.getStat().getExp()) { packet.writeQ(_summon.getStat().getExp()); // 0% absolute value @@ -160,9 +148,7 @@ public class PetInfo implements IClientOutgoingPacket { packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value } - packet.writeQ(_summon.getExpForNextLevel()); // 100% absoulte value - packet.writeD(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight packet.writeD(_summon.getMaxLoad()); // max weight it can carry packet.writeD(_summon.getPAtk()); // patk @@ -178,25 +164,20 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD((int) _summon.getStat().getMoveSpeed()); // speed packet.writeD(_summon.getPAtkSpd()); // atkspeed packet.writeD(_summon.getMAtkSpd()); // casting speed - packet.writeC(0); // TODO: Check me, might be ride status packet.writeC(_summon.getTeam().getId()); // Confirmed packet.writeC(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed packet.writeC(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed - - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. - + packet.writeD(0); // TODO: Find me + packet.writeD(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. packet.writeC(_summon.getOwner().getSummonPoints()); // Used Summon Points packet.writeC(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points - final Set aves = _summon.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeH(aves.size()); // Confirmed for (AbnormalVisualEffect ave : aves) { packet.writeH(ave.getClientId()); // Confirmed } - packet.writeC(_statusMask); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 5b43daa74b..1f60ec39d1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -46,7 +46,6 @@ public class PetInventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.PET_INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index e4cf35779f..16dc83b7ed 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -35,7 +35,6 @@ public class PetItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java index fdb00ddbb1..913f65d470 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java @@ -38,7 +38,6 @@ public class PetStatusShow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_SHOW.writeId(packet); - packet.writeD(_summonType); packet.writeD(_summonObjectId); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 25c2c74292..823a8c405a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -52,7 +52,6 @@ public class PetStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_UPDATE.writeId(packet); - packet.writeD(_summon.getSummonType()); packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getX()); @@ -69,7 +68,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket packet.writeQ(_summon.getStat().getExp()); packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value packet.writeQ(_summon.getExpForNextLevel()); // 100% absolute value - packet.writeD(0x01); // TODO: Find me! + packet.writeD(1); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java index 4bc3570779..0898b01f67 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java @@ -63,7 +63,6 @@ public class PlaySound implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLAY_SOUND.writeId(packet); - packet.writeD(_unknown1); // unknown 0 for quest and ship; packet.writeS(_soundFile); packet.writeD(_unknown3); // unknown 0 for quest; 1 for ship; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java index fbe57d4aaf..5108fe7e1b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java @@ -44,7 +44,6 @@ public class PledgeCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java index aa11b1213e..6805f64d7c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java @@ -34,7 +34,6 @@ public class PledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_INFO.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getId()); packet.writeS(_clan.getName()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java index 7ae6a0d284..b28dbf33c3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java @@ -36,7 +36,6 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_MEMBER_INFO.writeId(packet); - packet.writeD(_member.getPledgeType()); packet.writeS(_member.getName()); packet.writeS(_member.getTitle()); // title diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java index eefd482979..6aa5067c8f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java @@ -36,7 +36,6 @@ public class PledgeReceivePowerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_POWER_INFO.writeId(packet); - packet.writeD(_member.getPowerGrade()); // power grade packet.writeS(_member.getName()); packet.writeD(_member.getClan().getRankPrivs(_member.getPowerGrade()).getBitmask()); // privileges diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 79d478aff9..f9387ea1d8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -40,8 +40,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_SUB_PLEDGE_CREATED.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); packet.writeD(_subPledge.getId()); packet.writeS(_subPledge.getName()); packet.writeS(getLeaderName()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java index 4d0efeb82a..7649947064 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java @@ -43,7 +43,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(packet); - packet.writeD(_tab); // page packet.writeD(_clanList.size()); for (ClanWar clanWar : _clanList) @@ -53,7 +52,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket { continue; } - packet.writeS(clan.getName()); packet.writeD(clanWar.getState().ordinal()); // type: 0 = Declaration, 1 = Blood Declaration, 2 = In War, 3 = Victory, 4 = Defeat, 5 = Tie, 6 = Error packet.writeD(clanWar.getRemainingTime()); // Time if friends to start remaining diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java index 2cbbdbf046..80d10fcb66 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java @@ -34,26 +34,25 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_INFO_UPDATE.writeId(packet); - // sending empty data so client will ask all the info in response ;) packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getLevel()); // clan level packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); // castle state ? + packet.writeD(0); // castle state ? packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); // clan reputation score - packet.writeD(0x00); // ? - packet.writeD(0x00); // ? + packet.writeD(0); // ? + packet.writeD(0); // ? packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); // c5 packet.writeD(_clan.getAllyCrestId()); // c5 packet.writeD(_clan.isAtWar() ? 1 : 0); // c5 - packet.writeD(0x00); // TODO: Find me! - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java index ae26e50dbb..2fa9f26d4a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java @@ -51,12 +51,11 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ADD.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); - packet.writeD(0x00); - packet.writeD(0x01); + packet.writeD(0); + packet.writeD(1); packet.writeD(_isOnline); // 1 = online 0 = offline packet.writeD(_pledgeType); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index 971d88c53d..8880e7853d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -57,30 +57,27 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(packet); - - packet.writeD(0x00); // _isSubPledge + packet.writeD(0); // _isSubPledge packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_name); packet.writeS(_leaderName); - packet.writeD(_clan.getCrestId()); // crest id .. is used again packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); // 0 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(0); // 0 packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.isAtWar() ? 1 : 0); // new c3 - packet.writeD(0x00); // Territory castle ID - + packet.writeD(0); // Territory castle ID packet.writeD(_members.size()); for (ClanMember m : _members) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java index 0fd387e419..154bcc610d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java @@ -32,7 +32,6 @@ public class PledgeShowMemberListDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_DELETE.writeId(packet); - packet.writeS(_player); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java index 9789e1e951..beefd2b6bd 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java @@ -50,7 +50,6 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index 4e89797e45..09f70ea024 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -62,14 +62,14 @@ public class PledgeSkillList implements IClientOutgoingPacket { packet.writeD(sk.getDisplayId()); packet.writeH(sk.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } for (SubPledgeSkill sk : _subSkills) { packet.writeD(sk._subType); // Clan Sub-unit types packet.writeD(sk._skillId); packet.writeH(sk._skillLevel); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java index f3b8d4c26c..a94601294f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java @@ -37,7 +37,6 @@ public class PledgeSkillListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST_ADD.writeId(packet); - packet.writeD(_id); packet.writeD(_level); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java index 9e1b4843ac..5f32f2bf54 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java @@ -33,15 +33,14 @@ public class PledgeStatusChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_STATUS_CHANGED.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getLeaderId()); packet.writeD(_clan.getId()); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getAllyId()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.getCrestLargeId()); - packet.writeD(0x00); // pledge type ? + packet.writeD(0); // pledge type ? return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java index 5b56d0b28d..41d0f9f7d8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java @@ -44,12 +44,10 @@ public class PrivateStoreListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_LIST.writeId(packet); - packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); // Viewer's item count? + packet.writeD(0); // Viewer's item count? packet.writeD(_items.size()); - int slotNumber = 0; for (TradeItem item : _items) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 67b6ba8d94..d72050283e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -43,11 +43,10 @@ public class PrivateStoreListSell extends AbstractItemPacket else { OutgoingPackets.PRIVATE_STORE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index d05590cbde..df056c2e43 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -60,13 +60,13 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket { packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); + packet.writeD(0); for (Item item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item2 : _buyList) { writeItem(packet, item2); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index d8768104a4..6bbabb282b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -63,13 +63,13 @@ public class PrivateStoreManageListSell extends AbstractItemPacket packet.writeD(_objId); packet.writeD(_packageSale ? 1 : 0); packet.writeQ(_playerAdena); - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item2 : _sellList) { writeItem(packet, item2); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java index 8a5b9eef92..0d7bcbea16 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgBuy implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java index b00bd2add2..8fdb5701b8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgSell implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java index c3958367e8..5ddaa46ba0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java @@ -40,7 +40,6 @@ public class RadarControl implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RADAR_CONTROL.writeId(packet); - packet.writeD(_showRadar); packet.writeD(_type); // maybe type packet.writeD(_x); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java index c7e4525bf2..bcfd911f58 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java @@ -40,10 +40,8 @@ public class RecipeBookItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_BOOK_ITEM_LIST.writeId(packet); - - packet.writeD(_isDwarvenCraft ? 0x00 : 0x01); // 0 = Dwarven - 1 = Common + packet.writeD(_isDwarvenCraft ? 0 : 1); // 0 = Dwarven - 1 = Common packet.writeD(_maxMp); - if (_recipes == null) { packet.writeD(0); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index d9c2621c84..a4e4641944 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -78,7 +78,6 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(_offeringMaximumAdena); // Adena worth of items for maximum offering. return true; } - PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java index a24ba356ef..ab67f9bff3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java @@ -50,7 +50,6 @@ public class RecipeShopItemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_ITEM_INFO.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD(_recipeId); packet.writeD((int) _manufacturer.getCurrentMp()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java index aac30faf53..ec67224b1e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java @@ -57,11 +57,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MANAGE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD((int) _seller.getAdena()); - packet.writeD(_isDwarven ? 0x00 : 0x01); - + packet.writeD(_isDwarven ? 0 : 1); if ((_recipes == null) || _recipes.isEmpty()) { packet.writeD(0); @@ -69,7 +67,6 @@ public class RecipeShopManageList implements IClientOutgoingPacket else { packet.writeD(_recipes.size()); // number of items in recipe book - int i = 1; for (RecipeHolder recipe : _recipes) { @@ -77,10 +74,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket packet.writeD(i++); } } - if ((_manufacture == null) || _manufacture.isEmpty()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -88,7 +84,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket for (Entry item : _manufacture) { packet.writeD(item.getKey()); - packet.writeD(0x00); // CanCraft? + packet.writeD(0); // CanCraft? packet.writeQ(item.getValue()); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java index c025b5e4ed..2b9bc5b6e7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java @@ -33,7 +33,6 @@ public class RecipeShopMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MSG.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeS(_player.getStoreName()); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java index 07ba331de9..8f504ce103 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java @@ -37,14 +37,13 @@ public class RecipeShopSellList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_SELL_LIST.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD((int) _manufacturer.getCurrentMp()); // Creator's MP packet.writeD(_manufacturer.getMaxMp()); // Creator's MP packet.writeQ(_buyer.getAdena()); // Buyer Adena if (!_manufacturer.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -52,7 +51,7 @@ public class RecipeShopSellList implements IClientOutgoingPacket for (Entry item : _manufacturer.getManufactureItems().entrySet()) { packet.writeD(item.getKey()); - packet.writeD(0x00); // CanCreate? + packet.writeD(0); // CanCreate? packet.writeQ(item.getValue()); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 74700e29b0..269e14d50b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -88,7 +88,6 @@ public class RelationChanged implements IClientOutgoingPacket { return; } - final Relation r = new Relation(); r._objId = activeChar.getObjectId(); r._relation = relation; @@ -102,7 +101,6 @@ public class RelationChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RELATION_CHANGED.writeId(packet); - packet.writeC(_mask); if (_multi == null) { @@ -122,7 +120,6 @@ public class RelationChanged implements IClientOutgoingPacket private void writeRelation(PacketWriter packet, Relation relation) { packet.writeD(relation._objId); - if ((_mask & SEND_DEFAULT) != SEND_DEFAULT) { packet.writeD(relation._relation); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java index b4e9dc25c5..4477cfb705 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java @@ -35,7 +35,6 @@ public class RequestEnchant implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java index 4ef15fb74c..7a0a6cbe58 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java @@ -33,7 +33,6 @@ public class Revive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.REVIVE.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java index 9c409601e3..b9ddf7733f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java @@ -42,7 +42,6 @@ public class Ride implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RIDE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_mounted); packet.writeD(_rideType); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 813ce03f4d..13ef62f55f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -49,11 +49,9 @@ public class SellListProcure implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SELL_LIST_PROCURE.writeId(packet); - packet.writeQ(_money); // money - packet.writeD(0x00); // lease ? + packet.writeD(0); // lease ? packet.writeH(_sellList.size()); // list size - for (Entry entry : _sellList.entrySet()) { final Item item = entry.getKey(); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java index baa37a8507..75b5b07854 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java @@ -39,12 +39,10 @@ public class SendMacroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MACRO_LIST.writeId(packet); - packet.writeC(_updateType.getId()); - packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0x00); // modified, created or deleted macro's id + packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0); // modified, created or deleted macro's id packet.writeC(_count); // count of Macros packet.writeC(_macro != null ? 1 : 0); // unknown - if ((_macro != null) && (_updateType != MacroUpdateType.DELETE)) { packet.writeD(_macro.getId()); // Macro ID @@ -52,9 +50,7 @@ public class SendMacroList implements IClientOutgoingPacket packet.writeS(_macro.getDescr()); // Desc packet.writeS(_macro.getAcronym()); // acronym packet.writeD(_macro.getIcon()); // icon - packet.writeC(_macro.getCommands().size()); // count - int i = 1; for (MacroCmd cmd : _macro.getCommands()) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java index 47fada25be..21622b5f19 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java @@ -32,7 +32,6 @@ public class SendTradeRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_REQUEST.writeId(packet); - packet.writeD(_senderId); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java index 69aa749406..1513a0e3d1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java @@ -55,7 +55,6 @@ public class ServerObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SERVER_OBJECT_INFO.writeId(packet); - packet.writeD(_activeChar.getObjectId()); packet.writeD(_displayId + 1000000); packet.writeS(_name); // name @@ -70,8 +69,8 @@ public class ServerObjectInfo implements IClientOutgoingPacket packet.writeF(_collisionHeight); packet.writeD((int) (_isAttackable ? _activeChar.getCurrentHp() : 0)); packet.writeD(_isAttackable ? _activeChar.getMaxHp() : 0); - packet.writeD(0x01); // object type - packet.writeD(0x00); // special effects + packet.writeD(1); // object type + packet.writeD(0); // special effects return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java index 88b370ad8b..0164e5c4a2 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java @@ -34,7 +34,6 @@ public class SetSummonRemainTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SET_SUMMON_REMAIN_TIME.writeId(packet); - packet.writeD(_maxTime); packet.writeD(_remainingTime); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java index db28b72acf..016f5a0c9a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java @@ -38,7 +38,6 @@ public class ShopPreviewInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_INFO.writeId(packet); - packet.writeD(Inventory.PAPERDOLL_TOTALSLOTS); // Slots packet.writeD(getFromList(Inventory.PAPERDOLL_UNDER)); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index 4d605cfbb4..0cc66729ca 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -52,11 +52,9 @@ public class ShopPreviewList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_LIST.writeId(packet); - packet.writeD(5056); packet.writeQ(_money); // current money packet.writeD(_listId); - int newlength = 0; for (Product product : _list) { @@ -66,23 +64,20 @@ public class ShopPreviewList implements IClientOutgoingPacket } } packet.writeH(newlength); - for (Product product : _list) { if (!product.getItem().getCrystalType().isGreater(_expertise) && product.getItem().isEquipable()) { packet.writeD(product.getItemId()); packet.writeH(product.getItem().getType2()); // item type2 - if (product.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { packet.writeQ(product.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } else { - packet.writeQ(0x00); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand + packet.writeQ(0); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } - packet.writeQ(Config.WEAR_PRICE); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 298301ed0d..b13080ff28 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -40,7 +40,6 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_BUFF_STATUS_UPDATE.writeId(packet); - packet.writeD(_skillId); packet.writeH(_skillLevel); packet.writeH(_skillSubLevel); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index c6a67fb97c..b8624ce4cd 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -33,7 +33,6 @@ public class ShortCutInit implements IClientOutgoingPacket { return; } - _shortCuts = player.getAllShortCuts(); } @@ -41,24 +40,22 @@ public class ShortCutInit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); packet.writeD(sc.getSlot() + (sc.getPage() * 12)); - switch (sc.getType()) { case ITEM: { packet.writeD(sc.getId()); - packet.writeD(0x01); // Enabled or not + packet.writeD(1); // Enabled or not packet.writeD(sc.getSharedReuseGroup()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeQ(0x00); // Augment id - packet.writeD(0x00); // Visual id + packet.writeD(0); + packet.writeD(0); + packet.writeQ(0); // Augment id + packet.writeD(0); // Visual id break; } case SKILL: @@ -67,8 +64,8 @@ public class ShortCutInit implements IClientOutgoingPacket packet.writeH(sc.getLevel()); packet.writeH(sc.getSubLevel()); packet.writeD(sc.getSharedReuseGroup()); - packet.writeC(0x00); // C5 - packet.writeD(0x01); // C6 + packet.writeC(0); // C5 + packet.writeD(1); // C6 break; } case ACTION: @@ -77,7 +74,7 @@ public class ShortCutInit implements IClientOutgoingPacket case BOOKMARK: { packet.writeD(sc.getId()); - packet.writeD(0x01); // C6 + packet.writeD(1); // C6 } } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java index 43d61af661..f099eab47e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java @@ -37,7 +37,6 @@ public class ShortCutRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_REGISTER.writeId(packet); - packet.writeD(_shortcut.getType().ordinal()); packet.writeD(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client switch (_shortcut.getType()) @@ -47,10 +46,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeD(_shortcut.getId()); packet.writeD(_shortcut.getCharacterType()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeD(0x00); // unknown - packet.writeD(0x00); // unknown - packet.writeD(0x00); // item augment id - packet.writeD(0x00); // TODO: Find me, item visual id ? + packet.writeD(0); // unknown + packet.writeD(0); // unknown + packet.writeD(0); // item augment id + packet.writeD(0); // TODO: Find me, item visual id ? break; } case SKILL: @@ -59,10 +58,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeH(_shortcut.getLevel()); packet.writeH(_shortcut.getSubLevel()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeC(0x00); // C5 + packet.writeC(0); // C5 packet.writeD(_shortcut.getCharacterType()); - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me + packet.writeD(0); // TODO: Find me break; } case ACTION: diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java index d6f71b5f70..cfae3b3fad 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java @@ -54,7 +54,6 @@ public class ShowBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - packet.writeC(_showBoard); // c4 1 to show community 00 to hide packet.writeS("bypass _bbshome"); // top packet.writeS("bypass _bbsgetfav"); // favorite diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java index 4b62a7001b..4d62e99d7a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java @@ -32,7 +32,6 @@ public class ShowCalculator implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_CALC.writeId(packet); - packet.writeD(_calculatorId); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java index 55f58d5375..4574762467 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java @@ -32,9 +32,8 @@ public class ShowMiniMap implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_MINIMAP.writeId(packet); - packet.writeD(_mapId); - packet.writeC(0x00); // Seven Signs state + packet.writeC(0); // Seven Signs state return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java index 303eab4e8a..97100d09d2 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java @@ -34,7 +34,6 @@ public class ShowPCCafeCouponShowUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_PCCAFE_COUPON_SHOW_UI.writeId(packet); - return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java index d86958e586..0a0f3ae861 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java @@ -35,7 +35,6 @@ public class ShowXMasSeal implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_XMAS_SEAL.writeId(packet); - packet.writeD(_item); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java index 66eccc7fbf..1baa030c4d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java @@ -28,9 +28,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = ca
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Attackers Clans?
* d = Number of Attackers Clans
* { //repeats
@@ -58,11 +58,10 @@ public class SiegeAttackerList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _castle.getSiege().getAttackerClans().size(); if (size > 0) { @@ -76,12 +75,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -90,8 +88,8 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index 5d5c831f14..8afd1f38ce 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -29,9 +29,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = 0xcb
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Defending Clans?
* d = Number of Defending Clans
* { //repeats
@@ -60,16 +60,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // Unknown - packet.writeD(0x01); // Unknown - packet.writeD(0x00); // Unknown - + packet.writeD(0); // Unknown + packet.writeD(1); // Unknown + packet.writeD(0); // Unknown final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0); packet.writeD(size); packet.writeD(size); - // Add owners final Clan ownerClan = _castle.getOwner(); if (ownerClan != null) @@ -78,14 +75,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket packet.writeS(ownerClan.getName()); packet.writeS(ownerClan.getLeaderName()); packet.writeD(ownerClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.OWNER.ordinal()); packet.writeD(ownerClan.getAllyId()); packet.writeS(ownerClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(ownerClan.getAllyCrestId()); } - // List of confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans()) { @@ -94,19 +90,17 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(defendingClan.getAllyCrestId()); } - // List of not confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans()) { @@ -115,12 +109,11 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER_PENDING.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 0a3fe46cb7..dfeefdaecf 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -59,13 +59,11 @@ public class SiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_INFO.writeId(packet); - if (_castle != null) { packet.writeD(_castle.getResidenceId()); - final int ownerId = _castle.getOwnerId(); - packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 0x01 : 0x00); + packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0); packet.writeD(ownerId); if (ownerId > 0) { @@ -89,7 +87,6 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { @@ -97,7 +94,7 @@ public class SiegeInfo implements IClientOutgoingPacket cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis()); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(Config.SIEGE_HOUR_LIST.size()); for (int hour : Config.SIEGE_HOUR_LIST) { @@ -108,7 +105,7 @@ public class SiegeInfo implements IClientOutgoingPacket else { packet.writeD((int) (_castle.getSiegeDate().getTimeInMillis() / 1000)); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index d11b3817c0..3c4c475339 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -51,12 +51,11 @@ public class SkillCoolTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SKILL_COOL_TIME.writeId(packet); - packet.writeD(_skillReuseTimeStamps.size()); for (TimeStamp ts : _skillReuseTimeStamps) { packet.writeD(ts.getSkillId()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD((int) ts.getReuse() / 1000); packet.writeD((int) Math.max(ts.getStamp() - _currentTime, 0) / 1000); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index de54232b51..ed4615c403 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -41,10 +41,9 @@ public class Snoop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SNOOP.writeId(packet); - packet.writeD(_convoId); packet.writeS(_name); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_type.getClientId()); packet.writeS(_speaker); packet.writeS(_msg); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java index 37827bdf6c..52f15519a5 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java @@ -37,10 +37,9 @@ public class SocialAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SOCIAL_ACTION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_actionId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index fd7e43a153..19066f5f85 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -33,16 +33,15 @@ public class SpawnItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPAWN_ITEM.writeId(packet); - packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeD(_item.isStackable() ? 0x01 : 0x00); + packet.writeD(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java index ccae75b850..04f3ad716c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java @@ -110,7 +110,6 @@ public class SpecialCamera implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPECIAL_CAMERA.writeId(packet); - packet.writeD(_id); packet.writeD(_force); packet.writeD(_angle1); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java index cdd3821740..281756e793 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java @@ -34,7 +34,6 @@ public class StartPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_PLEDGE_WAR.writeId(packet); - packet.writeS(_playerName); packet.writeS(_pledgeName); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java index 48b4238eea..27fb4f606b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java @@ -38,7 +38,6 @@ public class StartRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_side); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java index b4f421df36..067bdeb082 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java @@ -72,7 +72,6 @@ public class StaticObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATIC_OBJECT.writeId(packet); - packet.writeD(_staticObjectId); packet.writeD(_objectId); packet.writeD(_type); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index 928b54aa48..40836e4af8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -46,7 +46,6 @@ public class StatusUpdate implements IClientOutgoingPacket public void addUpdate(StatusUpdateType type, int level) { _updates.put(type, level); - if (_isPlayable) { switch (type) @@ -75,10 +74,9 @@ public class StatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATUS_UPDATE.writeId(packet); - packet.writeD(_objectId); // casterId - packet.writeD(_isVisible ? _casterObjectId : 0x00); - packet.writeC(_isVisible ? 0x01 : 0x00); + packet.writeD(_isVisible ? _casterObjectId : 0); + packet.writeC(_isVisible ? 1 : 0); packet.writeC(_updates.size()); for (Entry entry : _updates.entrySet()) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java index 9919307366..cf2b71df5a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java @@ -53,7 +53,6 @@ public class StopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java index 50fdc3fe4c..78fdb5d70c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java @@ -43,7 +43,6 @@ public class StopMoveInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java index 9c828c3962..b254cad8b1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java @@ -34,7 +34,6 @@ public class StopPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java index b0392de226..ca69cd5346 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java @@ -36,7 +36,6 @@ public class StopRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FINISH_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_speed); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index c1feb37b2f..2d92796c75 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -43,10 +43,8 @@ public class SummonInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class SummonInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class SummonInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,11 +154,9 @@ public class SummonInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - // Show red aura? - // if (_statusMask != 0) + // if (_statusMask != 0x00) // { // addComponentType(NpcInfoType.VISUAL_STATE); // } @@ -229,28 +206,24 @@ public class SummonInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.SUMMON_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -269,7 +242,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -285,19 +258,19 @@ public class SummonInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -309,20 +282,20 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -346,12 +319,12 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -381,12 +354,10 @@ public class SummonInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java index 864462f76f..6f88551204 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java @@ -34,7 +34,6 @@ public class SurrenderPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SURRENDER_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 746b2da3f7..b509d599db 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -161,7 +161,6 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } - _params[_paramIndex++] = param; } @@ -267,7 +266,6 @@ public class SystemMessage implements IClientOutgoingPacket { return addString(item.getName()); } - append(new SMParam(TYPE_ITEM_NAME, id)); return this; } @@ -389,7 +387,6 @@ public class SystemMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SYSTEM_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -402,13 +399,12 @@ public class SystemMessage implements IClientOutgoingPacket params[i] = _params[i].getValue(); } packet.writeH(SystemMessageId.S1_2.getId()); - packet.writeC(0x01); + packet.writeC(1); packet.writeC(TYPE_TEXT); packet.writeS(sml.getLocalisation(params)); return true; } } - packet.writeH(getId()); packet.writeC(_params.length); for (SMParam param : _params) @@ -418,9 +414,7 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } - packet.writeC(param.getType()); - switch (param.getType()) { case TYPE_ELEMENT_NAME: diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java index a91da07e77..d357efbb0e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java @@ -47,13 +47,12 @@ public class TargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_SELECTED.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java index 3dadd249f6..3d7208c06f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java @@ -42,12 +42,11 @@ public class TargetUnselected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_UNSELECTED.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index 943b5078b6..13f9b9565a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -41,14 +41,13 @@ public class TeleportToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TELEPORT_TO_LOCATION.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // Fade 0, Instant 1. + packet.writeD(0); // Fade 0, Instant 1. packet.writeD(_heading); - packet.writeD(0x00); // Unknown. + packet.writeD(0); // Unknown. return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java index cb82f2da59..8d09576d9d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java @@ -32,7 +32,6 @@ public class TradeDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_DONE.writeId(packet); - packet.writeD(_num); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java index 716ed2a099..6a94d2463f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java @@ -41,9 +41,9 @@ public class TradeOtherAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java index 3d0ef0b501..7907f3d498 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java @@ -41,9 +41,9 @@ public class TradeOwnAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c59568bf1d..3822108c5a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -58,7 +58,6 @@ public class TradeStart extends AbstractItemPacket { _mask |= 0x08; } - // Does not shows level if (_partner.isGM()) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java index f8e2a191de..e5ec2376cc 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java @@ -44,10 +44,10 @@ public class TradeUpdate extends AbstractItemPacket { OutgoingPackets.TRADE_UPDATE.writeId(packet); packet.writeC(_sendType); - packet.writeD(0x01); + packet.writeD(1); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2); writeItem(packet, _item, _count); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java index c7102ca385..728020c0b1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java @@ -32,7 +32,6 @@ public class TutorialEnableClientEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_ENABLE_CLIENT_EVENT.writeId(packet); - packet.writeD(_eventId); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java index 92ac75afcf..7cc33a0f80 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java @@ -48,7 +48,6 @@ public class TutorialShowHtml extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_HTML.writeId(packet); - packet.writeD(_type); packet.writeS(getHtml()); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java index 75a57be38b..2ee62835db 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java @@ -37,7 +37,6 @@ public class TutorialShowQuestionMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_QUESTION_MARK.writeId(packet); - packet.writeC(_markType); packet.writeD(_markId); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index a3e6690b24..6506847dd9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -35,7 +35,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class UserInfo extends AbstractMaskPacket { private Player _player; - private int _relation; private int _runSpd; private int _walkSpd; @@ -49,14 +48,12 @@ public class UserInfo extends AbstractMaskPacket private int _enchantLevel; private int _armorEnchant; private String _title; - private final byte[] _masks = new byte[] { (byte) 0x00, (byte) 0x00, (byte) 0x00 }; - private int _initSize = 5; public UserInfo(Player player) @@ -80,6 +77,7 @@ public class UserInfo extends AbstractMaskPacket _enchantLevel = player.getInventory().getWeaponEnchant(); _armorEnchant = player.getInventory().getArmorMinEnchant(); _title = player.getTitle(); + if (player.isGM() && player.isInvisible()) { _title = "[Invisible]"; @@ -135,29 +133,25 @@ public class UserInfo extends AbstractMaskPacket } OutgoingPackets.USER_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_initSize); packet.writeH(24); packet.writeB(_masks); - if (containsMask(UserInfoType.RELATION)) { packet.writeD(_relation); } - if (containsMask(UserInfoType.BASIC_INFO)) { packet.writeH(16 + (_player.getAppearance().getVisibleName().length() * 2)); packet.writeString(_player.getName()); - packet.writeC(_player.isGM() ? 0x01 : 0x00); + packet.writeC(_player.isGM() ? 1 : 0); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } - if (containsMask(UserInfoType.BASE_STATS)) { packet.writeH(18); @@ -170,7 +164,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getLUC()); packet.writeH(_player.getCHA()); } - if (containsMask(UserInfoType.MAX_HPCPMP)) { packet.writeH(14); @@ -178,7 +171,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMaxMp()); packet.writeD(_player.getMaxCp()); } - if (containsMask(UserInfoType.CURRENT_HPMPCP_EXP_SP)) { packet.writeH(38); @@ -189,23 +181,20 @@ public class UserInfo extends AbstractMaskPacket packet.writeQ(_player.getExp()); packet.writeF((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel()))); } - if (containsMask(UserInfoType.ENCHANTLEVEL)) { packet.writeH(4); packet.writeC(_enchantLevel); packet.writeC(_armorEnchant); } - if (containsMask(UserInfoType.APPAREANCE)) { packet.writeH(15); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); } - if (containsMask(UserInfoType.STATUS)) { packet.writeH(6); @@ -214,7 +203,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.getCrystallizeGrade() != ItemGrade.NONE ? 1 : 0); packet.writeC(_player.getAbilityPoints() - _player.getAbilityPointsUsed()); } - if (containsMask(UserInfoType.STATS)) { packet.writeH(56); @@ -233,7 +221,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); } - if (containsMask(UserInfoType.ELEMENTALS)) { packet.writeH(14); @@ -244,7 +231,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getDefenseElementValue(AttributeType.HOLY)); packet.writeH(_player.getDefenseElementValue(AttributeType.DARK)); } - if (containsMask(UserInfoType.POSITION)) { packet.writeH(18); @@ -253,7 +239,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getZ()); packet.writeD(_player.isInVehicle() ? _player.getVehicle().getObjectId() : 0); } - if (containsMask(UserInfoType.SPEED)) { packet.writeH(18); @@ -266,21 +251,18 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_flyRunSpd); packet.writeH(_flyWalkSpd); } - if (containsMask(UserInfoType.MULTIPLIER)) { packet.writeH(18); packet.writeF(_moveMultiplier); packet.writeF(_player.getAttackSpeedMultiplier()); } - if (containsMask(UserInfoType.COL_RADIUS_HEIGHT)) { packet.writeH(18); packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); } - if (containsMask(UserInfoType.ATK_ELEMENTAL)) { packet.writeH(5); @@ -288,7 +270,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); } - if (containsMask(UserInfoType.CLAN)) { packet.writeH(32 + (_title.length() * 2)); @@ -298,12 +279,11 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getClanCrestLargeId()); packet.writeD(_player.getClanCrestId()); packet.writeD(_player.getClanPrivileges().getBitmask()); - packet.writeC(_player.isClanLeader() ? 0x01 : 0x00); + packet.writeC(_player.isClanLeader() ? 1 : 0); packet.writeD(_player.getAllyId()); packet.writeD(_player.getAllyCrestId()); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); } - if (containsMask(UserInfoType.SOCIAL)) { packet.writeH(22); @@ -317,80 +297,71 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); } - if (containsMask(UserInfoType.VITA_FAME)) { packet.writeH(15); packet.writeD(_player.getVitalityPoints()); - packet.writeC(0x00); // Vita Bonus + packet.writeC(0); // Vita Bonus packet.writeD(_player.getFame()); packet.writeD(_player.getRaidbossPoints()); } - if (containsMask(UserInfoType.SLOTS)) { packet.writeH(12); // 152 packet.writeC(_player.getInventory().getTalismanSlots()); packet.writeC(_player.getInventory().getBroochJewelSlots()); packet.writeC(_player.getTeam().getId()); - packet.writeD(0x00); - + packet.writeD(0); if (_player.getInventory().getAgathionSlots() > 0) { - packet.writeC(0x01); // Charm slots + packet.writeC(1); // Charm slots packet.writeC(_player.getInventory().getAgathionSlots() - 1); packet.writeC(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152 } else { - packet.writeC(0x00); // Charm slots - packet.writeC(0x00); + packet.writeC(0); // Charm slots + packet.writeC(0); packet.writeC(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152 } } - if (containsMask(UserInfoType.MOVEMENTS)) { packet.writeH(4); packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); - packet.writeC(_player.isRunning() ? 0x01 : 0x00); + packet.writeC(_player.isRunning() ? 1 : 0); } - if (containsMask(UserInfoType.COLOR)) { packet.writeH(10); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); } - if (containsMask(UserInfoType.INVENTORY_LIMIT)) { packet.writeH(9); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); packet.writeH(_player.getInventoryLimit()); packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); } - if (containsMask(UserInfoType.TRUE_HERO)) { packet.writeH(9); - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeC(_player.isTrueHero() ? 100 : 0x00); + packet.writeD(0); + packet.writeH(0); + packet.writeC(_player.isTrueHero() ? 100 : 0); } - if (containsMask(UserInfoType.ATT_SPIRITS)) // 152 { packet.writeH(26); packet.writeD(-1); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - return true; } @@ -407,7 +378,6 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x10; // Party leader } } - if (clan != null) { relation |= 0x20; // Clan member @@ -416,12 +386,10 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x40; // Clan leader } } - if (player.isInSiege()) { relation |= 0x80; // In siege } - return relation; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java index 283bcf1614..90c416726a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java @@ -36,7 +36,6 @@ public class ValidateLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java index 4d8f9683d0..83f72bf981 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java @@ -40,7 +40,6 @@ public class ValidateLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java index b684e70bdc..71367cd26d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java @@ -36,7 +36,6 @@ public class VehicleCheckLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_CHECK_LOCATION.writeId(packet); - packet.writeD(_boat.getObjectId()); packet.writeD(_boat.getX()); packet.writeD(_boat.getY()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java index a4a5780f30..5b565c08b7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java @@ -46,7 +46,6 @@ public class VehicleDeparture implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_DEPARTURE.writeId(packet); - packet.writeD(_objId); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java index ec611028bf..4a995a6352 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java @@ -44,7 +44,6 @@ public class VehicleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java index 207a6fd899..bf629dcbbc 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java @@ -42,7 +42,6 @@ public class VehicleStarted implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_START.writeId(packet); - packet.writeD(_objectId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 35ca986d35..5eb9eb7ab9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -30,6 +30,7 @@ public class WareHouseDepositList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; public static final int FREIGHT = 1; + private final int _sendType; private final long _playerAdena; private final List _items = new ArrayList<>(); @@ -49,7 +50,6 @@ public class WareHouseDepositList extends AbstractItemPacket _sendType = sendType; _whType = type; _playerAdena = player.getAdena(); - final boolean isPrivate = _whType == PRIVATE; for (Item temp : player.getInventory().getAvailableItems(true, isPrivate, false)) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 7af1cd273c..5ece99310a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -32,6 +32,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private final int _sendType; private Player _player; private long _playerAdena; @@ -60,7 +61,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } - _items = _player.getActiveWarehouse().getItems(); for (Item item : _items) { @@ -78,15 +78,15 @@ public class WareHouseWithdrawalList extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeH(0x00); + packet.writeH(0); packet.writeD(_invSize); packet.writeD(_items.size()); for (Item item : _items) { writeItem(packet, item); packet.writeD(item.getObjectId()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } else diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java index 7442882a70..bd10e174c6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java @@ -59,7 +59,6 @@ public class ExAcquireAPSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_AP_SKILL_LIST.writeId(packet); - packet.writeD(_enable ? 1 : 0); packet.writeQ(Config.ABILITY_POINTS_RESET_SP); // Changed to from Adena to SP on Grand Crusade // packet.writeQ(_price); Removed on Grand Crusade diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java index f9af89e4db..ff296bf632 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java @@ -35,7 +35,6 @@ public class ExCloseAPListWnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_AP_LIST_WND.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java index d72baf2a44..69c47ce99f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java @@ -35,7 +35,6 @@ public class ExShowAPListWnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AP_LIST_WND.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java index 5f2dd05f3b..aea1476fb2 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java @@ -35,8 +35,7 @@ public class ExDivideAdenaCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_CANCEL.writeId(packet); - - packet.writeC(0x00); // TODO: Find me + packet.writeC(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java index 6af912cebf..de4e955aba 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java @@ -46,9 +46,8 @@ public class ExDivideAdenaDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_DONE.writeId(packet); - - packet.writeC(_isPartyLeader ? 0x01 : 0x00); - packet.writeC(_isCCLeader ? 0x01 : 0x00); + packet.writeC(_isPartyLeader ? 1 : 0); + packet.writeC(_isCCLeader ? 1 : 0); packet.writeD(_memberCount); packet.writeQ(_distributedAdenaCount); packet.writeQ(_adenaCount); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java index ab8a7471d6..32f99abfdc 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java @@ -38,8 +38,7 @@ public class ExAlchemyConversion implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_CONVERSION.writeId(packet); - - packet.writeC((_successCount == 0) && (_failureCount == 0) ? 0x01 : 0x00); + packet.writeC((_successCount == 0) && (_failureCount == 0) ? 1 : 0); packet.writeD(_successCount); packet.writeD(_failureCount); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java index be4a2a57e6..cb3cf4b3e0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java @@ -47,7 +47,6 @@ public class ExTryMixCube implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TRY_MIX_CUBE.writeId(packet); - packet.writeC(_type.ordinal()); packet.writeD(_items.size()); for (AlchemyResult holder : _items) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index 549def456e..84b5fead76 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -43,7 +43,6 @@ public class ExChooseShapeShiftingItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_SHAPE_SHIFTING_ITEM.writeId(packet); - packet.writeD(_targetType != null ? _targetType.ordinal() : 0); packet.writeD(_type != null ? _type.ordinal() : 0); packet.writeD(_itemId); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java index 33fb439aa5..ba55887a1a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java @@ -45,7 +45,6 @@ public class ExCuriousHouseMemberUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_UPDATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_maxHp); packet.writeD(_maxCp); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java index 8ad3659725..be2d29d864 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPacket { - public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0x00); - public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(0x01); + public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0); + public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(1); private final int _result; @@ -39,7 +39,6 @@ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPa public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_EXTRACTION_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java index ec82cc14f3..e84d7a7255 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; public static final ExPutShapeShiftingTargetItemResult FAILED = new ExPutShapeShiftingTargetItemResult(RESULT_FAILED, 0); @@ -43,7 +43,6 @@ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_resultId); packet.writeQ(_price); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java index f4d3118cc4..038eae0042 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExShapeShiftingResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; - public static final int RESULT_CLOSE = 0x02; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; + public static final int RESULT_CLOSE = 2; public static final ExShapeShiftingResult FAILED = new ExShapeShiftingResult(RESULT_FAILED, 0, 0); public static final ExShapeShiftingResult CLOSE = new ExShapeShiftingResult(RESULT_CLOSE, 0, 0); @@ -47,7 +47,6 @@ public class ExShapeShiftingResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHAPE_SHIFTING_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_targetItemId); packet.writeD(_extractItemId); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java index eaf0d209fd..4b48b09002 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java @@ -38,7 +38,7 @@ public class ExConfirmVipAttendanceCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CONFIRM_VIP_ATTENDANCE_CHECK.writeId(packet); - packet.writeC(_available ? 0x01 : 0x00); // can receive reward today? 1 else 0 + packet.writeC(_available ? 1 : 0); // can receive reward today? 1 else 0 packet.writeC(_index); // active reward index packet.writeD(0); packet.writeD(0); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java index 9d61fe68d6..dd94df023f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java @@ -45,10 +45,10 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket OutgoingPackets.EX_VIP_ATTENDANCE_ITEM_LIST.writeId(packet); packet.writeC(_available ? _index + 1 : _index); // index to receive? packet.writeC(_index); // last received index? - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeC(0x01); - packet.writeC(_available ? 0x01 : 0x00); // player can receive reward today? + packet.writeD(0); + packet.writeD(0); + packet.writeC(1); + packet.writeC(_available ? 1 : 0); // player can receive reward today? packet.writeC(250); packet.writeC(AttendanceRewardData.getInstance().getRewardsCount()); // reward size int rewardCounter = 0; @@ -57,11 +57,11 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket rewardCounter++; packet.writeD(reward.getId()); packet.writeQ(reward.getCount()); - packet.writeC(0x01); // is unknown? - packet.writeC((rewardCounter % 7) == 0 ? 0x01 : 0x00); // is last in row? + packet.writeC(1); // is unknown? + packet.writeC((rewardCounter % 7) == 0 ? 1 : 0); // is last in row? } - packet.writeC(0x00); - packet.writeD(0x00); + packet.writeC(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java index 7f1d6d60d1..73f93335ef 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java @@ -43,7 +43,6 @@ public class ExCuriousHouseMemberList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_LIST.writeId(packet); - packet.writeD(_id); packet.writeD(_maxPlayers); packet.writeD(_players.size()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java index b71caa5f14..5d9b34db61 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java @@ -37,7 +37,6 @@ public class ExCuriousHouseRemainTime implements IClientOutgoingPacket { OutgoingPackets.EX_CURIOUS_HOUSE_REMAIN_TIME.writeId(packet); packet.writeD(_time); - return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java index 4c3ae253ea..c79b68becc 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java @@ -39,7 +39,6 @@ public class ExResponseCommissionBuyInfo extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_INFO.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java index ddfa8b6db1..c1d29735b8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java @@ -40,7 +40,6 @@ public class ExResponseCommissionBuyItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_ITEM.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java index aa4bbbde24..01e4782408 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java @@ -39,7 +39,6 @@ public class ExResponseCommissionDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_DELETE.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java index e7e3c39816..b915574175 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java @@ -55,7 +55,6 @@ public class ExResponseCommissionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_INFO.writeId(packet); - packet.writeD(_result); packet.writeD(_itemId); packet.writeQ(_presetPricePerUnit); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java index 4963393b42..a012b3ab30 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java @@ -64,7 +64,6 @@ public class ExResponseCommissionList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_LIST.writeId(packet); - packet.writeD(_replyType.getClientId()); switch (_replyType) { @@ -73,13 +72,11 @@ public class ExResponseCommissionList extends AbstractItemPacket { packet.writeD((int) Instant.now().getEpochSecond()); packet.writeD(_chunkId); - int chunkSize = _items.size() - _listIndexStart; if (chunkSize > MAX_CHUNK_SIZE) { chunkSize = MAX_CHUNK_SIZE; } - packet.writeD(chunkSize); for (int i = _listIndexStart; i < (_listIndexStart + chunkSize); i++) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java index b1b0a97d7a..183547af06 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java @@ -39,7 +39,6 @@ public class ExResponseCommissionRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_REGISTER.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java index 74d8a95587..b68386e4ed 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java @@ -35,8 +35,7 @@ public class ExShowCommission implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_COMMISSION.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java index 0c267ecf34..11b1ff1e0a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExEnchantFail implements IClientOutgoingPacket { public static final ExEnchantFail STATIC_PACKET = new ExEnchantFail(0, 0); + private final int _itemOne; private final int _itemTwo; @@ -39,7 +40,6 @@ public class ExEnchantFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_FAIL.writeId(packet); - packet.writeD(_itemOne); packet.writeD(_itemTwo); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java index 71ba811ed5..87d29a8e7c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java @@ -36,7 +36,6 @@ public class ExEnchantSucess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SUCESS.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java index eb4eb8b26c..ec67d50fb6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java @@ -39,7 +39,6 @@ public class ExGetCrystalizingEstimation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - packet.writeD(_items.size()); for (ItemChanceHolder holder : _items) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java index 586d77c13f..2fb9bb65a1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java @@ -40,11 +40,9 @@ public class ExFactionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FACTION_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_openDialog ? 1 : 0); packet.writeD(Faction.values().length); - for (Faction faction : Faction.values()) { packet.writeC(faction.getId()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java index fa605b548a..a99ad7f4e3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java @@ -52,7 +52,7 @@ public class ExFishingStart implements IClientOutgoingPacket packet.writeD(_baitLocation.getX()); packet.writeD(_baitLocation.getY()); packet.writeD(_baitLocation.getZ()); - packet.writeC(0x01); // 0 = newbie, 1 = normal, 2 = night + packet.writeC(1); // 0 = newbie, 1 = normal, 2 = night return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java index 046ad04cb6..74501fe7ff 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java @@ -49,7 +49,6 @@ public class ExUserInfoFishing implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_FISHING.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_isFishing ? 1 : 0); if (_baitLocation == null) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index dc0e3e05bc..336a384bcc 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -47,9 +47,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FRIEND_DETAIL_INFO.writeId(packet); - packet.writeD(_objectId); - if (_friend == null) { packet.writeS(_name); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java index 0d4bb47ff0..a90b7b6083 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java @@ -33,8 +33,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x00); + packet.writeC(0); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java index 9add9c9caa..d24139644c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java @@ -49,7 +49,6 @@ public class FriendAddRequestResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_charId); packet.writeS(_charName); @@ -57,7 +56,7 @@ public class FriendAddRequestResult implements IClientOutgoingPacket packet.writeD(_charObjectId); packet.writeD(_charLevel); packet.writeD(_charClassId); - packet.writeH(0x00); // Always 0 on retail + packet.writeH(0); // Always 0 on retail return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java index a135944662..13a7d01967 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java @@ -86,12 +86,10 @@ public class FriendList implements IClientOutgoingPacket } continue; } - if (player1.isOnline()) { online = true; } - classid = player1.getClassId().getId(); level = player1.getLevel(); _info.add(new FriendInfo(objId, name, online, classid, level)); @@ -102,14 +100,13 @@ public class FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._classid); packet.writeD(info._level); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java index 07c23f9fd2..1bb4142e34 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java @@ -38,7 +38,6 @@ public class FriendRemove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_REMOVE.writeId(packet); - packet.writeD(_responce); packet.writeS(_charName); return true; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java index e8dbddcd63..a3990c0879 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java @@ -52,7 +52,6 @@ public class FriendStatus implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_STATUS.writeId(packet); - packet.writeD(_type); packet.writeS(_name); switch (_type) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java index 8752104e06..78da5850b8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java @@ -50,7 +50,6 @@ public class L2Friend implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND.writeId(packet); - packet.writeD(_action ? 1 : 3); // 1-add 3-remove packet.writeD(_objid); packet.writeS(_name); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java index b69a253635..e50693cb11 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java @@ -81,17 +81,16 @@ public class L2FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._level); packet.writeD(info._classId); - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java index 677c09091f..706c179a9c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java @@ -37,7 +37,6 @@ public class ExMentorAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_ADD.writeId(packet); - packet.writeS(_mentor.getName()); packet.writeD(_mentor.getActiveClass()); packet.writeD(_mentor.getLevel()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java index 4722a9cab3..18c1cdeedf 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java @@ -64,9 +64,8 @@ public class ExMentorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_LIST.writeId(packet); - packet.writeD(_type); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mentees.size()); for (Mentee mentee : _mentees) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java index d739dd94b7..2283920b98 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ListMenteeWaiting implements IClientOutgoingPacket { private static final int PLAYERS_PER_PAGE = 64; + private final List _possibleCandiates = new ArrayList<>(); private final int _page; @@ -51,18 +52,15 @@ public class ListMenteeWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_MENTEE_WAITING.writeId(packet); - - packet.writeD(0x01); // always 1 in retail + packet.writeD(1); // always 1 in retail if (_possibleCandiates.isEmpty()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } - packet.writeD(_possibleCandiates.size()); packet.writeD(_possibleCandiates.size() % PLAYERS_PER_PAGE); - for (Player player : _possibleCandiates) { if ((1 <= (PLAYERS_PER_PAGE * _page)) && (1 > (PLAYERS_PER_PAGE * (_page - 1)))) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java index e33e29a487..fc80b0a6c0 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java @@ -41,7 +41,6 @@ public class ExPledgeContributionInfo implements IClientOutgoingPacket { return false; } - OutgoingPackets.EX_PLEDGE_CONTRIBUTION_INFO.writeId(packet); packet.writeD(_player.getClanContribution()); packet.writeD(_player.getClanContribution()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java index e65c0ced20..64b1bfd2e6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java @@ -44,10 +44,8 @@ public class ExPledgeContributionRank implements IClientOutgoingPacket { return false; } - OutgoingPackets.EX_PLEDGE_CONTRIBUTION_RANK.writeId(packet); packet.writeC(_cycle); - packet.writeD(_clan.getMembersCount()); int order = 1; for (ClanMember member : _clan.getMembers()) @@ -70,7 +68,6 @@ public class ExPledgeContributionRank implements IClientOutgoingPacket packet.writeD(member.getClanContributionTotal()); } } - return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java index c235245d89..e66b814d06 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java @@ -42,9 +42,7 @@ public class ExPledgeItemList extends AbstractItemPacket { return false; } - OutgoingPackets.EX_PLEDGE_ITEM_LIST.writeId(packet); - packet.writeH(ClanShopData.getInstance().getProducts().size()); // Product count. for (ClanShopProductHolder product : ClanShopData.getInstance().getProducts()) { @@ -61,7 +59,6 @@ public class ExPledgeItemList extends AbstractItemPacket packet.writeH(0); // Current stock packet.writeH(0); // Total stock } - return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java index e4df4b523e..21c5ba1724 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java @@ -44,9 +44,7 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket { return false; } - OutgoingPackets.EX_PLEDGE_MASTERY_INFO.writeId(packet); - packet.writeD(clan.getUsedDevelopmentPoints()); // Consumed development points packet.writeD(clan.getTotalDevelopmentPoints()); // Total development points packet.writeD(16); // Mastery count @@ -56,8 +54,7 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket { final int id = mastery.getId(); packet.writeD(id); // Mastery - packet.writeD(0x00); // ? - + packet.writeD(0); // ? boolean available = true; if (clan.getLevel() < mastery.getClanLevel()) { @@ -76,11 +73,9 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket available = clan.hasMastery(previous); } } - - packet.writeC(clan.hasMastery(id) ? 0x02 : available ? 0x01 : 0x00); // Availability. + packet.writeC(clan.hasMastery(id) ? 2 : available ? 1 : 0); // Availability. } } - return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java index d31a014aea..568aa70f70 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java @@ -46,15 +46,12 @@ public class ExPledgeMissionInfo implements IClientOutgoingPacket { return true; } - OutgoingPackets.EX_PLEDGE_MISSION_INFO.writeId(packet); - packet.writeD(_rewards.size()); for (DailyMissionDataHolder reward : _rewards) { int progress = reward.getProgress(_player); int status = reward.getStatus(_player); - // TODO: Figure out this. if (reward.isLevelUpMission()) { @@ -76,12 +73,10 @@ public class ExPledgeMissionInfo implements IClientOutgoingPacket { status = 2; } - packet.writeD(reward.getId()); packet.writeD(progress); packet.writeC(status); } - return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java index ce1d6327e7..604181c6ed 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java @@ -41,10 +41,8 @@ public class ExPledgeMissionRewardCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_MISSION_REWARD_COUNT.writeId(packet); - packet.writeD(Math.min(_availableMissionsCount, _doneMissionsCount)); // Received missions rewards. packet.writeD(_availableMissionsCount); // Available missions rewards. 18 - for noble, 20 - for honnorable noble. - return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java index e59ebcfaab..22cf060348 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java @@ -43,7 +43,6 @@ public class ExPledgeShowInfoUpdate extends AbstractItemPacket { return false; } - OutgoingPackets.EX_PLEDGE_SHOW_INFO_UPDATE.writeId(packet); packet.writeD(clan.getId()); // Clan ID packet.writeD(ClanLevelData.getLevelRequirement(clan.getLevel())); // Next level cost diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index fb735b8925..e75426e598 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -69,7 +69,6 @@ public class ExBRBuyProduct implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUY_PRODUCT.writeId(packet); - packet.writeD(_reply); return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java index 742b3eba9d..91a186b81d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java @@ -39,10 +39,9 @@ public class ExBRGamePoint implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_GAME_POINT.writeId(packet); - packet.writeD(_charId); packet.writeQ(_charPoints); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java index 50f21df46a..e36f2ff502 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java @@ -45,7 +45,6 @@ public class ExBRProductInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_INFO.writeId(packet); - packet.writeD(_item.getBrId()); packet.writeD(_item.getPrice()); packet.writeD(_item.getItems().size()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java index dc851ffd43..0f042ba043 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java @@ -45,9 +45,8 @@ public class ExBRProductList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); // Adena - packet.writeQ(0x00); // Hero coins + packet.writeQ(0); // Hero coins packet.writeC(_type); // Type 0 - Home, 1 - History, 2 - Favorites packet.writeD(_primeList.size()); for (PrimeShopGroup brItem : _primeList) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java index b23e9fa8a9..f4406c1407 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java @@ -38,7 +38,6 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RAID_BOSS_SPAWN_INFO.writeId(packet); - packet.writeD(_bossIds.size()); // alive count for (int id : _bossIds) // alive ids { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java index 2463589c81..c09b3e899d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java @@ -47,18 +47,15 @@ public class ExFlyMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_mapId); - packet.writeD(_locations.size()); for (SayuneEntry loc : _locations) { packet.writeD(loc.getId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(loc.getX()); packet.writeD(loc.getY()); packet.writeD(loc.getZ()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java index 03fc6b580d..70b3fb25d2 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java @@ -47,16 +47,13 @@ public class ExFlyMoveBroadcast implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE_BROADCAST.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); packet.writeD(_mapId); - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD(_currentLoc.getX()); packet.writeD(_currentLoc.getY()); packet.writeD(_currentLoc.getZ()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java index cfe11a27e0..49e5d86910 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java @@ -35,7 +35,6 @@ public class ExNotifyFlyMoveStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_FLY_MOVE_START.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java index d5640a47ef..0efa37ae8c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java @@ -51,7 +51,6 @@ public class ExMoveToLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_SUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_targetX); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java index 0cbe2c3e02..a0314c39aa 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java @@ -46,7 +46,6 @@ public class ExShuttleGetOff implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_OFF.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_x); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java index 5211bef5ba..061bcafed9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java @@ -43,7 +43,6 @@ public class ExShuttleGetOn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_ON.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java index 97d54a9019..c8aee1fde7 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java @@ -43,7 +43,6 @@ public class ExShuttleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHUTTLE_INFO.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD(_shuttle.getX()); packet.writeD(_shuttle.getY()); @@ -60,8 +59,8 @@ public class ExShuttleInfo implements IClientOutgoingPacket packet.writeD(loc.getY()); packet.writeD(loc.getZ()); } - packet.writeD(stop.isDoorOpen() ? 0x01 : 0x00); - packet.writeD(stop.hasDoorChanged() ? 0x01 : 0x00); + packet.writeD(stop.isDoorOpen() ? 1 : 0); + packet.writeD(stop.hasDoorChanged() ? 1 : 0); } return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java index 6ba38f29a1..28b33b998e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java @@ -43,7 +43,6 @@ public class ExShuttleMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_MOVE.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD((int) _shuttle.getStat().getMoveSpeed()); packet.writeD((int) _shuttle.getStat().getRotationSpeed()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java index bf2b6ea6eb..6c31189d6a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java @@ -44,7 +44,6 @@ public class ExStopMoveInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_SHUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java index f7f6849732..8492f42a6e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java @@ -44,7 +44,6 @@ public class ExValidateLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_SHUTTLE.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java index 1d59c6d002..e7654ed911 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java @@ -60,7 +60,7 @@ public class AccountKicked implements IOutgoingPacket { OutgoingPackets.ACCOUNT_KICKED.writeId(packet); packet.writeD(_reason.getCode()); - return true; } } + diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 2e3a1f6163..1fe813e393 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: response + * Format: d d: response */ public class GGAuth implements IOutgoingPacket { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/network/serverpackets/Init.java index 4b3f71f30e..d725f45ca2 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/network/serverpackets/Init.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/network/serverpackets/Init.java @@ -52,7 +52,6 @@ public class Init implements IOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.INIT.writeId(packet); - packet.writeD(_sessionId); // session id packet.writeD(0x0000c621); // protocol revision diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index 8c534554a8..f4dcd22b00 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: the failure reason + * Format: d d: the failure reason */ public class LoginFail implements IOutgoingPacket { diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index c700328f3d..f8b05abb47 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -529,7 +529,7 @@ public class Lindvior extends AbstractNpcAI for (Location loc : CONTROL_GENERATOR_SPAWNS) { guard = (FriendlyNpc) addSpawn(NPC_GENERATOR, loc, true); - guard.setDisplayEffect(0x01); + guard.setDisplayEffect(1); guard.setScriptValue(i++); _generatorSpawn.add(guard); } @@ -685,7 +685,7 @@ public class Lindvior extends AbstractNpcAI if (!hasFlag(_activeMask, 1 << index)) { _activeMask |= 1 << index; - npc.setDisplayEffect(0x02); + npc.setDisplayEffect(2); sendEventTrigger(true, GENERATOR_TRIGERS[index]); _zoneLair.getPlayersInside().stream().forEach(p -> p.broadcastPacket(new Earthquake(p.getX(), p.getY(), p.getZ(), 20, 10))); if (hasFlag(_activeMask, 0xf)) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/BaseRecievePacket.java index c682cb741d..a6ed15ce32 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/BaseRecievePacket.java @@ -73,7 +73,7 @@ public abstract class BaseRecievePacket try { result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE); - result = result.substring(0, result.indexOf(0x00)); + result = result.substring(0, result.indexOf(0)); _off += (result.length() * 2) + 2; } catch (Exception e) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/BaseSendablePacket.java index a9d918de4c..8fa8491cbf 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/commons/network/BaseSendablePacket.java @@ -117,16 +117,16 @@ public abstract class BaseSendablePacket public byte[] getBytes() { // if (this instanceof Init) - // writeD(0x00); // reserve for XOR initial key + // writeD(0); // reserve for XOR initial key - writeD(0x00); // reserve for checksum + writeD(0); // reserve for checksum final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++) { - writeC(0x00); + writeC(0); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/AttackType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/AttackType.java index 6064b10ed7..e9983f15e3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/AttackType.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/AttackType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum AttackType { - MISSED(0x01), - BLOCKED(0x02), - CRITICAL(0x04), - SHOT_USED(0x08); + MISSED(1), + BLOCKED(2), + CRITICAL(4), + SHOT_USED(8); private final int _mask; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/GroupType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/GroupType.java index 954aaace8b..916a14fd05 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/GroupType.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/GroupType.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum GroupType implements IUpdateTypeComponent { - NONE(0x01), - PARTY(0x02), - COMMAND_CHANNEL(0x04); + NONE(1), + PARTY(2), + COMMAND_CHANNEL(4); private int _mask; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/ItemListType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/ItemListType.java index 2d38c8f5b1..c80234439f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/ItemListType.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/ItemListType.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum ItemListType implements IUpdateTypeComponent { - AUGMENT_BONUS(0x01), - ELEMENTAL_ATTRIBUTE(0x02), - ENCHANT_EFFECT(0x04), - VISUAL_ID(0x08), - SOUL_CRYSTAL(0x10); + AUGMENT_BONUS(1), + ELEMENTAL_ATTRIBUTE(2), + ENCHANT_EFFECT(4), + VISUAL_ID(8), + SOUL_CRYSTAL(16); private final int _mask; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java index b3d08596c6..29403b783d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum MacroUpdateType { - ADD(0x01), - LIST(0x01), - MODIFY(0x02), - DELETE(0x00); + ADD(1), + LIST(1), + MODIFY(2), + DELETE(0); private final int _id; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java index 86c6159869..7776721c0f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java @@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum PartySmallWindowUpdateType implements IUpdateTypeComponent { - CURRENT_CP(0x01), - MAX_CP(0x02), - CURRENT_HP(0x04), - MAX_HP(0x08), - CURRENT_MP(0x10), - MAX_MP(0x20), - LEVEL(0x40), - CLASS_ID(0x80), - PARTY_SUBSTITUTE(0x100), - VITALITY_POINTS(0x200); + CURRENT_CP(1), + MAX_CP(2), + CURRENT_HP(4), + MAX_HP(8), + CURRENT_MP(16), + MAX_MP(32), + LEVEL(64), + CLASS_ID(128), + PARTY_SUBSTITUTE(256), + VITALITY_POINTS(512); private final int _mask; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 00bb331778..667ce7f17c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.Broadcast; import org.l2jmobius.gameserver.util.Util; /** - * Fromat:(ch) dddddc + * Format:(ch) dddddc * @author -Wooden- */ public class RequestExMagicSkillUseGround implements IClientIncomingPacket diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java index ec60042793..6054868de7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java @@ -39,7 +39,6 @@ public class AbnormalStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ABNORMAL_STATUS_UPDATE.writeId(packet); - packet.writeH(_effects.size()); for (BuffInfo info : _effects) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 1b8ddb2042..bec794bef3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -44,7 +44,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; } @@ -60,7 +59,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; setHtml(html); } @@ -77,13 +75,11 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } - if (!html.contains(""; return; } - _html = html; } @@ -96,7 +92,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } - setHtml(content); return true; } @@ -138,12 +133,10 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { player.clearHtmlActions(getScope()); } - if (_disabledValidation) { return; } - if (player != null) { Util.buildHtmlActionCache(player, getScope(), _npcObjId, _html); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index e9cd6a88b8..b99d4d3348 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -86,8 +86,8 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket= 0) || (item.getAttributeDefence(AttributeType.FIRE) > 0) || (item.getAttributeDefence(AttributeType.WATER) > 0) || (item.getAttributeDefence(AttributeType.WIND) > 0) || (item.getAttributeDefence(AttributeType.EARTH) > 0) || (item.getAttributeDefence(AttributeType.HOLY) > 0) || (item.getAttributeDefence(AttributeType.DARK) > 0)) { mask |= ItemListType.ELEMENTAL_ATTRIBUTE.getMask(); } - if (item.getEnchantOptions() != null) { for (int id : item.getEnchantOptions()) @@ -184,17 +182,14 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket 0) { mask |= ItemListType.VISUAL_ID.getMask(); } - if (((item.getSoulCrystalOptions() != null) && !item.getSoulCrystalOptions().isEmpty()) || ((item.getSoulCrystalSpecialOptions() != null) && !item.getSoulCrystalSpecialOptions().isEmpty())) { mask |= ItemListType.SOUL_CRYSTAL.getMask(); } - return mask; } @@ -262,7 +257,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); packet.writeC(removeSkills.size()); for (Skill removed : removeSkills) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java index 8fa6259f64..6451dffd02 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ActionFailed implements IClientOutgoingPacket { public static final ActionFailed STATIC_PACKET = new ActionFailed(); - private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); + private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); static { for (SkillCastingType castingType : SkillCastingType.values()) @@ -57,7 +57,6 @@ public class ActionFailed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ACTION_FAIL.writeId(packet); - packet.writeD(_castingType); // MagicSkillUse castingType return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java index 6e868368c9..30ce58da60 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java @@ -44,9 +44,8 @@ public class AgitDecoInfo implements IClientOutgoingPacket { continue; } - packet.writeC(_residense.hasFunction(type) ? 0x01 : 0x00); + packet.writeC(_residense.hasFunction(type) ? 1 : 0); } - // Unknown packet.writeD(0); // TODO: Find me! packet.writeD(0); // TODO: Find me! diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java index 6cb71fc985..4683fb30f0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java @@ -44,7 +44,6 @@ public class AllianceInfo implements IClientOutgoingPacket _name = leader.getAllyName(); _leaderC = leader.getName(); _leaderP = leader.getLeaderName(); - final Collection allies = ClanTable.getInstance().getClanAllies(allianceId); _allies = new ClanInfo[allies.size()]; int idx = 0; @@ -57,7 +56,6 @@ public class AllianceInfo implements IClientOutgoingPacket total += ci.getTotal(); online += ci.getOnline(); } - _total = total; _online = online; } @@ -66,18 +64,16 @@ public class AllianceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_INFO.writeId(packet); - packet.writeS(_name); packet.writeD(_total); packet.writeD(_online); packet.writeS(_leaderC); packet.writeS(_leaderP); - packet.writeD(_allies.length); for (ClanInfo aci : _allies) { packet.writeS(aci.getClan().getName()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(aci.getClan().getLevel()); packet.writeS(aci.getClan().getLeaderName()); packet.writeD(aci.getTotal()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java index f9d08f6600..186fd12e81 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java @@ -44,7 +44,6 @@ public class AllyCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java index 6218f1717f..1ae4653f91 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java @@ -38,7 +38,6 @@ public class AskJoinAlly implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_ALLIANCE.writeId(packet); - packet.writeD(_requestorObjId); packet.writeS(null); // Ally Name ? packet.writeS(null); // TODO: Find me! diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java index a66bb3cd33..b9cfbe81b9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java @@ -39,7 +39,6 @@ public class AskJoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_PARTY.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 05c420ff59..227ab571be 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -45,7 +45,6 @@ public class Attack implements IClientOutgoingPacket _attackerObjId = attacker.getObjectId(); _attackerLoc = new Location(attacker); _targetLoc = new Location(target); - final Player player = attacker.getActingPlayer(); if (player == null) { @@ -111,7 +110,6 @@ public class Attack implements IClientOutgoingPacket final Iterator it = _hits.iterator(); final Hit firstHit = it.next(); OutgoingPackets.ATTACK.writeId(packet); - packet.writeD(_attackerObjId); packet.writeD(firstHit.getTargetId()); packet.writeD(_soulshotVisualSubstitute); // Ertheia @@ -121,13 +119,11 @@ public class Attack implements IClientOutgoingPacket packet.writeD(_attackerLoc.getX()); packet.writeD(_attackerLoc.getY()); packet.writeD(_attackerLoc.getZ()); - packet.writeH(_hits.size() - 1); while (it.hasNext()) { writeHit(packet, it.next()); } - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java index bd6878eb42..8b85fe85e3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java @@ -35,7 +35,6 @@ public class AutoAttackStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_START.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java index e767d1877a..a294b1e212 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java @@ -35,7 +35,6 @@ public class AutoAttackStop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_STOP.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java index 3f329415df..0c79677eae 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java @@ -38,7 +38,6 @@ public class BlockListPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BLOCK_LIST.writeId(packet); - packet.writeD(_playersId.size()); for (int playerId : _playersId) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index f610cdc6aa..d95f0543b9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -45,8 +45,7 @@ public class BuyList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x00); // Type BUY + packet.writeD(0); // Type BUY packet.writeQ(_money); // current money packet.writeD(_listId); packet.writeD(_inventorySlots); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index cd25af908d..7cb2bf4425 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -50,36 +50,34 @@ public class BuyListSeed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BUY_LIST_SEED.writeId(packet); - packet.writeQ(_money); // current money - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeD(_manorId); // manor id - if (!_list.isEmpty()) { packet.writeH(_list.size()); // list length for (SeedProduction s : _list) { - packet.writeC(0x00); // mask item 0 to print minimal item information + packet.writeC(0); // mask item 0 to print minimal item information packet.writeD(s.getId()); // ObjectId packet.writeD(s.getId()); // ItemId packet.writeC(0xFF); // T1 packet.writeQ(s.getAmount()); // Quantity - packet.writeC(0x05); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item - packet.writeC(0x00); // Filler (always 0) - packet.writeH(0x00); // Equipped : 00-No, 01-yes - packet.writeQ(0x00); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand - packet.writeH(0x00); // Enchant level (pet level shown in control item) + packet.writeC(5); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item + packet.writeC(0); // Filler (always 0) + packet.writeH(0); // Equipped : 00-No, 01-yes + packet.writeQ(0); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand + packet.writeH(0); // Enchant level (pet level shown in control item) packet.writeD(-1); packet.writeD(-9999); - packet.writeC(0x01); // GOD Item enabled = 1 disabled (red) = 0 + packet.writeC(1); // GOD Item enabled = 1 disabled (red) = 0 packet.writeQ(s.getPrice()); // price } _list.clear(); } else { - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java index 3a7b67af23..f3dc872dca 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java @@ -32,8 +32,7 @@ public class CSShowComBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - - packet.writeC(0x01); // c4 1 to show community 00 to hide + packet.writeC(1); // c4 1 to show community 00 to hide packet.writeB(_html); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java index eacc27aa07..b18dac4cc3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java @@ -36,7 +36,6 @@ public class CameraMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CAMERA_MODE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java index 1682f5bc62..adea754676 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java @@ -39,7 +39,6 @@ public class ChairSit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAIR_SIT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_staticObjectId); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java index 2bc31a285a..de141fa067 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java @@ -38,7 +38,6 @@ public class ChangeMoveType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_MOVE_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_running ? RUN : WALK); packet.writeD(0); // c2 diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index 73277d923d..fbe5e39e2e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -22,17 +22,17 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ChangeWaitType implements IClientOutgoingPacket { + public static final int WT_SITTING = 0; + public static final int WT_STANDING = 1; + public static final int WT_START_FAKEDEATH = 2; + public static final int WT_STOP_FAKEDEATH = 3; + private final int _objectId; private final int _moveType; private final int _x; private final int _y; private final int _z; - public static final int WT_SITTING = 0; - public static final int WT_STANDING = 1; - public static final int WT_START_FAKEDEATH = 2; - public static final int WT_STOP_FAKEDEATH = 3; - public ChangeWaitType(Creature creature, int newMoveType) { _objectId = creature.getObjectId(); @@ -46,7 +46,6 @@ public class ChangeWaitType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_WAIT_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_moveType); packet.writeD(_x); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index 41180bac50..aa2e7b2eaa 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -30,7 +30,6 @@ public class CharCreateFail implements IClientOutgoingPacket public static final int REASON_CREATE_NOT_ALLOWED = 0x05; // "Characters cannot be created from this server." public static final int REASON_CHOOSE_ANOTHER_SVR = 0x06; // "Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please // choose another server." - private final int _error; public CharCreateFail(int errorCode) @@ -42,7 +41,6 @@ public class CharCreateFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index f0e99885ad..768617e558 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -31,8 +31,7 @@ public class CharCreateOk implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_SUCCESS.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index bed289ca0a..1674eef343 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -33,7 +33,6 @@ public class CharDeleteFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_DELETE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 95a808c69e..5311ae5093 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -33,6 +33,22 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { + private static final int[] PAPERDOLL_ORDER = new int[] + { + Inventory.PAPERDOLL_UNDER, + Inventory.PAPERDOLL_HEAD, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_LHAND, + Inventory.PAPERDOLL_GLOVES, + Inventory.PAPERDOLL_CHEST, + Inventory.PAPERDOLL_LEGS, + Inventory.PAPERDOLL_FEET, + Inventory.PAPERDOLL_CLOAK, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_HAIR, + Inventory.PAPERDOLL_HAIR2 + }; + private final Player _player; private final Clan _clan; private int _objId; @@ -55,22 +71,6 @@ public class CharInfo implements IClientOutgoingPacket private int _vehicleId = 0; private final boolean _gmSeeInvis; - private static final int[] PAPERDOLL_ORDER = new int[] - { - Inventory.PAPERDOLL_UNDER, - Inventory.PAPERDOLL_HEAD, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_LHAND, - Inventory.PAPERDOLL_GLOVES, - Inventory.PAPERDOLL_CHEST, - Inventory.PAPERDOLL_LEGS, - Inventory.PAPERDOLL_FEET, - Inventory.PAPERDOLL_CLOAK, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_HAIR, - Inventory.PAPERDOLL_HAIR2 - }; - public CharInfo(Player player, boolean gmSeeInvis) { _player = player; @@ -119,16 +119,15 @@ public class CharInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); // Confirmed packet.writeD(_y); // Confirmed packet.writeD(_z); // Confirmed packet.writeD(_vehicleId); // Confirmed packet.writeD(_objId); // Confirmed packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed - packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) @@ -152,10 +151,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.getPvpFlag()); packet.writeD(_player.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -166,53 +163,40 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); - packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeS(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle()); - packet.writeD(_player.getAppearance().getVisibleClanId()); packet.writeD(_player.getAppearance().getVisibleClanCrestId()); packet.writeD(_player.getAppearance().getVisibleAllyId()); packet.writeD(_player.getAppearance().getVisibleAllyCrestId()); - - packet.writeC(_player.isSitting() ? 0x00 : 0x01); // Confirmed - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // Confirmed - packet.writeC(_player.isInCombat() ? 0x01 : 0x00); // Confirmed - - packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 0x01 : 0x00); // Confirmed - - packet.writeC(_player.isInvisible() ? 0x01 : 0x00); - + packet.writeC(_player.isSitting() ? 0 : 1); // Confirmed + packet.writeC(_player.isRunning() ? 1 : 0); // Confirmed + packet.writeC(_player.isInCombat() ? 1 : 0); // Confirmed + packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 1 : 0); // Confirmed + packet.writeC(_player.isInvisible() ? 1 : 0); packet.writeC(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount packet.writeC(_player.getPrivateStoreType().getId()); // Confirmed packet.writeH(_player.getCubics().size()); // Confirmed _player.getCubics().keySet().forEach(packet::writeH); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); // Confirmed packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); packet.writeH(_player.getRecomHave()); // Confirmed packet.writeD(_player.getMountNpcId() == 0 ? 0 : _player.getMountNpcId() + 1000000); - packet.writeD(_player.getClassId().getId()); // Confirmed - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeC(_player.isMounted() ? 0 : _enchantLevel); // Confirmed - packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeD(_player.getClanCrestLargeId()); packet.writeC(_player.getNobleLevel()); // Confirmed packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 2 : 0); // 152 - Value for enabled changed to 2? packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed - final ILocational baitLocation = _player.getFishing().getBaitLocation(); if (baitLocation != null) { @@ -228,29 +212,21 @@ public class CharInfo implements IClientOutgoingPacket } packet.writeD(_player.getAppearance().getNameColor()); // Confirmed - packet.writeD(_heading); // Confirmed - packet.writeC(_player.getPledgeClass()); packet.writeH(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); // Confirmed - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - - packet.writeC(0x00); // nPvPRestrainStatus - + packet.writeC(0); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentHp())); // Confirmed packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - - packet.writeC(0x00); // cBRLectureMark + packet.writeC(0); // cBRLectureMark final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed @@ -262,8 +238,9 @@ public class CharInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } + packet.writeC(_player.isTrueHero() ? 100 : 0); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); // Hair accessory + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); // Hair accessory packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 7187b73184..11f5f4df52 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -40,17 +40,16 @@ public class CharSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTED.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getTitle()); packet.writeD(_sessionId); packet.writeD(_player.getClanId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x01); // active ?? + packet.writeD(1); // active ?? packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -62,25 +61,20 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_player.getReputation()); packet.writeD(_player.getPkKills()); packet.writeD(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_player.getClassId().getId()); - packet.writeB(new byte[16]); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeB(new byte[28]); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 88a0e7803b..815217150e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -45,10 +45,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { private static final Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); - private final String _loginName; - private final int _sessionId; - private int _activeId; - private final List _characterPackages; private static final int[] PAPERDOLL_ORDER = new int[] { @@ -113,7 +109,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_ARTIFACT20, // 152 Inventory.PAPERDOLL_ARTIFACT21 // 152 }; - private static final int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, @@ -127,6 +122,11 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_HAIR2, }; + private final String _loginName; + private final int _sessionId; + private int _activeId; + private final List _characterPackages; + /** * Constructor for CharSelectionInfo. * @param loginName @@ -157,16 +157,13 @@ public class CharSelectionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.size(); packet.writeD(size); // Created character count - packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) - packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 0x01 : 0x00); // if 1 can't create new char - packet.writeC(0x01); // 0=can't play, 1=can play free until level 85, 2=100% free play - packet.writeD(0x02); // if 1, Korean client - packet.writeC(0x00); // Gift message for inactive accounts // 152 - + packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 1 : 0); // if 1 can't create new char + packet.writeC(1); // 0=can't play, 1=can play free until level 85, 2=100% free play + packet.writeD(2); // if 1, Korean client + packet.writeC(0); // Gift message for inactive accounts // 152 // Balthus Knights if (Config.BALTHUS_KNIGHTS_ENABLED) { @@ -175,23 +172,22 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (Config.PREMIUM_SYSTEM_ENABLED) { PremiumManager.getInstance().loadPremiumData(_loginName); - packet.writeC(PremiumManager.getInstance().getPremiumExpiration(_loginName) > 0 ? 0x01 : 0x00); + packet.writeC(PremiumManager.getInstance().getPremiumExpiration(_loginName) > 0 ? 1 : 0); } else { - packet.writeC(0x00); + packet.writeC(0); } } else { - packet.writeC(0x01); + packet.writeC(1); } } else { - packet.writeC(0x00); + packet.writeC(0); } - long lastAccess = 0; if (_activeId == -1) { @@ -204,7 +200,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - for (int i = 0; i < size; i++) { final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); @@ -212,89 +207,72 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name packet.writeD(_sessionId); // Account ID - packet.writeD(0x00); // Clan ID - packet.writeD(0x00); // Builder level - + packet.writeD(0); // Clan ID + packet.writeD(0); // Builder level packet.writeD(charInfoPackage.getSex()); // Sex packet.writeD(charInfoPackage.getRace()); // Race packet.writeD(charInfoPackage.getBaseClassId()); - - packet.writeD(0x01); // GameServerName - + packet.writeD(1); // GameServerName packet.writeD(charInfoPackage.getX()); packet.writeD(charInfoPackage.getY()); packet.writeD(charInfoPackage.getZ()); packet.writeF(charInfoPackage.getCurrentHp()); packet.writeF(charInfoPackage.getCurrentMp()); - packet.writeQ(charInfoPackage.getSp()); packet.writeQ(charInfoPackage.getExp()); packet.writeF((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel()))); packet.writeD(charInfoPackage.getLevel()); - packet.writeD(charInfoPackage.getReputation()); packet.writeD(charInfoPackage.getPkKills()); packet.writeD(charInfoPackage.getPvPKills()); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); // Ertheia - packet.writeD(0x00); // Ertheia - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); // Ertheia + packet.writeD(0); // Ertheia for (int slot : getPaperdollOrder()) { packet.writeD(charInfoPackage.getPaperdollItemId(slot)); } - for (int slot : getPaperdollOrderVisualId()) { packet.writeD(charInfoPackage.getPaperdollItemVisualId(slot)); } - packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_CHEST)); // Upper Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_LEGS)); // Lower Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_HEAD)); // Headgear enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_GLOVES)); // Gloves enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_FEET)); // Boots enchant level - packet.writeD(charInfoPackage.getHairStyle()); packet.writeD(charInfoPackage.getHairColor()); packet.writeD(charInfoPackage.getFace()); - packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); - packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption1Id() : 0); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption2Id() : 0); - // packet.writeD(charInfoPackage.getTransformId()); // Used to display Transformations - packet.writeD(0x00); // Currently on retail when you are on character select you don't see your transformation. - - packet.writeD(0x00); // Pet NpcId - packet.writeD(0x00); // Pet level - packet.writeD(0x00); // Pet Food - packet.writeD(0x00); // Pet Food Level - packet.writeF(0x00); // Current pet HP - packet.writeF(0x00); // Current pet MP - + packet.writeD(0); // Currently on retail when you are on character select you don't see your transformation. + packet.writeD(0); // Pet NpcId + packet.writeD(0); // Pet level + packet.writeD(0); // Pet Food + packet.writeD(0); // Pet Food Level + packet.writeF(0); // Current pet HP + packet.writeF(0); // Current pet MP packet.writeD(charInfoPackage.getVitalityPoints()); // Vitality packet.writeD((int) Config.RATE_VITALITY_EXP_MULTIPLIER * 100); // Vitality Percent packet.writeD(charInfoPackage.getVitalityItemsUsed()); // Remaining vitality item uses - packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0x00 : 0x01); // Char is active or not - packet.writeC(charInfoPackage.isNoble() ? 0x01 : 0x00); - packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 0x02 : 0x00); // Hero glow - packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 0x01 : 0x00); // Show hair accessory if enabled + packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0 : 1); // Char is active or not + packet.writeC(charInfoPackage.isNoble() ? 1 : 0); + packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 2 : 0); // Hero glow + packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 1 : 0); // Show hair accessory if enabled } return true; } @@ -303,7 +281,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); - try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate")) { @@ -316,7 +293,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (charInfopackage != null) { characterList.add(charInfopackage); - final Player player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { @@ -330,7 +306,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return characterList; } @@ -372,7 +347,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { clan.removeClanMember(objectId, 0); } - GameClient.deleteCharByObjId(objectId); return null; } @@ -391,20 +365,16 @@ public class CharSelectionInfo implements IClientOutgoingPacket charInfopackage.setHairStyle(chardata.getInt("hairstyle")); charInfopackage.setHairColor(chardata.getInt("haircolor")); charInfopackage.setSex(chardata.getInt("sex")); - charInfopackage.setExp(chardata.getLong("exp")); charInfopackage.setSp(chardata.getLong("sp")); charInfopackage.setVitalityPoints(chardata.getInt("vitality_points")); charInfopackage.setClanId(chardata.getInt("clanid")); - charInfopackage.setRace(chardata.getInt("race")); - final int baseClassId = chardata.getInt("base_class"); final int activeClassId = chardata.getInt("classid"); charInfopackage.setX(chardata.getInt("x")); charInfopackage.setY(chardata.getInt("y")); charInfopackage.setZ(chardata.getInt("z")); - final int faction = chardata.getInt("faction"); if (faction == 1) { @@ -414,7 +384,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setEvil(); } - if (Config.MULTILANG_ENABLE) { String lang = chardata.getString("language"); @@ -424,22 +393,18 @@ public class CharSelectionInfo implements IClientOutgoingPacket } charInfopackage.setHtmlPrefix("data/lang/" + lang + "/"); } - // if is in subclass, load subclass exp, sp, level info if (baseClassId != activeClassId) { loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId); } - charInfopackage.setClassId(activeClassId); - // Get the augmentation id for equipped weapon int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); if (weaponObjId < 1) { weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); } - if (weaponObjId > 0) { try (Connection con = DatabaseFactory.getConnection(); @@ -465,7 +430,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } - // Check if the base class is set to zero and also doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly. if ((baseClassId == 0) && (activeClassId > 0)) { @@ -475,7 +439,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setBaseClassId(baseClassId); } - charInfopackage.setDeleteTimer(deletetime); charInfopackage.setLastAccess(chardata.getLong("lastAccess")); charInfopackage.setNoble(chardata.getInt("nobless") == 1); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java index 847e24db87..d59df7911a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java @@ -32,7 +32,6 @@ public class ChooseInventoryItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHOOSE_INVENTORY_ITEM.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java index 12a3940521..ac66c2fa0f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java @@ -32,7 +32,6 @@ public class ClientSetTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CLIENT_SET_TIME.writeId(packet); - packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // time in client minutes packet.writeD(6); // constant to match the server time( this determines the speed of the client clock) return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java index 195824578b..5fdb62f544 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java @@ -68,7 +68,6 @@ public class ConfirmDlg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CONFIRM_DLG.writeId(packet); - final SMParam[] params = _systemMessage.getParams(); packet.writeD(_systemMessage.getId()); packet.writeD(params.length); @@ -130,7 +129,6 @@ public class ConfirmDlg implements IClientOutgoingPacket } } } - packet.writeD(_time); packet.writeD(_requesterId); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 2a98428740..85d5630327 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -71,7 +71,6 @@ public class CreatureSay implements IClientOutgoingPacket _mask |= 0x08; } } - // Does not shows level if (sender.isGM()) { @@ -123,7 +122,6 @@ public class CreatureSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_sender == null ? 0 : _sender.getObjectId()); packet.writeD(_chatType.getClientId()); if (_senderName != null) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index dfc40d995f..a307b06e4b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -38,9 +38,8 @@ public class DeleteObject implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DELETE_OBJECT.writeId(packet); - packet.writeD(_objectId); - packet.writeC(0x00); // c2 + packet.writeC(0); // c2 return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java index 982c8f3311..3b5917e55b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java @@ -50,7 +50,6 @@ public class Dice implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DICE.writeId(packet); - packet.writeD(_objectId); // object id of player packet.writeD(_itemId); // item id of dice (spade) 4625,4626,4627,4628 packet.writeD(_number); // number rolled diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 3d741a86a6..ebc93d0fc4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -68,7 +68,6 @@ public class Die implements IClientOutgoingPacket siegeClan = fort.getSiege().getAttackerClan(clan); isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan); } - _toVillage = creature.canRevive() && !creature.isPendingRevive(); _toClanHall = (clan != null) && (clan.getHideoutId() > 0); _toCastle = ((clan != null) && (clan.getCastleId() > 0)) || isInCastleDefense; @@ -76,7 +75,6 @@ public class Die implements IClientOutgoingPacket _useFeather = creature.getAccessLevel().allowFixedRes() || creature.getInventory().haveItemForSelfResurrection(); _toFortress = ((clan != null) && (clan.getFortId() > 0)) || isInFortDefense; } - _isSweepable = creature.isAttackable() && creature.isSweepActive(); } @@ -91,7 +89,6 @@ public class Die implements IClientOutgoingPacket { _items = new ArrayList<>(8); } - if (_items.size() < 8) { _items.add(itemId); @@ -116,20 +113,18 @@ public class Die implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DIE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_toVillage ? 0x01 : 0x00); - packet.writeD(_toClanHall ? 0x01 : 0x00); - packet.writeD(_toCastle ? 0x01 : 0x00); - packet.writeD(_toOutpost ? 0x01 : 0x00); - packet.writeD(_isSweepable ? 0x01 : 0x00); - packet.writeD(_useFeather ? 0x01 : 0x00); - packet.writeD(_toFortress ? 0x01 : 0x00); - packet.writeD(0x00); // Disables use Feather button for X seconds - packet.writeD(0x00); // Adventure's Song - packet.writeC(_hideAnimation ? 0x01 : 0x00); - - packet.writeD(_itemsEnabled ? 0x01 : 0x00); + packet.writeD(_toVillage ? 1 : 0); + packet.writeD(_toClanHall ? 1 : 0); + packet.writeD(_toCastle ? 1 : 0); + packet.writeD(_toOutpost ? 1 : 0); + packet.writeD(_isSweepable ? 1 : 0); + packet.writeD(_useFeather ? 1 : 0); + packet.writeD(_toFortress ? 1 : 0); + packet.writeD(0); // Disables use Feather button for X seconds + packet.writeD(0); // Adventure's Song + packet.writeC(_hideAnimation ? 1 : 0); + packet.writeD(_itemsEnabled ? 1 : 0); packet.writeD(getItems().size()); getItems().forEach(packet::writeD); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java index 15404f9dee..5837faec19 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java @@ -33,7 +33,6 @@ public class DoorInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_INFO.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.getId()); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java index 54f8742a73..14d41afee7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java @@ -33,7 +33,6 @@ public class DoorStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_STATUS_UPDATE.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.isOpen() ? 0 : 1); packet.writeD(_door.getDamage()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index b12458e719..3035890956 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -40,20 +40,17 @@ public class DropItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DROP_ITEM.writeId(packet); - packet.writeD(_objectId); packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeC(_item.isStackable() ? 0x01 : 0x00); + packet.writeC(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - - packet.writeC(0x00); - // packet.writeD(0x01); if above C == true (1) then packet.readD() + packet.writeC(0); + // packet.writeD(1); if above C == true (1) then packet.readD() packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java index 631c43ba0c..99bd80d97e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java @@ -62,13 +62,12 @@ public class Earthquake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EARTHQUAKE.writeId(packet); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_intensity); packet.writeD(_duration); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 6063a54535..1a8b8ddfbb 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -59,25 +59,20 @@ public class EnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_crystal); packet.writeQ(_count); - // Guessing. // With 166 options became 3x write integers instead of shorts and enchant level moved bellow. - // Commenting until actually knowing. // for (int option : _enchantOptions) // { // packet.writeD(option); // } - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_enchantLevel); // Confirmed. - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java index 837be1f5e3..169410245b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java @@ -41,7 +41,6 @@ public class EtcStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ETC_STATUS_UPDATE.writeId(packet); - packet.writeC(_player.getCharges()); // 1-7 increase force, level packet.writeD(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%) packet.writeC(_player.getExpertiseWeaponPenalty()); // Weapon Grade Penalty [1-4] diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java index 5dca90f960..9f8d576148 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java @@ -24,13 +24,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class Ex2ndPasswordAck implements IClientOutgoingPacket { + // TODO: Enum + public static final int SUCCESS = 0; + public static final int WRONG_PATTERN = 1; + private final int _status; private final int _response; - // TODO: Enum - public static final int SUCCESS = 0x00; - public static final int WRONG_PATTERN = 0x01; - public Ex2ndPasswordAck(int status, int response) { _status = status; @@ -41,10 +41,9 @@ public class Ex2ndPasswordAck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_ACK.writeId(packet); - packet.writeC(_status); - packet.writeD(_response == WRONG_PATTERN ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(_response == WRONG_PATTERN ? 1 : 0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java index 48bde5161d..c86b5185d0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordCheck implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_NEW = 0x00; - public static final int PASSWORD_PROMPT = 0x01; - public static final int PASSWORD_OK = 0x02; + public static final int PASSWORD_NEW = 0; + public static final int PASSWORD_PROMPT = 1; + public static final int PASSWORD_OK = 2; private final int _windowType; @@ -40,9 +40,8 @@ public class Ex2ndPasswordCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_CHECK.writeId(packet); - packet.writeD(_windowType); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java index 1abf50ab01..f6731bf18f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordVerify implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_OK = 0x00; - public static final int PASSWORD_WRONG = 0x01; - public static final int PASSWORD_BAN = 0x02; + public static final int PASSWORD_OK = 0; + public static final int PASSWORD_WRONG = 1; + public static final int PASSWORD_BAN = 2; private final int _wrongTentatives; private final int _mode; @@ -42,7 +42,6 @@ public class Ex2ndPasswordVerify implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_VERIFY.writeId(packet); - packet.writeD(_mode); packet.writeD(_wrongTentatives); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java index 8f3d5ec764..528988ab5f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java @@ -45,10 +45,8 @@ public class ExAbnormalStatusUpdateFromTarget implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ABNORMAL_STATUS_UPDATE_FROM_TARGET.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeH(_effects.size()); - for (BuffInfo info : _effects) { packet.writeD(info.getSkill().getDisplayId()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java index c4b9cd8356..f3abd6ec5c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java @@ -41,7 +41,6 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRABLE_SKILL_LIST_BY_CLASS.writeId(packet); - packet.writeH(_type.getId()); packet.writeH(_learnable.size()); for (SkillLearn skill : _learnable) @@ -54,7 +53,7 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket packet.writeC(skill.getRequiredItems().size()); if (_type == AcquireSkillType.SUBPLEDGE) { - packet.writeH(0x00); + packet.writeH(0); } } return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java index fd0e2fc97c..8555bb6e86 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java @@ -61,7 +61,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_SKILL_INFO.writeId(packet); - packet.writeD(_id); packet.writeD(_level); packet.writeQ(_spCost); @@ -73,7 +72,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket packet.writeD(holder.getId()); packet.writeQ(holder.getCount()); } - packet.writeD(_skillRem.size()); for (Skill skill : _skillRem) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java index 29793f4d6c..ff8c526ec4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java @@ -36,7 +36,6 @@ public class ExAdenaInvenCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ADENA_INVEN_COUNT.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeH(_player.getInventory().getSize()); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java index 2aa2d85bc5..5ef11e0f1e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java @@ -50,13 +50,11 @@ public class ExAirShipInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_INFO.writeId(packet); - packet.writeD(_ship.getObjectId()); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(_captain); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); @@ -73,14 +71,13 @@ public class ExAirShipInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - packet.writeD(_ship.getFuel()); packet.writeD(_ship.getMaxFuel()); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java index 4cfc76bfba..8b37f4fc0a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java @@ -42,7 +42,6 @@ public class ExAirShipStopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_airShipId); packet.writeD(_playerId); packet.writeD(_x); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java index 33c57712da..52958f931b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java @@ -37,12 +37,10 @@ public class ExAirShipTeleportList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_TELEPORT_LIST.writeId(packet); - packet.writeD(_dockId); if (_teleports != null) { packet.writeD(_teleports.length); - for (int i = 0; i < _teleports.length; i++) { packet.writeD(i - 1); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java index 392b228f0d..7918022c72 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java @@ -50,13 +50,12 @@ public class ExAlchemySkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_SKILL_LIST.writeId(packet); - packet.writeD(_skills.size()); for (Skill skill : _skills) { packet.writeD(skill.getId()); packet.writeD(skill.getLevel()); - packet.writeQ(0x00); // Always 0 on Naia, SP i guess? + packet.writeQ(0); // Always 0 on Naia, SP i guess? packet.writeC(skill.getId() == CommonSkill.ALCHEMY_CUBE.getId() ? 0 : 1); // This is type in flash, visible or not } return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java index 3bfadd2650..ed7f8d4255 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java @@ -47,12 +47,10 @@ public class ExAlterSkillRequest implements IClientOutgoingPacket { return true; } - OutgoingPackets.EX_ALTER_SKILL_REQUEST.writeId(packet); packet.writeD(_nextSkillId); packet.writeD(_currentSkillId); packet.writeD(_alterTime); - if (_alterTime > 0) { _player.setAlterSkillActive(true); @@ -62,7 +60,6 @@ public class ExAlterSkillRequest implements IClientOutgoingPacket _player.setAlterSkillActive(false); }, _alterTime * 1000); } - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java index 3d7ee12a81..1990e1e701 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java @@ -37,7 +37,6 @@ public class ExAskCoupleAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_COUPLE_ACTION.writeId(packet); - packet.writeD(_actionId); packet.writeD(_objectId); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java index 61cabedd98..45615daf5a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java @@ -39,9 +39,8 @@ public class ExAskJoinMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_MPCC.writeId(packet); - packet.writeS(_requestorName); // name of CCLeader - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java index 17fa9d028f..908022ff7e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java @@ -38,7 +38,6 @@ public class ExAskJoinPartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_PARTY_ROOM.writeId(packet); - packet.writeS(_charName); packet.writeS(_roomName); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java index 2a6b958dc9..1551840013 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java @@ -38,7 +38,6 @@ public class ExAskModifyPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_MODIFY_PARTY_LOOTING.writeId(packet); - packet.writeS(_requestor); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java index 958e7c3d06..fa62c8a207 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java @@ -45,7 +45,6 @@ public class ExAttributeEnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ATTRIBUTE_ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeC(_isWeapon); packet.writeH(_type); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java index 1a3a1ef3fe..3d65055b3c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java @@ -41,9 +41,8 @@ public class ExAutoSoulShot implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AUTO_SOUL_SHOT.writeId(packet); - packet.writeD(_itemId); - packet.writeD(_enable ? 0x01 : 0x00); + packet.writeD(_enable ? 1 : 0); packet.writeD(_type); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java index 8680c6bd7a..a8137347ec 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java @@ -37,8 +37,7 @@ public class ExBaseAttributeCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASE_ATTRIBUTE_CANCEL_RESULT.writeId(packet); - - packet.writeD(0x01); // result + packet.writeD(1); // result packet.writeD(_objId); packet.writeD(_attribute); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java index 3fd8588108..13ad96137d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java @@ -75,7 +75,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 1149, 1150, 1151, 1152, 1153, 1154, 1155 }; - public static final int[] DEFAULT_ACTION_LIST = { 0, 1, 2, 3, @@ -146,7 +145,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 5012, 5013, 5014, 5015 }; //@formatter:on - public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST); private final int[] _actionIds; @@ -160,7 +158,6 @@ public class ExBasicActionList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASIC_ACTION_LIST.writeId(packet); - packet.writeD(_actionIds.length); for (int _actionId : _actionIds) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java index 4c4fac8c91..d32dca4d21 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java @@ -34,13 +34,14 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBeautyItemList implements IClientOutgoingPacket { - private int _colorCount; - private final BeautyData _beautyData; - private final Map> _colorData = new HashMap<>(); private static final int HAIR_TYPE = 0; private static final int FACE_TYPE = 1; private static final int COLOR_TYPE = 2; + private int _colorCount; + private final BeautyData _beautyData; + private final Map> _colorData = new HashMap<>(); + public ExBeautyItemList(Player player) { _beautyData = BeautyShopData.getInstance().getBeautyData(player.getRace(), player.getAppearance().getSexType()); @@ -60,7 +61,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BEAUTY_ITEM_LIST.writeId(packet); - packet.writeD(HAIR_TYPE); packet.writeD(_beautyData.getHairList().size()); for (BeautyItem hair : _beautyData.getHairList().values()) @@ -72,7 +72,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(hair.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(FACE_TYPE); packet.writeD(_beautyData.getFaceList().size()); for (BeautyItem face : _beautyData.getFaceList().values()) @@ -84,7 +83,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(face.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(COLOR_TYPE); packet.writeD(_colorCount); for (Entry> entry : _colorData.entrySet()) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java index 1825236886..6d4c45cb2b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java @@ -34,7 +34,6 @@ public class ExBirthdayPopup implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_BIRTH_DAY.writeId(packet); - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java index 7d2f17e697..43e525f05f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java @@ -26,6 +26,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBrBroadcastEventState implements IClientOutgoingPacket { + public static final int APRIL_FOOLS = 20090401; + public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) + public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) + public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) + public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) + private final int _eventId; private final int _eventState; private int _param0; @@ -36,12 +42,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket private String _param5; private String _param6; - public static final int APRIL_FOOLS = 20090401; - public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) - public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) - public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) - public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) - public ExBrBroadcastEventState(int eventId, int eventState) { _eventId = eventId; @@ -65,7 +65,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BROADCAST_EVENT_STATE.writeId(packet); - packet.writeD(_eventId); packet.writeD(_eventState); packet.writeD(_param0); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java index 1fd7ec663a..c0683c8797 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java @@ -44,7 +44,6 @@ public class ExBrBuffEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUFF_EVENT_STATE.writeId(packet); - packet.writeD(_type); packet.writeD(_value); packet.writeD(_state); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java index 943aae8a62..8e009d7b09 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java @@ -43,7 +43,6 @@ public class ExBrLoadEventTopRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_LOAD_EVENT_TOP_RANKERS.writeId(packet); - packet.writeD(_eventId); packet.writeD(_day); packet.writeD(_count); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java index 6a98c01654..9105e39efe 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java @@ -36,9 +36,8 @@ public class ExBrPremiumState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PREMIUM_STATE.writeId(packet); - packet.writeD(_player.getObjectId()); - packet.writeC(_player.hasPremiumStatus() ? 0x01 : 0x00); + packet.writeC(_player.hasPremiumStatus() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 381dd859ad..567cfc70f9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -59,10 +59,8 @@ public class ExBuySellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x01); // Type SELL + packet.writeD(1); // Type SELL packet.writeD(_inventorySlots); - if ((_sellList != null)) { packet.writeH(_sellList.size()); @@ -74,9 +72,8 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - if ((_refundList != null) && !_refundList.isEmpty()) { packet.writeH(_refundList.size()); @@ -90,10 +87,9 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - - packet.writeC(_done ? 0x01 : 0x00); + packet.writeC(_done ? 1 : 0); return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java index 2b43c0ce4b..e0ec81e0e7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java @@ -39,7 +39,6 @@ public class ExCastleState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CASTLE_STATE.writeId(packet); - packet.writeD(_castleId); packet.writeD(_castleSide.ordinal()); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java index b7f90d261b..a8196c7a83 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java @@ -52,7 +52,6 @@ public class ExChangeClientEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_CLIENT_EFFECT_INFO.writeId(packet); - packet.writeD(_type); packet.writeD(_key); packet.writeD(_value); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java index 472abc88df..eea59162ee 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java @@ -37,7 +37,6 @@ public class ExChangeNpcState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NPC_STATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java index 8cdcb4460d..45f2805517 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java @@ -49,7 +49,6 @@ public class ExChangePostState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_POST_STATE.writeId(packet); - packet.writeD(_receivedBoard ? 1 : 0); packet.writeD(_changedMsgIds.length); for (int postId : _changedMsgIds) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java index fc58ec9a2e..d765ab54e0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java @@ -35,7 +35,6 @@ public class ExChangeToAwakenedClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_TO_AWAKENED_CLASS.writeId(packet); - packet.writeD(_classId); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index 0fc5fb1c75..fec31d4775 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -47,7 +47,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket throw new IllegalArgumentException("Undefined Atribute item: " + stone); } _level = ElementalAttributeData.getInstance().getMaxElementLevel(_itemId); - // Register only items that can be put an attribute stone/crystal for (Item item : player.getInventory().getItems()) { @@ -62,7 +61,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_INVENTORY_ATTRIBUTE_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeQ(_count); packet.writeD(_atribute == AttributeType.FIRE ? 1 : 0); // Fire diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java index a272d85469..238882cd11 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java @@ -35,7 +35,6 @@ public class ExCloseMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java index d2ecd70952..877bca760a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java @@ -34,7 +34,6 @@ public class ExClosePartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_PARTY_ROOM.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java index 27c112776b..1d02c972b5 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java @@ -54,7 +54,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLOSSEUM_FENCE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_clientState); packet.writeD(_x); @@ -62,7 +61,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_width); packet.writeD(_length); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java index 766d3619ad..b72bef93e8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java @@ -37,9 +37,8 @@ public class ExConfirmAddingContact implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AGIT_AUCTION_CMD.writeId(packet); - packet.writeS(_charName); - packet.writeD(_added ? 0x01 : 0x00); + packet.writeD(_added ? 1 : 0); return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java index beded32254..c832d507ed 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameAddPlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x01); - + packet.writeD(1); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java index 5f36f730d0..847ea93e6a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java @@ -45,9 +45,7 @@ public class ExCubeGameChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java index 66abbf4b75..a2f2e61ded 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java @@ -43,12 +43,10 @@ public class ExCubeGameChangeTeam implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x05); - + packet.writeD(5); packet.writeD(_player.getObjectId()); - packet.writeD(_fromRedTeam ? 0x01 : 0x00); - packet.writeD(_fromRedTeam ? 0x00 : 0x01); + packet.writeD(_fromRedTeam ? 1 : 0); + packet.writeD(_fromRedTeam ? 0 : 1); return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java index 5273b2099a..136b439283 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java @@ -39,9 +39,7 @@ public class ExCubeGameChangeTimeToStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x03); - + packet.writeD(3); packet.writeD(_seconds); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java index f81a302941..9bdba49029 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java @@ -35,7 +35,6 @@ public class ExCubeGameCloseUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0xffffffff); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java index 259a0e9407..3177e7a488 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java @@ -40,11 +40,9 @@ public class ExCubeGameEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x01); - - packet.writeD(_isRedTeamWin ? 0x01 : 0x00); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(1); + packet.writeD(_isRedTeamWin ? 1 : 0); + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java index 4d89e621ce..8b96bb545f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java @@ -55,14 +55,11 @@ public class ExCubeGameExtendedChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeD(_playerPoints); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java index e5a00f1ab7..c084789f13 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameRemovePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java index 00be884d2f..35a3f289d1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java @@ -35,8 +35,7 @@ public class ExCubeGameRequestReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x04); + packet.writeD(4); return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java index 1bc89e0c32..8b755dd3cc 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java @@ -30,7 +30,6 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket // Players Lists private final List _bluePlayers; private final List _redPlayers; - // Common Values private final int _roomNumber; @@ -51,12 +50,9 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_roomNumber); packet.writeD(0xffffffff); - packet.writeD(_bluePlayers.size()); for (Player player : _bluePlayers) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java index 2f2c092c08..d000112787 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java @@ -31,7 +31,6 @@ public class ExCursedWeaponList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet); - final Set ids = CursedWeaponsManager.getInstance().getCursedWeaponsIds(); packet.writeD(ids.size()); ids.forEach(packet::writeD); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java index 2f60a1b80c..5bc7ff3238 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java @@ -39,7 +39,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet); - if (!_cursedWeaponInfo.isEmpty()) { packet.writeD(_cursedWeaponInfo.size()); @@ -47,7 +46,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { packet.writeD(w.id); packet.writeD(w.activated); - packet.writeD(w.pos.getX()); packet.writeD(w.pos.getY()); packet.writeD(w.pos.getZ()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java index f475a02b28..0456fb9dae 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java @@ -34,7 +34,6 @@ public class ExDissmissMPCCRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DISSMISS_MPCC_ROOM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java index 258010f717..c731b7c7a9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java @@ -37,7 +37,6 @@ public class ExDuelAskStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_ASK_START.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDuel); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java index 043c82c0db..e9a31bee57 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java @@ -38,7 +38,6 @@ public class ExDuelEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_END.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java index 264409b3d6..e1fa1cea88 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java @@ -38,7 +38,6 @@ public class ExDuelReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_READY.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java index 488aafcb7d..ecdd528a16 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java @@ -38,7 +38,6 @@ public class ExDuelStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_START.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java index 7df040c5e7..5ed0c09675 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java @@ -36,7 +36,6 @@ public class ExDuelUpdateUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_UPDATE_USER_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeD(_player.getClassId().getId()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 7ab055a3d8..f58c0573a8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExEnchantSkillInfo implements IClientOutgoingPacket { private final Set _routes; - private final int _skillId; private final int _skillLevel; private final int _skillSubLevel; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 41368a8efb..e4ee350e64 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -50,7 +50,6 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_INFO_DETAIL.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java index 5cedcd6284..1d32f0d725 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java @@ -43,7 +43,6 @@ public class ExEnchantSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_LIST.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skills.size()); for (Skill skill : _skills) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java index 6ab5e869f2..853d74039f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java @@ -38,7 +38,6 @@ public class ExEnchantSkillResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_RESULT.writeId(packet); - packet.writeD(_enchanted ? 1 : 0); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java index 7b7d2d008d..410bf16510 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java @@ -42,7 +42,6 @@ public class ExEventMatchMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_EVENT_MATCH_MESSAGE.writeId(packet); - packet.writeC(_type); packet.writeS(_message); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java index 7264e90233..1946758bf5 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java @@ -37,11 +37,9 @@ public class ExGetBookMarkInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOOK_MARK_INFO.writeId(packet); - - packet.writeD(0x00); // Dummy + packet.writeD(0); // Dummy packet.writeD(_player.getBookMarkSlot()); packet.writeD(_player.getTeleportBookmarks().size()); - for (TeleportBookmark tpbm : _player.getTeleportBookmarks()) { packet.writeD(tpbm.getId()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java index 36e7bb81af..201e8eb49b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java @@ -42,15 +42,14 @@ public class ExGetBossRecord implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOSS_RECORD.writeId(packet); - packet.writeD(_ranking); packet.writeD(_totalPoints); if (_bossRecordInfo == null) { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } else { @@ -59,7 +58,7 @@ public class ExGetBossRecord implements IClientOutgoingPacket { packet.writeD(entry.getKey()); packet.writeD(entry.getValue()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? } } return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java index ea0a5f8b18..85ccad0758 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java @@ -41,7 +41,6 @@ public class ExGetOffAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_OFF_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_x); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java index f8e16a4191..9a02e49223 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java @@ -39,7 +39,6 @@ public class ExGetOnAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_ON_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java index 51197344a5..704b3212a1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExGetPremiumItemList implements IClientOutgoingPacket { private final Player _player; - private final Map _map; public ExGetPremiumItemList(Player player) @@ -43,7 +42,6 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_PREMIUM_ITEM_LIST.writeId(packet); - packet.writeD(_map.size()); for (Entry entry : _map.entrySet()) { @@ -51,7 +49,7 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket packet.writeQ(entry.getKey()); packet.writeD(item.getItemId()); packet.writeQ(item.getCount()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeS(item.getSender()); } return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index a005fa8ad8..0200bdee08 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -40,7 +40,6 @@ public class ExHeroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HERO_LIST.writeId(packet); - packet.writeD(_heroList.size()); for (StatSet hero : _heroList.values()) { @@ -51,7 +50,7 @@ public class ExHeroList implements IClientOutgoingPacket packet.writeS(hero.getString(Hero.ALLY_NAME, "")); packet.writeD(hero.getInt(Hero.ALLY_CREST, 0)); packet.writeD(hero.getInt(Hero.COUNT)); - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index d5b5430142..0baca7cd86 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -48,8 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); - - packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade + packet.writeC(_hide ? 0 : 1); // Grand Crusade packet.writeD(_currentTemplateId); packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java index 81db66b88f..323c0cdf1e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java @@ -35,7 +35,6 @@ public class ExIsCharNameCreatable implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_IS_CHAR_NAME_CREATABLE.writeId(packet); - packet.writeD(_allowed); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java index 2cea176d69..4eea62de37 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java @@ -39,11 +39,11 @@ public class ExItemAnnounce implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_ANNOUNCE.writeId(packet); - packet.writeC(0x00); // item icon + packet.writeC(0); // item icon packet.writeString(_player.getName()); // name of player packet.writeD(_item.getId()); // item id packet.writeD(_item.getEnchantLevel()); // enchant level - packet.writeC(0x00); // name of item + packet.writeC(0); // name of item return true; } } \ No newline at end of file diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java index ecc751eab3..45def9e0be 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java @@ -38,7 +38,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { throw new NullPointerException(); } - if (currentAuction.getAuctionState() != ItemAuctionState.STARTED) { _timeRemaining = 0; @@ -47,7 +46,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { _timeRemaining = (int) (currentAuction.getFinishingTimeRemaining() / 1000); // in seconds } - _refresh = refresh; _currentAuction = currentAuction; _nextAuction = nextAuction; @@ -57,16 +55,12 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_AUCTION_INFO.writeId(packet); - - packet.writeC(_refresh ? 0x00 : 0x01); + packet.writeC(_refresh ? 0 : 1); packet.writeD(_currentAuction.getInstanceId()); - final ItemAuctionBid highestBid = _currentAuction.getHighestBid(); packet.writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid()); - packet.writeD(_timeRemaining); writeItem(packet, _currentAuction.getItemInfo()); - if (_nextAuction != null) { packet.writeQ(_nextAuction.getAuctionInitBid()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java index f66c77509f..e40ebdb90b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java @@ -44,7 +44,6 @@ public class ExItemAuctionStatus implements IClientOutgoingPacket _x = spawn.getX(); _y = spawn.getY(); _z = spawn.getZ(); - final ItemAuctionInstance manager = ItemAuctionManager.getInstance().getManagerInstance(AUCTION_MANAGER); if (manager != null) { @@ -64,7 +63,7 @@ public class ExItemAuctionStatus implements IClientOutgoingPacket packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); + packet.writeD(0); packet.writeH(_status); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java index 53ad8abd58..1c5e38cbab 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListMpccWaiting implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _rooms = new LinkedList<>(); @@ -53,7 +54,6 @@ public class ExListMpccWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_MPCC_WAITING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 78f2fec636..eafea24fa6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _players = new LinkedList<>(); @@ -60,7 +61,6 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(packet); - packet.writeD(_size); packet.writeD(_players.size()); for (Player player : _players) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java index 786c616875..c8723a9fc0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java @@ -46,7 +46,6 @@ public class ExMPCCPartyInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCPARTY_INFO_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_LeaderOID); packet.writeD(_memberCount); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java index 4bf07f0133..08259e4e6c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java @@ -37,7 +37,6 @@ public class ExMPCCPartymasterList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_PARTYMASTER_LIST.writeId(packet); - packet.writeD(_leadersName.size()); _leadersName.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java index abbdc8fe76..f021ef5f1f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java @@ -36,7 +36,6 @@ public class ExMPCCRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java index 154e156270..2eec590cb4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java @@ -41,7 +41,6 @@ public class ExMPCCRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java index 06e3027bfc..a0e9d0a4b0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java @@ -37,7 +37,6 @@ public class ExMPCCShowPartyMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCSHOW_PARTY_MEMBER_INFO.writeId(packet); - packet.writeD(_party.getMemberCount()); for (Player pc : _party.getMembers()) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java index e454a746f3..771b2f22cb 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java @@ -49,7 +49,6 @@ public class ExMagicAttackInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAGIC_ATTACK_INFO.writeId(packet); - packet.writeD(_caster); packet.writeD(_target); packet.writeD(_type); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java index 9cfbeb5aee..1aaa5b6520 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java @@ -35,7 +35,6 @@ public class ExMailArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAIL_ARRIVED.writeId(packet); - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java index 983ff22b92..48156c0600 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java @@ -44,7 +44,6 @@ public class ExManageMpccRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MANAGE_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java index f710c006e8..9d7d14211e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java @@ -45,7 +45,6 @@ public class ExMoveToLocationAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_objId); packet.writeD(_tx); packet.writeD(_ty); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java index 3e3bdc9fed..87e44b51cd 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java @@ -43,7 +43,6 @@ public class ExMoveToLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java index 7ab0d1c7da..3c1902892a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java @@ -40,11 +40,9 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet); - packet.writeS(_channel.getLeader().getName()); - packet.writeD(0x00); // Channel loot 0 or 1 + packet.writeD(0); // Channel loot 0 or 1 packet.writeD(_channel.getMemberCount()); - packet.writeD(_channel.getParties().size()); for (Party p : _channel.getParties()) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java index 1536bd5f9b..f2a32bb6e8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java @@ -43,7 +43,6 @@ public class ExNeedToChangeName implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEED_TO_CHANGE_NAME.writeId(packet); - packet.writeD(_type); packet.writeD(_subType); packet.writeS(_name); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java index be9bec8559..d18b4606b3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java @@ -35,7 +35,6 @@ public class ExNevitAdventEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CHANNELING_EFFECT.writeId(packet); - packet.writeD(_timeLeft); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java index 3a0367c178..09f6250f51 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java @@ -35,7 +35,6 @@ public class ExNevitAdventPointInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_AGATHION_ENERGY_INFO.writeId(packet); - packet.writeD(_points); // 72 = 1%, max 7200 = 100% return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java index 88fdaae499..ef220d86de 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java @@ -37,9 +37,8 @@ public class ExNevitAdventTimeChange implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - // state 0 - pause 1 - started - packet.writeC(_paused ? 0x00 : 0x01); + packet.writeC(_paused ? 0 : 1); // left time in ms max is 16000 its 4m and state is automatically changed to quit packet.writeD(_time); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java index fccdf510cc..4025bf78fa 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java @@ -34,7 +34,6 @@ public class ExNewSkillToLearnByLevelUp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEW_SKILL_TO_LEARN_BY_LEVEL_UP.writeId(packet); - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java index 324c18a517..f2ce8614dc 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java @@ -43,8 +43,7 @@ public class ExNoticePostArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTICE_POST_ARRIVED.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java index afe3719d9b..050c7ccea5 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java @@ -43,8 +43,7 @@ public class ExNoticePostSent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_WRITE_POST.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java index 5d98c20b09..e0bd08d39a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java @@ -30,7 +30,6 @@ public class ExNotifyPremiumItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_PREMIUM_ITEM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java index 6cb3724448..ba3c0cfeaa 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java @@ -34,7 +34,6 @@ public class ExOlympiadMatchEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MATCH_END.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java index 264d5aa484..7ffd5ed3bd 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java @@ -55,19 +55,15 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x00); // Type 0 = Match List, 1 = Match Result - + packet.writeD(0); // Type 0 = Match List, 1 = Match Result packet.writeD(_games.size()); - packet.writeD(0x00); - + packet.writeD(0); for (OlympiadGameTask curGame : _games) { final AbstractOlympiadGame game = curGame.getGame(); if (game != null) { packet.writeD(game.getStadiumId()); // Stadium Id (Arena 1 = 0) - if (game instanceof OlympiadGameNonClassed) { packet.writeD(1); @@ -80,8 +76,7 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket { packet.writeD(0); } - - packet.writeD(curGame.isRunning() ? 0x02 : 0x01); // (1 = Standby, 2 = Playing) + packet.writeD(curGame.isRunning() ? 2 : 1); // (1 = Standby, 2 = Playing) packet.writeS(game.getPlayerNames()[0]); // Player 1 Name packet.writeS(game.getPlayerNames()[1]); // Player 2 Name } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java index 712651603d..b387271fba 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java @@ -53,9 +53,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x01); // Type 0 = Match List, 1 = Match Result - + packet.writeD(1); // Type 0 = Match List, 1 = Match Result packet.writeD(_tie ? 1 : 0); // 0 - win, 1 - tie packet.writeS(_winnerList.get(0).getName()); packet.writeD(_winTeam); @@ -69,9 +67,8 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } - packet.writeD(_loseTeam); packet.writeD(_loserList.size()); for (OlympiadInfo info : _loserList) @@ -83,7 +80,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java index 34d81d1f53..712b9e06c6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java @@ -38,7 +38,6 @@ public class ExOlympiadMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MODE.writeId(packet); - packet.writeC(_mode); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java index ebea6c56f3..5b4f2c2523 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java @@ -53,7 +53,6 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_SPELLED_INFO.writeId(packet); - packet.writeD(_playerId); packet.writeD(_effects.size() + _effects2.size()); for (BuffInfo info : _effects) @@ -62,7 +61,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(info.getSkill().getDisplayId()); packet.writeH(info.getSkill().getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(info.getSkill().getAbnormalType().getClientId()); writeOptionalD(packet, info.getSkill().isAura() ? -1 : info.getTime()); } @@ -73,7 +72,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(skill.getDisplayId()); packet.writeH(skill.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(skill.getAbnormalType().getClientId()); packet.writeH(-1); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java index 18c34fe9de..ca473edfcf 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java @@ -76,7 +76,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_USER_INFO.writeId(packet); - if (_player != null) { packet.writeC(_player.getOlympiadSide()); @@ -91,7 +90,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket packet.writeS(_par.getName()); packet.writeD(_par.getBaseClass()); } - packet.writeD(_curHp); packet.writeD(_maxHp); packet.writeD(_curCp); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java index e84d0251bd..7ec64cc8c3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java @@ -35,7 +35,6 @@ public class ExOpenMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OPEN_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java index 90349cc1a2..5661dc9f57 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java @@ -56,7 +56,6 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PCCAFE_POINT_INFO.writeId(packet); - packet.writeD(_points); // num points packet.writeD(_mAddPoint); // points inc display packet.writeC(_mPeriodType); // period(0=don't show window,1=acquisition,2=use points) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java index f7e8b4a99a..248a2f7d98 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_ADD.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java index 832bee0012..1f452f4bae 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_DELETE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_summon.getSummonType()); packet.writeD(_summon.getOwner().getObjectId()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java index 0646a67001..703694fa2f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_UPDATE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 0e3edb3ea7..e4c6b79ae0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -47,7 +47,6 @@ public class ExPartyRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2bffdec368..2ebf1dc7f0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -43,10 +43,8 @@ public class ExPetInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class ExPetInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class ExPetInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,9 +154,8 @@ public class ExPetInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -227,28 +205,24 @@ public class ExPetInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PET_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -267,7 +241,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -283,19 +257,19 @@ public class ExPetInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -307,20 +281,20 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -344,12 +318,12 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -379,12 +353,10 @@ public class ExPetInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java index 082f4c7662..0f72c05a3a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java @@ -34,7 +34,6 @@ public class ExPlayScene implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLAY_SCENE.writeId(packet); - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java index e98d317e14..7e3803bdaa 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java @@ -36,7 +36,6 @@ public class ExPledgeCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_COUNT.writeId(packet); - packet.writeD(_count); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java index 838029e284..4084de3481 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java @@ -38,7 +38,6 @@ public class ExPledgeDraftListSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_DRAFT_LIST_SEARCH.writeId(packet); - packet.writeD(_pledgeRecruitList.size()); for (PledgeWaitingInfo prl : _pledgeRecruitList) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java index fb956e9996..44e34004ea 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java @@ -25,11 +25,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExPledgeEmblem implements IClientOutgoingPacket { + private static final int TOTAL_SIZE = 65664; + private final int _crestId; private final int _clanId; private final byte[] _data; private final int _chunkId; - private static final int TOTAL_SIZE = 65664; public ExPledgeEmblem(int crestId, byte[] chunkedData, int clanId, int chunkId) { @@ -43,7 +44,6 @@ public class ExPledgeEmblem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clanId); packet.writeD(_crestId); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java index ed19bf976b..b32f8c0645 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitApplyInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_APPLY_INFO.writeId(packet); - packet.writeD(_status.ordinal()); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java index fc98b7b6f7..af4af9c9c1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitBoardDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_DETAIL.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClanId()); packet.writeD(_pledgeRecruitInfo.getKarma()); packet.writeS(_pledgeRecruitInfo.getInformation()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index b4d48373a6..eda808e754 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -34,7 +34,6 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket private final int _clanOnCurrentPage; private final int _startIndex; private final int _endIndex; - static final int CLAN_PER_PAGE = 12; public ExPledgeRecruitBoardSearch(List clanList, int currentPage) @@ -51,11 +50,9 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_SEARCH.writeId(packet); - packet.writeD(_currentPage); packet.writeD(_totalNumberOfPage); packet.writeD(_clanOnCurrentPage); - for (int i = _startIndex; i < _endIndex; i++) { packet.writeD(_clanList.get(i).getClanId()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 4ae5ffe316..b1f139226d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -40,7 +40,6 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java index 77080a3820..5844f220ec 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java @@ -39,7 +39,6 @@ public class ExPledgeWaitingList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST.writeId(packet); - packet.writeD(pledgePlayerRecruitInfos.size()); for (PledgeApplicantInfo recruitInfo : pledgePlayerRecruitInfos.values()) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java index a9245c1309..6b88572057 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java @@ -30,7 +30,6 @@ public class ExPledgeWaitingListAlarm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_ALARM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java index 60997b3da0..28c3967119 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java @@ -40,7 +40,6 @@ public class ExPledgeWaitingListApplied implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_APPLIED.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClan().getId()); packet.writeS(_pledgeRecruitInfo.getClan().getName()); packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java index 66a06892c2..1f53d1bb38 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java @@ -36,7 +36,6 @@ public class ExPledgeWaitingUser implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_USER.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getPlayerId()); packet.writeS(_pledgeRecruitInfo.getMessage()); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java index 49bc9b0995..5f404779f5 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java @@ -43,7 +43,6 @@ public class ExPrivateStoreSetWholeMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_objectId); packet.writeS(_msg); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java index cb5e8fbce9..ff996b5d0c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutCommissionResultForVariationMake implements IClientOutgoingPac public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_COMMISSION_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_gemstoneObjId); packet.writeD(_itemId); packet.writeQ(_gemstoneCount); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java index 81721e921f..098472b7ae 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantScrollItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SCROLL_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java index 871f377db2..ffea182a49 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java index c47a4bcff4..8016e128f4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java index c8b46be499..95c0c0e4e1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_INTENSIVE_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_refinerItemObjId); packet.writeD(_lifestoneItemId); packet.writeD(_gemstoneItemId); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 2128b2b19f..2970ca00a2 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -41,13 +41,12 @@ public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_CANCEL.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); packet.writeD(_itemAug1); packet.writeD(_itemAug2); packet.writeQ(_price); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java index 80541e65cd..c25dd16b01 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java @@ -34,10 +34,9 @@ public class ExPutItemResultForVariationMake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java index fe5eb74eb0..bc8896164d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java @@ -56,13 +56,12 @@ public class ExQuestNpcLogList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_NPC_LOG_LIST.writeId(packet); - packet.writeD(_questId); packet.writeC(_npcLogList.size()); for (NpcLogListHolder holder : _npcLogList) { packet.writeD(holder.isNpcString() ? holder.getId() : holder.getId() + 1000000); - packet.writeC(holder.isNpcString() ? 0x01 : 0x00); + packet.writeC(holder.isNpcString() ? 1 : 0); packet.writeD(holder.getCount()); } return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java index 62d622caff..60616b256d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java @@ -35,7 +35,6 @@ public class ExRedSky implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RED_SKY.writeId(packet); - packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java index ce40b1a792..163faff855 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java @@ -36,7 +36,6 @@ public class ExRegenMax implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REGEN_MAX.writeId(packet); - packet.writeD(1); packet.writeD(_time); packet.writeD(_tickInterval); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java index d864795cd6..a17525576b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java @@ -34,7 +34,6 @@ public class ExRemoveEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REMOVE_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 57ed88ac29..4e479e75a6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -56,7 +56,6 @@ public class ExReplyReceivedPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_RECEIVED_POST.writeId(packet); - packet.writeD(_msg.getMailType().ordinal()); // GOD if (_msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED) { @@ -76,11 +75,10 @@ public class ExReplyReceivedPost extends AbstractItemPacket } packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown packet.writeS(_msg.getSenderName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -92,9 +90,8 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeQ(_msg.getReqAdena()); packet.writeD(_msg.hasAttachments() ? 1 : 0); packet.writeD(_msg.isReturned() ? 1 : 0); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 75f6596194..ed490eae91 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -54,14 +54,12 @@ public class ExReplySentPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_SENT_POST.writeId(packet); - - packet.writeD(0x00); // GOD + packet.writeD(0); // GOD packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); packet.writeS(_msg.getReceiverName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -73,11 +71,11 @@ public class ExReplySentPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeQ(_msg.getReqAdena()); - packet.writeD(_msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(_msg.isReturned() ? 0x01 : 00); + packet.writeD(_msg.hasAttachments() ? 1 : 0); + packet.writeD(_msg.isReturned() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index cc4f7ce1d8..e6a3f9bca2 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -35,7 +35,6 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java index 2634aa1cdd..60201b177f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java @@ -35,7 +35,6 @@ public class ExRequestHackShield implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REQUEST_HACK_SHIELD.writeId(packet); - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java index c51ff31d0b..75e3b3a945 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java @@ -29,13 +29,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyList implements IClientOutgoingPacket { + public static final int SHOW_FACESHAPE = 1; + public static final int SHOW_HAIRSTYLE = 0; + private final Player _player; private final int _type; private final Map _beautyItem; - public static final int SHOW_FACESHAPE = 1; - public static final int SHOW_HAIRSTYLE = 0; - public ExResponseBeautyList(Player player, int type) { _player = player; @@ -54,7 +54,6 @@ public class ExResponseBeautyList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java index ca2ed360ab..4b19201833 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java @@ -25,16 +25,15 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket { + public static final int FAILURE = 0; + public static final int SUCCESS = 1; + public static final int CHANGE = 0; + public static final int RESTORE = 1; + private final Player _player; private final int _type; private final int _result; - public static final int FAILURE = 0; - public static final int SUCCESS = 1; - - public static final int CHANGE = 0; - public static final int RESTORE = 1; - public ExResponseBeautyRegistReset(Player player, int type, int result) { _player = player; @@ -46,7 +45,6 @@ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_REGIST_RESET.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java index 0e313ef3b7..c0922cfb04 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java @@ -36,10 +36,8 @@ public class ExResponseResetList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_RESET_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); - packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java index 01fe1945ef..a230033d67 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java @@ -37,7 +37,6 @@ public class ExRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ROTATION.writeId(packet); - packet.writeD(_charId); packet.writeD(_heading); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index c58ccfc233..2646a71e77 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -36,7 +36,6 @@ public class ExRpItemLink extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RP_ITEM_LINK.writeId(packet); - writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java index 04556bbed2..f0c6eba8e9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java @@ -34,7 +34,6 @@ public class ExSearchOrc implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEARCH_ORC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index 1e06cc2a3f..7a4dced122 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -38,7 +38,6 @@ public class ExSendManorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_MANOR_LIST.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java index b63c69f37e..2c25cc8bfc 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java @@ -124,7 +124,6 @@ public class ExSendUIEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_UIEVENT.writeId(packet); - packet.writeD(_objectId); packet.writeD(_type); // 0 = show, 1 = hide (there is 2 = pause and 3 = resume also but they don't work well you can only pause count down and you cannot resume it because resume hides the counter). packet.writeD(0); // unknown diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java index 4378479707..716a3e8623 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java @@ -385,16 +385,13 @@ public class ExServerPrimitive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SERVER_PRIMITIVE.writeId(packet); - packet.writeS(_name); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(65535); // has to do something with display range and angle packet.writeD(65535); // has to do something with display range and angle - packet.writeD(_points.size() + _lines.size()); - for (Point point : _points) { packet.writeC(1); // Its the type in this case Point @@ -408,7 +405,6 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(point.getY()); packet.writeD(point.getZ()); } - for (Line line : _lines) { packet.writeC(2); // Its the type in this case Line diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java index fb32e199b2..51fb91b643 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java @@ -46,7 +46,6 @@ public class ExSetCompassZoneCode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_COMPASS_ZONE_CODE.writeId(packet); - packet.writeD(_zoneType); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java index 1d0fbae3a4..34dee8bda0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java @@ -38,7 +38,6 @@ public class ExSetPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_PARTY_LOOTING.writeId(packet); - packet.writeD(_result); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java index 7b14ec8412..4e491af9d1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java @@ -34,7 +34,6 @@ public class ExShowAdventurerGuideBook implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_ADVENTURER_GUIDE_BOOK.writeId(packet); - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index 82554fdc5f..1f8df76083 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -39,7 +39,6 @@ public class ExShowAgitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AGIT_INFO.writeId(packet); - final Collection clanHalls = ClanHallData.getInstance().getClanHalls(); packet.writeD(clanHalls.size()); clanHalls.forEach(clanHall -> diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index dd11ee0150..51e6646ff5 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -44,7 +44,6 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BASE_ATTRIBUTE_CANCEL_WINDOW.writeId(packet); - packet.writeD(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java index 14e55d39f3..e22345c4fd 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java @@ -25,13 +25,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExShowBeautyMenu implements IClientOutgoingPacket { - private final Player _player; - private final int _type; - // TODO: Enum public static final int MODIFY_APPEARANCE = 0; public static final int RESTORE_APPEARANCE = 1; + private final Player _player; + private final int _type; + public ExShowBeautyMenu(Player player, int type) { _player = player; @@ -42,7 +42,6 @@ public class ExShowBeautyMenu implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BEAUTY_MENU.writeId(packet); - packet.writeD(_type); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 15d011befc..b0d2b90494 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -41,7 +41,6 @@ public class ExShowCastleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CASTLE_INFO.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) @@ -65,8 +64,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } packet.writeD(castle.getTaxPercent(TaxType.BUY)); packet.writeD((int) (castle.getSiege().getSiegeDate().getTimeInMillis() / 1000)); - - packet.writeC(castle.getSiege().isInProgress() ? 0x01 : 0x00); // Grand Crusade + packet.writeC(castle.getSiege().isInProgress() ? 1 : 0); // Grand Crusade packet.writeC(castle.getSide().ordinal()); // Grand Crusade } return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java index aeb4079f3a..f9a6ebe0e7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java @@ -38,7 +38,6 @@ public class ExShowContactList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_SHOW_POST_FRIEND.writeId(packet); - packet.writeD(_contacts.size()); _contacts.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index a079ea3129..94b989b583 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -37,7 +37,6 @@ public class ExShowCropInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _crops = (nextPeriod && !manor.isManorApproved()) ? null : manor.getCropProcure(manorId, nextPeriod); } @@ -46,10 +45,9 @@ public class ExShowCropInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Crop Sales" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Crop Sales" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); + packet.writeD(0); if (_crops != null) { packet.writeD(_crops.size()); @@ -64,17 +62,17 @@ public class ExShowCropInfo implements IClientOutgoingPacket if (seed == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(seed.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(seed.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(seed.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index a1e06eb2bf..1c65dde1a6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -62,10 +62,8 @@ public class ExShowCropSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getCropId()); // crop id diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index ee9fa9fd37..b625a1e4e7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -39,7 +39,6 @@ public class ExShowFortressInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_INFO.writeId(packet); - final Collection forts = FortManager.getInstance().getForts(); packet.writeD(forts.size()); for (Fort fort : forts) @@ -47,7 +46,7 @@ public class ExShowFortressInfo implements IClientOutgoingPacket final Clan clan = fort.getOwnerClan(); packet.writeD(fort.getResidenceId()); packet.writeS(clan != null ? clan.getName() : ""); - packet.writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00); + packet.writeD(fort.getSiege().isInProgress() ? 1 : 0); // Time of possession packet.writeD(fort.getOwnedTime()); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index f389b26ed5..678ab43e96 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -42,11 +42,9 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_MAP_INFO.writeId(packet); - packet.writeD(_fortress.getResidenceId()); packet.writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status packet.writeD(_fortress.getFortSize()); // barracks count - final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId()); if ((commanders != null) && !commanders.isEmpty() && _fortress.getSiege().isInProgress()) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 27da99cf41..da186103ae 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -51,7 +51,6 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_SIEGE_INFO.writeId(packet); - packet.writeD(_fortId); // Fortress Id packet.writeD(_size); // Total Barracks Count if (_csize > 0) @@ -64,22 +63,22 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { case 0: { - packet.writeD(0x03); + packet.writeD(3); break; } case 1: { - packet.writeD(0x02); + packet.writeD(2); break; } case 2: { - packet.writeD(0x01); + packet.writeD(1); break; } case 3: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -92,27 +91,27 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket // TODO: once control room supported, update packet.writeD(0x0x) to support 5th room case 0: { - packet.writeD(0x05); + packet.writeD(5); break; } case 1: { - packet.writeD(0x04); + packet.writeD(4); break; } case 2: { - packet.writeD(0x03); + packet.writeD(3); break; } case 3: { - packet.writeD(0x02); + packet.writeD(2); break; } case 4: { - packet.writeD(0x01); + packet.writeD(1); break; } } @@ -124,7 +123,7 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { for (int i = 0; i < _size; i++) { - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java index 8bb38fd28c..bc1e679418 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java @@ -41,8 +41,7 @@ public class ExShowManorDefaultInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_MANOR_DEFAULT_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" and "Crop Sales" buttons + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" and "Crop Sales" buttons packet.writeD(_crops.size()); for (Seed crop : _crops) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 1d3312d668..d03ce2a5fd 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -52,10 +52,8 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet); - packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java index cf38d18c1c..f41999329f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java @@ -34,7 +34,6 @@ public class ExShowQuestInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_INFO.writeId(packet); - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java index 70f31e318f..0fa64c401d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java @@ -37,7 +37,6 @@ public class ExShowQuestMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_MARK.writeId(packet); - packet.writeD(_questId); packet.writeD(_questState); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index ab85228caf..1a6ee00a10 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ExShowReceivedPostList implements IClientOutgoingPacket { - private final List _inbox; - private static final int MESSAGE_FEE = 100; private static final int MESSAGE_FEE_PER_SLOT = 1000; + private final List _inbox; + public ExShowReceivedPostList(int objectId) { _inbox = MailManager.getInstance().getInbox(objectId); @@ -45,7 +45,6 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { @@ -64,18 +63,18 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getSenderName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); + packet.writeD(msg.isUnread() ? 1 : 0); packet.writeD(((msg.getMailType() == MailType.COMMISSION_ITEM_SOLD) || (msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED)) ? 0 : 1); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(msg.isReturned() ? 0x01 : 0x00); - packet.writeD(0x00); // SysString in some case it seems + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(msg.isReturned() ? 1 : 0); + packet.writeD(0); // SysString in some case it seems } } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(MESSAGE_FEE); packet.writeD(MESSAGE_FEE_PER_SLOT); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java index 9679468789..dffb92b4ab 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java @@ -265,7 +265,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SCREEN_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -284,9 +283,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(sml.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -308,9 +307,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -318,7 +317,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket } } } - packet.writeD(_type); packet.writeD(_sysMessageId); packet.writeD(_position); @@ -326,9 +324,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java index 29ab5d355f..6123b08991 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java @@ -37,7 +37,6 @@ public class ExShowSeedInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _seeds = (nextPeriod && !manor.isManorApproved()) ? null : manor.getSeedProduction(manorId, nextPeriod); } @@ -46,16 +45,14 @@ public class ExShowSeedInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown if (_seeds == null) { packet.writeD(0); return true; } - packet.writeD(_seeds.size()); for (SeedProduction seed : _seeds) { @@ -67,17 +64,17 @@ public class ExShowSeedInfo implements IClientOutgoingPacket if (s == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(s.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(s.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(s.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java index e628099700..eb6e686e10 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java @@ -32,13 +32,10 @@ public class ExShowSeedMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_MAP_INFO.writeId(packet); - packet.writeD(2); // seed count - // Seed of Destruction packet.writeD(1); // id 1? Grand Crusade packet.writeD(2770 + GraciaSeedsManager.getInstance().getSoDState()); // sys msg id - // Seed of Infinity packet.writeD(2); // id 2? Grand Crusade // Manager not implemented yet diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index c9bf485ee2..05c0401a7c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -62,10 +62,8 @@ public class ExShowSeedSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getSeedId()); // seed id diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 1994402da2..269bec5b97 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -47,7 +47,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _cropsItems.put(cropId, item); } } - for (CropProcure crop : CastleManorManager.getInstance().getCropProcure(_manorId, false)) { if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) @@ -61,7 +60,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_cropsItems.size()); // size for (Item item : _cropsItems.values()) @@ -70,9 +68,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket packet.writeD(item.getObjectId()); // Object id packet.writeD(item.getId()); // crop id packet.writeD(seed.getLevel()); // seed level - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(1)); // reward 1 id - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(2)); // reward 2 id if (_castleCrops.containsKey(item.getId())) { @@ -85,9 +83,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket else { packet.writeD(0xFFFFFFFF); // manor - packet.writeQ(0x00); // buy residual - packet.writeQ(0x00); // buy price - packet.writeC(0x00); // reward + packet.writeQ(0); // buy residual + packet.writeQ(0); // buy price + packet.writeC(0); // reward } packet.writeQ(item.getCount()); // my crops } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index db4bccc928..b61d5b2301 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -40,7 +40,6 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { @@ -50,17 +49,17 @@ public class ExShowSentPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getReceiverName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); - packet.writeD(0x01); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(msg.isUnread() ? 1 : 0); + packet.writeD(1); + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(0); } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java index 0e4e9fd2ef..0dca57f2f8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java @@ -48,7 +48,6 @@ public class ExShowTerritory implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TERRITORY.writeId(packet); - packet.writeD(_vertices.size()); packet.writeD(_minZ); packet.writeD(_maxZ); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java index 4e284f82c5..86e1009bbf 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java @@ -46,7 +46,6 @@ public class ExShowTrace implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TRACE.writeId(packet); - packet.writeH(0); // type broken in H5 packet.writeD(0); // time broken in H5 packet.writeH(_locations.size()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java index 3245767ed7..836a5c9624 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java @@ -44,7 +44,6 @@ public class ExShowUsm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_USM.writeId(packet); - packet.writeD(_videoId); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java index 4acdffa842..1f1a14c31b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java @@ -34,7 +34,6 @@ public class ExShowVariationCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_CANCEL_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java index 3a2298019e..9870424e26 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java @@ -35,7 +35,6 @@ public class ExShowVariationMakeWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_MAKE_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java index 169827bab3..86211c8d97 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java @@ -44,10 +44,9 @@ public class ExSpawnEmitter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SPAWN_EMITTER.writeId(packet); - packet.writeD(_npcObjectId); packet.writeD(_playerObjectId); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java index 620800c1c4..534549b4fe 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java @@ -36,7 +36,6 @@ public class ExStartScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_START_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java index 0bd990cf34..babac59129 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java index 0e2689d598..d3e67afe99 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipObjId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java index 44b064113f..f5b3e1340f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java @@ -36,7 +36,6 @@ public class ExStopScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index 8029930c9a..367ac79be4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -66,7 +66,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket } OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet); - packet.writeD(_inventory); packet.writeD(_warehouse); // packet.writeD(_freight); // Removed with 152. diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java index 3293a5b557..57563ca2f9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java @@ -39,7 +39,6 @@ public class ExSubPledgeSkillAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUB_PLEDGET_SKILL_ADD.writeId(packet); - packet.writeD(_type); packet.writeD(_skillId); packet.writeD(_skillLevel); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java index d61dfa20ab..816d6f16a6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java @@ -97,7 +97,6 @@ public class ExSubjobInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUBJOB_INFO.writeId(packet); - packet.writeC(_type); packet.writeD(_currClassId); packet.writeD(_currRace); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java index 85616016c7..b7a152629d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java @@ -38,7 +38,6 @@ public class ExTacticalSign implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TACTICAL_SIGN.writeId(packet); - packet.writeD(_target.getObjectId()); packet.writeD(_tokenId); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java index 3486e6281d..9e03a8bd0a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java @@ -39,7 +39,6 @@ public class ExTeleportToLocationActivate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_TO_LOCATION_ACTIVATE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java index f860c2a40f..aab66c2e48 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java @@ -44,7 +44,6 @@ public class ExTryEnchantArtifactResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TRY_ENCHANT_ARTIFACT_RESULT.writeId(packet); - packet.writeD(_state); packet.writeD(_enchant); packet.writeD(0); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java index a214c53a0f..7bcddd964d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java @@ -27,6 +27,7 @@ public class ExUISetting implements IClientOutgoingPacket { public static final String UI_KEY_MAPPING_VAR = "UI_KEY_MAPPING"; public static final String SPLIT_VAR = " "; + private final byte[] _uiKeyMapping; public ExUISetting(Player player) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java index 187770cfc8..eff4285a8b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java @@ -37,7 +37,6 @@ public class ExUnReadMailCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_UN_READ_MAIL_COUNT.writeId(packet); - packet.writeD(_mailUnreadCount); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java index f992b3c937..e59c651371 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java @@ -41,7 +41,6 @@ public class ExUseSharedGroupItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USE_SHARED_GROUP_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeD(_grpId); packet.writeD(_remainingTime); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java index 474fcc5208..f49d451587 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class ExUserInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getTransformationId()); - final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); final boolean isInvisible = _player.isInvisible(); packet.writeD(abnormalVisualEffects.size() + (isInvisible ? 1 : 0)); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java index b841449ab3..1069a64e3e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java @@ -36,12 +36,9 @@ public class ExUserInfoCubic implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_CUBIC.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(_player.getCubics().size()); - _player.getCubics().keySet().forEach(packet::writeH); - packet.writeD(_player.getAgathionId()); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java index 3e4afb995b..6ef31d6117 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java @@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExUserInfoEquipSlot extends AbstractMaskPacket { private final Player _player; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -66,11 +65,9 @@ public class ExUserInfoEquipSlot extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_EQUIP_SLOT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(InventorySlot.values().length); // 152 packet.writeB(_masks); - final PlayerInventory inventory = _player.getInventory(); for (InventorySlot slot : InventorySlot.values()) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java index 3eb1cf9578..d655e48843 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java @@ -36,7 +36,6 @@ public class ExUserInfoInvenWeight implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_INVEN_WEIGHT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java index 91e0e92338..16aa81e9c0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java @@ -44,7 +44,6 @@ public class ExValidateLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java index 727267c9d5..50cb4025e4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java @@ -35,7 +35,6 @@ public class ExVariationCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_CANCEL_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java index 5cdc1b8d0e..4fde190ae2 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java @@ -32,14 +32,13 @@ public class ExVariationResult implements IClientOutgoingPacket { _option1 = option1; _option2 = option2; - _success = success ? 0x01 : 0x00; + _success = success ? 1 : 0; } @Override public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_RESULT.writeId(packet); - packet.writeD(_option1); packet.writeD(_option2); packet.writeD(_success); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java index db0acfd5ff..60fb57c0b3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java @@ -41,10 +41,9 @@ public class ExVitalityEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_EFFECT_INFO.writeId(packet); - packet.writeD(_points); packet.writeD(_vitalityBonus); // Vitality Bonus - packet.writeH(0x00); // Vitality additional bonus in % + packet.writeH(0); // Vitality additional bonus in % packet.writeH(_vitalityItemsRemaining); // How much vitality items remaining for use packet.writeH(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java index 3cd9d26602..9a401c2321 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java @@ -35,7 +35,6 @@ public class ExVitalityPointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_POINT_INFO.writeId(packet); - packet.writeD(_vitalityPoints); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java index 71baff96ea..c4c5539ca4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java @@ -45,7 +45,6 @@ public class ExVoteSystemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VOTE_SYSTEM_INFO.writeId(packet); - packet.writeD(_recomLeft); packet.writeD(_recomHave); packet.writeD(_bonusTime); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java index 21411f5abc..452b0dc43a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java @@ -37,7 +37,6 @@ public class ExWorldChatCnt implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_WORLD_CHAT_CNT.writeId(packet); - packet.writeD(_points); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java index 5f935fe0dc..dc9c2288f8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java @@ -79,19 +79,17 @@ public class FakePlayerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // vehicleId + packet.writeD(0); // vehicleId packet.writeD(_objId); packet.writeS(_npc.getName()); - packet.writeH(_npc.getRace().ordinal()); - packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 0x01 : 0x00); + packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 1 : 0); packet.writeD(_fpcHolder.getClassId()); - - packet.writeD(0x00); // Inventory.PAPERDOLL_UNDER + packet.writeD(0); // Inventory.PAPERDOLL_UNDER packet.writeD(_fpcHolder.getEquipHead()); packet.writeD(_fpcHolder.getEquipRHand()); packet.writeD(_fpcHolder.getEquipLHand()); @@ -103,28 +101,22 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_fpcHolder.getEquipRHand()); // dual hand packet.writeD(_fpcHolder.getEquipHair()); packet.writeD(_fpcHolder.getEquipHair2()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderAugument()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } - packet.writeC(_fpcHolder.getArmorEnchantLevel()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderVisualId()) { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeC(_npc.getScriptValue()); // getPvpFlag() packet.writeD(_npc.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -135,16 +127,12 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_npc.getCollisionRadius()); packet.writeF(_npc.getCollisionHeight()); - packet.writeD(_fpcHolder.getHair()); packet.writeD(_fpcHolder.getHairColor()); packet.writeD(_fpcHolder.getFace()); - packet.writeS(_npc.getTemplate().getTitle()); - if (_clan != null) { packet.writeD(_clan.getId()); @@ -154,71 +142,51 @@ public class FakePlayerInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - - packet.writeC(0x01); // isSitting() ? 0x00 : 0x01 (at some initial tests it worked) - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); - packet.writeC(_npc.isInCombat() ? 0x01 : 0x00); - - packet.writeC(_npc.isAlikeDead() ? 0x01 : 0x00); - - packet.writeC(_npc.isInvisible() ? 0x01 : 0x00); - - packet.writeC(0x00); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount - packet.writeC(0x00); // getPrivateStoreType().getId() - - packet.writeH(0x00); // getCubics().size() + packet.writeC(1); // isSitting() ? 0 : 1 (at some initial tests it worked) + packet.writeC(_npc.isRunning() ? 1 : 0); + packet.writeC(_npc.isInCombat() ? 1 : 0); + packet.writeC(_npc.isAlikeDead() ? 1 : 0); + packet.writeC(_npc.isInvisible() ? 1 : 0); + packet.writeC(0); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount + packet.writeC(0); // getPrivateStoreType().getId() + packet.writeH(0); // getCubics().size() // getCubics().keySet().forEach(packet::writeH); - packet.writeC(0x00); - + packet.writeC(0); packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : 0); packet.writeH(_fpcHolder.getRecommends()); - packet.writeD(0x00); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 - + packet.writeD(0); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 packet.writeD(_fpcHolder.getClassId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(_fpcHolder.getWeaponEnchantLevel()); // isMounted() ? 0 : _enchantLevel - packet.writeC(_npc.getTeam().getId()); - - packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0x00); + packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0); packet.writeC(_fpcHolder.getNobleLevel()); - packet.writeC(_fpcHolder.isHero() ? 0x01 : 0x00); - - packet.writeC(_fpcHolder.isFishing() ? 0x01 : 0x00); - + packet.writeC(_fpcHolder.isHero() ? 1 : 0); + packet.writeC(_fpcHolder.isFishing() ? 1 : 0); packet.writeD(_fpcHolder.getBaitLocationX()); packet.writeD(_fpcHolder.getBaitLocationY()); packet.writeD(_fpcHolder.getBaitLocationZ()); - packet.writeD(_fpcHolder.getNameColor()); - packet.writeD(_heading); - packet.writeC(_fpcHolder.getPledgeStatus()); - packet.writeH(0x00); // getPledgeType() - + packet.writeH(0); // getPledgeType() packet.writeD(_fpcHolder.getTitleColor()); - - packet.writeC(0x00); // isCursedWeaponEquipped - - packet.writeD(0x00); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 - packet.writeD(0x00); // getTransformationDisplayId() + packet.writeC(0); // isCursedWeaponEquipped + packet.writeD(0); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 + packet.writeD(0); // getTransformationDisplayId() packet.writeD(_fpcHolder.getAgathionId()); - - packet.writeC(0x00); - - packet.writeD(0x00); // getCurrentCp() + packet.writeC(0); + packet.writeD(0); // getCurrentCp() packet.writeD(_npc.getMaxHp()); packet.writeD((int) Math.round(_npc.getCurrentHp())); packet.writeD(_npc.getMaxMp()); packet.writeD((int) Math.round(_npc.getCurrentMp())); - - packet.writeC(0x00); + packet.writeC(0); final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) @@ -229,9 +197,9 @@ public class FakePlayerInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(0x00); // cocPlayer.getPosition() - packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 0x01 : 0x00); - packet.writeC(0x00); // Used Ability Points + packet.writeC(0); // cocPlayer.getPosition() + packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 1 : 0); + packet.writeC(0); // Used Ability Points return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java index ae088538da..03223c8a3e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java @@ -62,7 +62,6 @@ public class FlyToLocation implements IClientOutgoingPacket _destY = destY; _destZ = destZ; _type = type; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -82,7 +81,6 @@ public class FlyToLocation implements IClientOutgoingPacket _flySpeed = flySpeed; _flyDelay = flyDelay; _animationSpeed = animationSpeed; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -103,7 +101,6 @@ public class FlyToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FLY_TO_LOCATION.writeId(packet); - packet.writeD(_chaObjId); packet.writeD(_destX); packet.writeD(_destY); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java index 1e52b0ef72..471d70f791 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java @@ -35,8 +35,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x01); + packet.writeC(1); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 81a384642c..fb7572fc5d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -50,7 +50,6 @@ public class GMHennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GMHENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON @@ -64,19 +63,19 @@ public class GMHennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(0x01); + packet.writeD(1); } if (_player.getHenna(4) != null) { packet.writeD(_player.getHenna(4).getDyeId()); - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 1 : 0); } else { - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid } return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java index 38ca4c7be0..59bf0d9d93 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java @@ -38,7 +38,6 @@ public class GMHide implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_HIDE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index a828a26584..117f9cf67d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -50,7 +50,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -79,28 +78,24 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); packet.writeD(_player.getPkKills()); - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollObjectId(slot)); } - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); } - for (int slot = 0; slot < 11; slot++) { final VariationInstance augment = _player.getInventory().getPaperdollAugmentation(slot); packet.writeD(augment != null ? augment.getOption1Id() : 0); // Confirmed packet.writeD(augment != null ? augment.getOption2Id() : 0); // Confirmed } - packet.writeC(_player.getInventory().getTalismanSlots()); // CT2.3 packet.writeC(_player.getInventory().canEquipCloak() ? 1 : 0); // CT2.3 - packet.writeD(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeH(0); packet.writeD(_player.getPAtk()); packet.writeD(_player.getPAtkSpd()); packet.writeD(_player.getPDef()); @@ -108,18 +103,14 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAccuracy()); packet.writeD(_player.getCriticalHit()); packet.writeD(_player.getMAtk()); - packet.writeD(_player.getMAtkSpd()); packet.writeD(_player.getPAtkSpd()); - packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicEvasionRate()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name packet.writeD(_player.getReputation()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -135,8 +126,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeD(_player.isGM() ? 0x01 : 0x00); // builder level - + packet.writeD(_player.isGM() ? 1 : 0); // builder level packet.writeS(_player.getTitle()); packet.writeD(_player.getClanId()); // pledge id packet.writeD(_player.getClanCrestId()); // pledge crest id @@ -146,26 +136,19 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeC(_player.getCreateItemLevel() > 0 ? 1 : 0); packet.writeD(_player.getPkKills()); packet.writeD(_player.getPvpKills()); - packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); - - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeC(321); - packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window - packet.writeC(_player.getNobleLevel()); - packet.writeC(_player.isHero() ? 0x01 : 0x00); - + packet.writeC(_player.isHero() ? 1 : 0); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); - final AttributeType attackAttribute = _player.getAttackElement(); packet.writeH(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); @@ -175,8 +158,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket } packet.writeD(_player.getFame()); packet.writeD(_player.getVitalityPoints()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index 1d88596096..552b6e6168 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -37,14 +37,12 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_player.getName()); packet.writeD(_clan.getId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); @@ -52,15 +50,14 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 packet.writeD(_clan.getAllyCrestId()); // c2 packet.writeD(_clan.isAtWar() ? 1 : 0); // c3 - packet.writeD(0x00); // T3 Unknown - + packet.writeD(0); // T3 Unknown packet.writeD(_clan.getMembers().size()); for (ClanMember member : _clan.getMembers()) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java index 93af10e254..3c155ff816 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -38,10 +38,8 @@ public class GMViewSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_SKILL_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_skills.size()); - final boolean isDisabled = (_player.getClan() != null) && (_player.getClan().getReputationScore() < 0); for (Skill skill : _skills) { @@ -49,7 +47,7 @@ public class GMViewSkillInfo implements IClientOutgoingPacket packet.writeH(skill.getDisplayLevel()); packet.writeH(skill.getSubLevel()); packet.writeD(skill.getDisplayId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(isDisabled && skill.isClanSkill() ? 1 : 0); packet.writeC(skill.isEnchantable() ? 1 : 0); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index f49138fafe..c909d5e6e1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -51,7 +51,6 @@ public class GMViewWarehouseWithdrawList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_WAREHOUSE_WITHDRAW_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java index d8c273f914..449271993b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java @@ -35,7 +35,6 @@ public class GameGuardQuery implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GAME_GUARD_QUERY.writeId(packet); - packet.writeD(0x27533DD9); packet.writeD(0x2E72A51D); packet.writeD(0x2017038B); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index b0c011b696..037b2e6b6b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -35,10 +35,8 @@ public class GetItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ITEM.writeId(packet); - packet.writeD(_playerId); packet.writeD(_item.getObjectId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java index f8c6126c87..5f4d7bf3ca 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java @@ -50,7 +50,6 @@ public class GetOffVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_OFF_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_x); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java index ffa8d5f310..77d1e6ba28 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java @@ -45,7 +45,6 @@ public class GetOnVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ON_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java index e5dcb9ded6..b1f5b588f9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java @@ -44,14 +44,13 @@ public class GmViewQuestInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_QUEST_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeH(_questList.size()); // quest count - for (Quest quest : _questList) { final QuestState qs = _player.getQuestState(quest.getName()); packet.writeD(quest.getId()); packet.writeD(qs == null ? 0 : qs.getCond()); } - packet.writeH(0x00); // some size + packet.writeH(0); // some size // for size; ddQQ return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 395487097c..4309e2d74f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -51,7 +51,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeQ(_player.getAdena()); // activeChar current amount of Adena packet.writeD(3); // available equip slot packet.writeD(_hennaEquipList.size()); - for (Henna henna : _hennaEquipList) { // Player must have at least one dye in inventory @@ -62,8 +61,8 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); // item Id of the dye packet.writeQ(henna.getWearCount()); // amount of dyes required packet.writeQ(henna.getWearFee()); // amount of Adena required - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not - packet.writeD(0x00); // TODO: Find me! + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // meet the requirement or not + packet.writeD(0); // TODO: Find me! } } return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 30dc837721..b84d2283e8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -51,7 +51,6 @@ public class HennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON @@ -65,9 +64,8 @@ public class HennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); } - final Henna premium = _player.getHenna(4); if (premium != null) { @@ -77,16 +75,15 @@ public class HennaInfo implements IClientOutgoingPacket final long currentTime = Chronos.currentTimeMillis(); duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000; } - packet.writeD(premium.getDyeId()); packet.writeD(duration); // Premium Slot Dye Time Left - packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 1 : 0); } else { - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid } return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index cf3d83263f..5b77709720 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -40,12 +40,11 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_ITEM_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getWearCount()); // total amount of dye require packet.writeQ(_henna.getWearFee()); // total amount of Adena require to draw symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to draw or not 0 is false and 1 is true + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to draw or not 0 is false and 1 is true packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() + _player.getHennaValue(BaseStat.INT)); // equip INT @@ -63,7 +62,7 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket packet.writeH(_player.getLUC() + _player.getHennaValue(BaseStat.LUC)); // equip LUC packet.writeD(_player.getCHA()); // current CHA packet.writeH(_player.getCHA() + _player.getHennaValue(BaseStat.CHA)); // equip CHA - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index cb1379ac29..fc93d02a73 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -40,12 +40,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getCancelCount()); // total amount of dye require packet.writeQ(_henna.getCancelFee()); // total amount of Adena require to remove symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to remove or not + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to remove or not packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() - _player.getHennaValue(BaseStat.INT)); // equip INT @@ -63,7 +62,7 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket packet.writeH(_player.getLUC() - _player.getHennaValue(BaseStat.LUC)); // equip LUC packet.writeD(_player.getCHA()); // current CHA packet.writeH(_player.getCHA() - _player.getHennaValue(BaseStat.CHA)); // equip CHA - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 844fad86c7..452d354ac4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -39,7 +39,7 @@ public class HennaRemoveList implements IClientOutgoingPacket OutgoingPackets.HENNA_UNEQUIP_LIST.writeId(packet); packet.writeQ(_player.getAdena()); final boolean premiumSlotEnabled = _player.getHenna(4) != null; - packet.writeD(premiumSlotEnabled ? 0x04 : 0x03); // seems to be max size + packet.writeD(premiumSlotEnabled ? 4 : 3); // seems to be max size packet.writeD((premiumSlotEnabled ? 4 : 3) - _player.getHennaEmptySlots()); // slots used for (Henna henna : _player.getHennaList()) { @@ -49,8 +49,8 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); packet.writeQ(henna.getCancelCount()); packet.writeQ(henna.getCancelFee()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index b5c8628b50..f2a9cf1822 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -89,14 +89,12 @@ public interface IClientOutgoingPacket extends IOutgoingPacket Inventory.PAPERDOLL_ARTIFACT20, Inventory.PAPERDOLL_ARTIFACT21, }; - int[] PAPERDOLL_ORDER_AUGMENT = new int[] { Inventory.PAPERDOLL_RHAND, Inventory.PAPERDOLL_LHAND, Inventory.PAPERDOLL_RHAND }; - int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 0c54e810f0..3378827f34 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -46,7 +46,6 @@ public class InventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index c4598a72e6..cef69ecb6f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -59,8 +59,8 @@ public class ItemList extends AbstractItemPacket } else { - packet.writeC(0x01); // _showWindow ? 0x01 : 0x00 - packet.writeD(0x00); + packet.writeC(1); // _showWindow ? 1 : 0 + packet.writeD(0); packet.writeD(_items.size()); } writeInventoryBlock(packet, _player.getInventory()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java index b32b4df4a3..c3b9918230 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java @@ -32,9 +32,8 @@ public class JoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PARTY.writeId(packet); - packet.writeD(_response); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java index 65e06efeb7..f347f7efcd 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java @@ -32,7 +32,6 @@ public class JoinPledge implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PLEDGE.writeId(packet); - packet.writeD(_pledgeId); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index 96f6d7c34d..996622b9e9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -35,17 +35,16 @@ public class KeyPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VERSION_CHECK.writeId(packet); - packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok for (int i = 0; i < 8; i++) { packet.writeC(_key[i]); // key } - packet.writeD(0x01); + packet.writeD(1); packet.writeD(Config.SERVER_ID); // server id - packet.writeC(0x01); - packet.writeD(0x00); // obfuscation key - packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 0x01 : 0x00); // isClassic + packet.writeC(1); + packet.writeD(0); // obfuscation key + packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 1 : 0); // isClassic return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java index 484c10f0c4..62424fd03a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java @@ -40,7 +40,6 @@ public class L2FriendSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_SAY.writeId(packet); - packet.writeD(0); // ?? packet.writeS(_receiver); packet.writeS(_sender); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java index b875edb772..790d599b5b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java @@ -32,11 +32,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ListPartyWaiting implements IClientOutgoingPacket { + private static final int NUM_PER_PAGE = 64; + private final List _rooms = new LinkedList<>(); private final int _size; - private static final int NUM_PER_PAGE = 64; - public ListPartyWaiting(PartyMatchingRoomLevelType type, int location, int page, int requestorLevel) { final List rooms = MatchingRoomManager.getInstance().getPartyMathchingRooms(location, type, requestorLevel); @@ -57,7 +57,6 @@ public class ListPartyWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_PARTY_WATING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java index 4f8f9adc64..bb0ac61dbd 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java @@ -54,7 +54,6 @@ public class LoginFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LOGIN_FAIL.writeId(packet); - packet.writeD(_success); packet.writeD(_reason); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java index 18a522c315..6743e3e66f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java @@ -32,7 +32,6 @@ public class MagicSkillCanceld implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_CANCELED.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java index d56de10079..7ab29cc1a8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java @@ -66,7 +66,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // MagicSkillUse castingType packet.writeD(_objectId); packet.writeD(_skillId); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java index 3df8463279..a86626cfa6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java @@ -84,7 +84,6 @@ public class MagicSkillUse implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_USE.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // Casting bar type: 0 - default, 1 - default up, 2 - blue, 3 - green, 4 - red. packet.writeD(_creature.getObjectId()); packet.writeD(_target.getObjectId()); @@ -111,7 +110,7 @@ public class MagicSkillUse implements IClientOutgoingPacket packet.writeD(_target.getX()); packet.writeD(_target.getY()); packet.writeD(_target.getZ()); - packet.writeD(_actionId >= 0 ? 0x01 : 0x00); // 1 when ID from RequestActionUse is used + packet.writeD(_actionId >= 0 ? 1 : 0); // 1 when ID from RequestActionUse is used packet.writeD(_actionId >= 0 ? _actionId : 0); // ID from RequestActionUse. Used to set cooldown on summon skills. return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java index 6b710c692e..12e2488f24 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java @@ -37,11 +37,9 @@ public class ManagePledgePower implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet); - packet.writeD(_rank); packet.writeD(_action); packet.writeD(_clan.getRankPrivs(_rank).getBitmask()); - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 95f4b6f201..4e2ab3f00b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -42,11 +42,9 @@ public class MonRaceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MON_RACE_INFO.writeId(packet); - packet.writeD(_unknown1); packet.writeD(_unknown2); - packet.writeD(0x08); - + packet.writeD(8); for (int i = 0; i < 8; i++) { packet.writeD(_monsters[i].getObjectId()); // npcObjectID @@ -68,7 +66,7 @@ public class MonRaceInfo implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java index 0093b3edc9..e6386921ff 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java @@ -45,13 +45,10 @@ public class MoveToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_xDst); packet.writeD(_yDst); packet.writeD(_zDst); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java index b1fb3ea003..59103c6c4c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java @@ -48,7 +48,6 @@ public class MoveToLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java index 30ff3c96af..aa261f924f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java @@ -50,11 +50,9 @@ public class MoveToPawn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_PAWN.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetId); packet.writeD(_distance); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index e1da19cc8f..50ff0191b8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -58,18 +58,16 @@ public class MultiSellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.MULTI_SELL_LIST.writeId(packet); - - packet.writeC(0x00); // Helios + packet.writeC(0); // Helios packet.writeD(_list.getId()); // list id - packet.writeC(0x00); // GOD Unknown + packet.writeC(0); // GOD Unknown packet.writeD(1 + (_index / PAGE_SIZE)); // page started from 1 - packet.writeD(_finished ? 0x01 : 0x00); // finished + packet.writeD(_finished ? 1 : 0); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - packet.writeC(0x00); // Grand Crusade - packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window - packet.writeD(0x20); // Helios - Always 32 - + packet.writeC(0); // Grand Crusade + packet.writeC(_list.isChanceMultisell() ? 1 : 0); // new multisell window + packet.writeD(32); // Helios - Always 32 while (_size-- > 0) { ItemInfo itemEnchantment = _list.getItemEnchantment(_index); @@ -86,19 +84,15 @@ public class MultiSellList extends AbstractItemPacket } } } - packet.writeD(_index); // Entry ID. Start from 1. packet.writeC(entry.isStackable() ? 1 : 0); - // Those values will be passed down to MultiSellChoose packet. packet.writeH(itemEnchantment != null ? itemEnchantment.getEnchantLevel() : 0); // enchant level writeItemAugment(packet, itemEnchantment); writeItemElemental(packet, itemEnchantment); writeItemEnsoulOptions(packet, itemEnchantment); - packet.writeH(entry.getProducts().size()); packet.writeH(entry.getIngredients().size()); - for (ItemChanceHolder product : entry.getProducts()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(product.getId()); @@ -122,7 +116,6 @@ public class MultiSellList extends AbstractItemPacket writeItemElemental(packet, displayItemEnchantment); writeItemEnsoulOptions(packet, displayItemEnchantment); } - for (ItemChanceHolder ingredient : entry.getIngredients()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(ingredient.getId()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java index 6e85f5348c..cd46aac3aa 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java @@ -45,11 +45,10 @@ public class MyTargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MY_TARGET_SELECTED.writeId(packet); - - packet.writeD(0x01); // Grand Crusade + packet.writeD(1); // Grand Crusade packet.writeD(_objectId); packet.writeH(_color); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java index 1901ad1297..166c5c1e00 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java @@ -36,7 +36,6 @@ public class NewCharacterSuccess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NEW_CHARACTER_SUCCESS.writeId(packet); - packet.writeD(_chars.size()); for (PlayerTemplate chr : _chars) { @@ -44,31 +43,24 @@ public class NewCharacterSuccess implements IClientOutgoingPacket { continue; } - // TODO: Unhardcode these packet.writeD(chr.getRace().ordinal()); packet.writeD(chr.getClassId().getId()); - packet.writeD(99); packet.writeD(chr.getBaseSTR()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseDEX()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseCON()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseINT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseWIT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseMEN()); packet.writeD(1); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java index be1605f679..6061ea26ef 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java @@ -38,7 +38,6 @@ public class NicknameChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NICK_NAME_CHANGED.writeId(packet); - packet.writeD(_objectId); packet.writeS(_title); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index f9cd107e2c..3e4837b4a4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -54,24 +54,20 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public NpcHtmlMessage(int npcObjId, int itemId) { super(npcObjId); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } public NpcHtmlMessage(int npcObjId, int itemId, String html) { super(npcObjId, html); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } @@ -79,11 +75,10 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java index 61f195e35d..05489103cb 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java @@ -47,10 +47,8 @@ public class NpcInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -58,7 +56,6 @@ public class NpcInfo extends AbstractMaskPacket private int _clanId = 0; private int _statusMask = 0; private final Set _abnormalVisualEffects; - private String[] _localisation; public void setLang(String lang) @@ -101,112 +98,90 @@ public class NpcInfo extends AbstractMaskPacket { addComponentType(NpcInfoType.HEADING); } - if ((npc.getStat().getPAtkSpd() > 0) || (npc.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (npc.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((npc.getLeftHandItem() > 0) || (npc.getRightHandItem() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (npc.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (npc.getDisplayEffect() > 0) { addComponentType(NpcInfoType.DISPLAY_EFFECT); } - if (npc.isInsideZone(ZoneId.WATER) || npc.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (npc.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (npc.getCloneObjId() > 0) { addComponentType(NpcInfoType.CLONE); } - if (npc.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (npc.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (npc.getCurrentHp() <= npc.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (npc.getCurrentMp() <= npc.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (npc.getTemplate().isUsingServerSideName()) { addComponentType(NpcInfoType.NAME); } - if (npc.getTemplate().isUsingServerSideTitle() || (npc.isMonster() && (Config.SHOW_NPC_LEVEL || Config.SHOW_NPC_AGGRESSION)) || npc.isChampion() || npc.isTrap()) { addComponentType(NpcInfoType.TITLE); } - if (npc.getNameString() != null) { addComponentType(NpcInfoType.NAME_NPCSTRINGID); } - if (npc.getTitleString() != null) { addComponentType(NpcInfoType.TITLE_NPCSTRINGID); } - if (_npc.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (!_abnormalVisualEffects.isEmpty() || npc.isInvisible()) { addComponentType(NpcInfoType.ABNORMALS); } - if (npc.getEnchantEffect() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (npc.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (npc.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (npc.getClanId() > 0) { final Clan clan = ClanTable.getInstance().getClan(npc.getClanId()); @@ -220,14 +195,11 @@ public class NpcInfo extends AbstractMaskPacket addComponentType(NpcInfoType.CLAN); } } - addComponentType(NpcInfoType.COLOR_EFFECT); - if (npc.getPvpFlag() > 0) { addComponentType(NpcInfoType.PVP_FLAG); } - // TODO: Confirm me if (npc.isInCombat()) { @@ -245,8 +217,7 @@ public class NpcInfo extends AbstractMaskPacket { _statusMask |= 0x08; } - - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -296,27 +267,23 @@ public class NpcInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO.writeId(packet); - packet.writeD(_npc.getObjectId()); - packet.writeC(_npc.isShowSummonAnimation() ? 0x02 : 0x00); // // 0=teleported 1=default 2=summoned + packet.writeC(_npc.isShowSummonAnimation() ? 2 : 0); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 0x01 : 0x00); + packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { String title = _npc.getTitle(); - // Localisation related. if ((_localisation != null) && !_localisation[1].equals("")) { @@ -329,10 +296,8 @@ public class NpcInfo extends AbstractMaskPacket title = title.replace(NpcData.getInstance().getTemplate(_npc.getId()).getTitle(), _localisation[1]); } } - packet.writeS(title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -351,7 +316,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -366,20 +331,20 @@ public class NpcInfo extends AbstractMaskPacket if (containsMask(NpcInfoType.EQUIPPED)) { packet.writeD(_npc.getRightHandItem()); - packet.writeD(0x00); // Armor id? + packet.writeD(0); // Armor id? packet.writeD(_npc.getLeftHandItem()); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_npc.isDead() ? 0x00 : 0x01); + packet.writeC(_npc.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); + packet.writeC(_npc.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 0x01 : _npc.isFlying() ? 0x02 : 0x00); + packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -391,7 +356,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_npc.isFlying() ? 0x01 : 0x00); + packet.writeD(_npc.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { @@ -427,12 +392,12 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(0x00); // 2 - do some animation on spawn + packet.writeC(0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -464,12 +429,10 @@ public class NpcInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java index c95a8e5274..923e9cebad 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class NpcInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_npc.getObjectId()); packet.writeD(_npc.getTransformationDisplayId()); - final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size()); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java index a294edc57a..2a0ba41eeb 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java @@ -38,7 +38,6 @@ public class NpcQuestHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NPC_QUEST_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_questId); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java index d3328ade97..fc6d0d4a3a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java @@ -106,7 +106,6 @@ public class NpcSay implements IClientOutgoingPacket { _parameters = new ArrayList<>(); } - for (String item : params) { if ((item != null) && (item.length() > 0)) @@ -127,11 +126,9 @@ public class NpcSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_SAY.writeId(packet); - packet.writeD(_objectId); packet.writeD(_textType.getClientId()); packet.writeD(_npcId); - // Localisation related. if (_lang != null) { @@ -147,7 +144,6 @@ public class NpcSay implements IClientOutgoingPacket } } } - packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java index 356e3f48a9..ac61f9d247 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java @@ -33,11 +33,10 @@ public class ObservationMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_START.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me packet.writeD(0xc0); // TODO: Find me return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java index 5c0a0766b3..896ccea02b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java @@ -33,7 +33,6 @@ public class ObservationReturn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_END.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java index c2f7ab404f..173772c870 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java @@ -37,7 +37,6 @@ public class OnEventTrigger implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EVENT_TRIGGER.writeId(packet); - packet.writeD(_emitterId); packet.writeC(_enabled); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index fbb5c84dfe..37d4fea9cf 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -45,7 +45,6 @@ public class PackageSendableList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java index a53f589386..e24d63f717 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java @@ -39,7 +39,6 @@ public class PackageToList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_TO_LIST.writeId(packet); - packet.writeD(_players.size()); for (Entry entry : _players.entrySet()) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 655c7abcd1..44b23b37f4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -55,7 +55,6 @@ public class PartyMemberPosition implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); - packet.writeD(locations.size()); for (Entry entry : locations.entrySet()) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java index 9e275ec246..c9d3595037 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java @@ -36,7 +36,6 @@ public class PartyRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java index b9c7d06769..8c97cac6b5 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java @@ -36,12 +36,10 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ADD.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); // c3 packet.writeD(_party.getDistributionType().getId()); // c3 packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); - packet.writeD((int) _member.getCurrentCp()); // c4 packet.writeD(_member.getMaxCp()); // c4 packet.writeD((int) _member.getCurrentHp()); @@ -51,7 +49,7 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket packet.writeD(_member.getVitalityPoints()); packet.writeC(_member.getLevel()); packet.writeH(_member.getClassId().getId()); - packet.writeC(0x00); + packet.writeC(0); packet.writeH(_member.getRace().ordinal()); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java index 65d0c60c2e..5ad91f5463 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java @@ -37,21 +37,17 @@ public class PartySmallWindowAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ALL.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); packet.writeC(_party.getDistributionType().getId()); packet.writeC(_party.getMemberCount() - 1); - for (Player member : _party.getMembers()) { if ((member != null) && (member != _exclude)) { packet.writeD(member.getObjectId()); packet.writeS(member.getName()); - packet.writeD((int) member.getCurrentCp()); // c4 packet.writeD(member.getMaxCp()); // c4 - packet.writeD((int) member.getCurrentHp()); packet.writeD(member.getMaxHp()); packet.writeD((int) member.getCurrentMp()); @@ -59,7 +55,7 @@ public class PartySmallWindowAll implements IClientOutgoingPacket packet.writeD(member.getVitalityPoints()); packet.writeC(member.getLevel()); packet.writeH(member.getClassId().getId()); - packet.writeC(0x01); // Unk + packet.writeC(1); // Unk packet.writeH(member.getRace().ordinal()); final Summon pet = member.getPet(); packet.writeD(member.getServitors().size() + (pet != null ? 1 : 0)); // Summon size, one only atm diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java index 94a8a5a2ce..09ce132af4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java @@ -33,7 +33,6 @@ public class PartySmallWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_DELETE.writeId(packet); - packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java index c53c6c7779..e9ea2efbbe 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java @@ -42,7 +42,6 @@ public class PartySmallWindowUpdate extends AbstractMaskPacket _summon.getStat().getExp()) { packet.writeQ(_summon.getStat().getExp()); // 0% absolute value @@ -160,9 +148,7 @@ public class PetInfo implements IClientOutgoingPacket { packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value } - packet.writeQ(_summon.getExpForNextLevel()); // 100% absoulte value - packet.writeD(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight packet.writeD(_summon.getMaxLoad()); // max weight it can carry packet.writeD(_summon.getPAtk()); // patk @@ -178,25 +164,20 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD((int) _summon.getStat().getMoveSpeed()); // speed packet.writeD(_summon.getPAtkSpd()); // atkspeed packet.writeD(_summon.getMAtkSpd()); // casting speed - packet.writeC(0); // TODO: Check me, might be ride status packet.writeC(_summon.getTeam().getId()); // Confirmed packet.writeC(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed packet.writeC(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed - - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. - + packet.writeD(0); // TODO: Find me + packet.writeD(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. packet.writeC(_summon.getOwner().getSummonPoints()); // Used Summon Points packet.writeC(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points - final Set aves = _summon.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeH(aves.size()); // Confirmed for (AbnormalVisualEffect ave : aves) { packet.writeH(ave.getClientId()); // Confirmed } - packet.writeC(_statusMask); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 5b43daa74b..1f60ec39d1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -46,7 +46,6 @@ public class PetInventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.PET_INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index e4cf35779f..16dc83b7ed 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -35,7 +35,6 @@ public class PetItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java index fdb00ddbb1..913f65d470 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java @@ -38,7 +38,6 @@ public class PetStatusShow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_SHOW.writeId(packet); - packet.writeD(_summonType); packet.writeD(_summonObjectId); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 25c2c74292..823a8c405a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -52,7 +52,6 @@ public class PetStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_UPDATE.writeId(packet); - packet.writeD(_summon.getSummonType()); packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getX()); @@ -69,7 +68,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket packet.writeQ(_summon.getStat().getExp()); packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value packet.writeQ(_summon.getExpForNextLevel()); // 100% absolute value - packet.writeD(0x01); // TODO: Find me! + packet.writeD(1); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java index 4bc3570779..0898b01f67 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java @@ -63,7 +63,6 @@ public class PlaySound implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLAY_SOUND.writeId(packet); - packet.writeD(_unknown1); // unknown 0 for quest and ship; packet.writeS(_soundFile); packet.writeD(_unknown3); // unknown 0 for quest; 1 for ship; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java index fbe57d4aaf..5108fe7e1b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java @@ -44,7 +44,6 @@ public class PledgeCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java index aa11b1213e..6805f64d7c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java @@ -34,7 +34,6 @@ public class PledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_INFO.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getId()); packet.writeS(_clan.getName()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java index 7ae6a0d284..b28dbf33c3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java @@ -36,7 +36,6 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_MEMBER_INFO.writeId(packet); - packet.writeD(_member.getPledgeType()); packet.writeS(_member.getName()); packet.writeS(_member.getTitle()); // title diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java index eefd482979..6aa5067c8f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java @@ -36,7 +36,6 @@ public class PledgeReceivePowerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_POWER_INFO.writeId(packet); - packet.writeD(_member.getPowerGrade()); // power grade packet.writeS(_member.getName()); packet.writeD(_member.getClan().getRankPrivs(_member.getPowerGrade()).getBitmask()); // privileges diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 79d478aff9..f9387ea1d8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -40,8 +40,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_SUB_PLEDGE_CREATED.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); packet.writeD(_subPledge.getId()); packet.writeS(_subPledge.getName()); packet.writeS(getLeaderName()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java index 4d0efeb82a..7649947064 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java @@ -43,7 +43,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(packet); - packet.writeD(_tab); // page packet.writeD(_clanList.size()); for (ClanWar clanWar : _clanList) @@ -53,7 +52,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket { continue; } - packet.writeS(clan.getName()); packet.writeD(clanWar.getState().ordinal()); // type: 0 = Declaration, 1 = Blood Declaration, 2 = In War, 3 = Victory, 4 = Defeat, 5 = Tie, 6 = Error packet.writeD(clanWar.getRemainingTime()); // Time if friends to start remaining diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java index 2cbbdbf046..80d10fcb66 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java @@ -34,26 +34,25 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_INFO_UPDATE.writeId(packet); - // sending empty data so client will ask all the info in response ;) packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getLevel()); // clan level packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); // castle state ? + packet.writeD(0); // castle state ? packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); // clan reputation score - packet.writeD(0x00); // ? - packet.writeD(0x00); // ? + packet.writeD(0); // ? + packet.writeD(0); // ? packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); // c5 packet.writeD(_clan.getAllyCrestId()); // c5 packet.writeD(_clan.isAtWar() ? 1 : 0); // c5 - packet.writeD(0x00); // TODO: Find me! - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java index ae26e50dbb..2fa9f26d4a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java @@ -51,12 +51,11 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ADD.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); - packet.writeD(0x00); - packet.writeD(0x01); + packet.writeD(0); + packet.writeD(1); packet.writeD(_isOnline); // 1 = online 0 = offline packet.writeD(_pledgeType); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index 971d88c53d..8880e7853d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -57,30 +57,27 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(packet); - - packet.writeD(0x00); // _isSubPledge + packet.writeD(0); // _isSubPledge packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_name); packet.writeS(_leaderName); - packet.writeD(_clan.getCrestId()); // crest id .. is used again packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); // 0 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(0); // 0 packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.isAtWar() ? 1 : 0); // new c3 - packet.writeD(0x00); // Territory castle ID - + packet.writeD(0); // Territory castle ID packet.writeD(_members.size()); for (ClanMember m : _members) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java index 0fd387e419..154bcc610d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java @@ -32,7 +32,6 @@ public class PledgeShowMemberListDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_DELETE.writeId(packet); - packet.writeS(_player); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java index 9789e1e951..beefd2b6bd 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java @@ -50,7 +50,6 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index 4e89797e45..09f70ea024 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -62,14 +62,14 @@ public class PledgeSkillList implements IClientOutgoingPacket { packet.writeD(sk.getDisplayId()); packet.writeH(sk.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } for (SubPledgeSkill sk : _subSkills) { packet.writeD(sk._subType); // Clan Sub-unit types packet.writeD(sk._skillId); packet.writeH(sk._skillLevel); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java index f3b8d4c26c..a94601294f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java @@ -37,7 +37,6 @@ public class PledgeSkillListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST_ADD.writeId(packet); - packet.writeD(_id); packet.writeD(_level); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java index 9e1b4843ac..5f32f2bf54 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java @@ -33,15 +33,14 @@ public class PledgeStatusChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_STATUS_CHANGED.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getLeaderId()); packet.writeD(_clan.getId()); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getAllyId()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.getCrestLargeId()); - packet.writeD(0x00); // pledge type ? + packet.writeD(0); // pledge type ? return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java index 5b56d0b28d..41d0f9f7d8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java @@ -44,12 +44,10 @@ public class PrivateStoreListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_LIST.writeId(packet); - packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); // Viewer's item count? + packet.writeD(0); // Viewer's item count? packet.writeD(_items.size()); - int slotNumber = 0; for (TradeItem item : _items) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 67b6ba8d94..d72050283e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -43,11 +43,10 @@ public class PrivateStoreListSell extends AbstractItemPacket else { OutgoingPackets.PRIVATE_STORE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index d05590cbde..df056c2e43 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -60,13 +60,13 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket { packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); + packet.writeD(0); for (Item item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item2 : _buyList) { writeItem(packet, item2); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index d8768104a4..6bbabb282b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -63,13 +63,13 @@ public class PrivateStoreManageListSell extends AbstractItemPacket packet.writeD(_objId); packet.writeD(_packageSale ? 1 : 0); packet.writeQ(_playerAdena); - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item2 : _sellList) { writeItem(packet, item2); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java index 8a5b9eef92..0d7bcbea16 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgBuy implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java index b00bd2add2..8fdb5701b8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgSell implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java index c3958367e8..5ddaa46ba0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java @@ -40,7 +40,6 @@ public class RadarControl implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RADAR_CONTROL.writeId(packet); - packet.writeD(_showRadar); packet.writeD(_type); // maybe type packet.writeD(_x); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java index c7e4525bf2..bcfd911f58 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java @@ -40,10 +40,8 @@ public class RecipeBookItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_BOOK_ITEM_LIST.writeId(packet); - - packet.writeD(_isDwarvenCraft ? 0x00 : 0x01); // 0 = Dwarven - 1 = Common + packet.writeD(_isDwarvenCraft ? 0 : 1); // 0 = Dwarven - 1 = Common packet.writeD(_maxMp); - if (_recipes == null) { packet.writeD(0); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index d9c2621c84..a4e4641944 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -78,7 +78,6 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(_offeringMaximumAdena); // Adena worth of items for maximum offering. return true; } - PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java index a24ba356ef..ab67f9bff3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java @@ -50,7 +50,6 @@ public class RecipeShopItemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_ITEM_INFO.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD(_recipeId); packet.writeD((int) _manufacturer.getCurrentMp()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java index aac30faf53..ec67224b1e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java @@ -57,11 +57,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MANAGE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD((int) _seller.getAdena()); - packet.writeD(_isDwarven ? 0x00 : 0x01); - + packet.writeD(_isDwarven ? 0 : 1); if ((_recipes == null) || _recipes.isEmpty()) { packet.writeD(0); @@ -69,7 +67,6 @@ public class RecipeShopManageList implements IClientOutgoingPacket else { packet.writeD(_recipes.size()); // number of items in recipe book - int i = 1; for (RecipeHolder recipe : _recipes) { @@ -77,10 +74,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket packet.writeD(i++); } } - if ((_manufacture == null) || _manufacture.isEmpty()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -88,7 +84,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket for (Entry item : _manufacture) { packet.writeD(item.getKey()); - packet.writeD(0x00); // CanCraft? + packet.writeD(0); // CanCraft? packet.writeQ(item.getValue()); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java index c025b5e4ed..2b9bc5b6e7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java @@ -33,7 +33,6 @@ public class RecipeShopMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MSG.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeS(_player.getStoreName()); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java index 07ba331de9..8f504ce103 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java @@ -37,14 +37,13 @@ public class RecipeShopSellList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_SELL_LIST.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD((int) _manufacturer.getCurrentMp()); // Creator's MP packet.writeD(_manufacturer.getMaxMp()); // Creator's MP packet.writeQ(_buyer.getAdena()); // Buyer Adena if (!_manufacturer.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -52,7 +51,7 @@ public class RecipeShopSellList implements IClientOutgoingPacket for (Entry item : _manufacturer.getManufactureItems().entrySet()) { packet.writeD(item.getKey()); - packet.writeD(0x00); // CanCreate? + packet.writeD(0); // CanCreate? packet.writeQ(item.getValue()); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 74700e29b0..269e14d50b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -88,7 +88,6 @@ public class RelationChanged implements IClientOutgoingPacket { return; } - final Relation r = new Relation(); r._objId = activeChar.getObjectId(); r._relation = relation; @@ -102,7 +101,6 @@ public class RelationChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RELATION_CHANGED.writeId(packet); - packet.writeC(_mask); if (_multi == null) { @@ -122,7 +120,6 @@ public class RelationChanged implements IClientOutgoingPacket private void writeRelation(PacketWriter packet, Relation relation) { packet.writeD(relation._objId); - if ((_mask & SEND_DEFAULT) != SEND_DEFAULT) { packet.writeD(relation._relation); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java index b4e9dc25c5..4477cfb705 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java @@ -35,7 +35,6 @@ public class RequestEnchant implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java index 4ef15fb74c..7a0a6cbe58 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java @@ -33,7 +33,6 @@ public class Revive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.REVIVE.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java index 9c409601e3..b9ddf7733f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java @@ -42,7 +42,6 @@ public class Ride implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RIDE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_mounted); packet.writeD(_rideType); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 813ce03f4d..13ef62f55f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -49,11 +49,9 @@ public class SellListProcure implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SELL_LIST_PROCURE.writeId(packet); - packet.writeQ(_money); // money - packet.writeD(0x00); // lease ? + packet.writeD(0); // lease ? packet.writeH(_sellList.size()); // list size - for (Entry entry : _sellList.entrySet()) { final Item item = entry.getKey(); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java index baa37a8507..75b5b07854 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java @@ -39,12 +39,10 @@ public class SendMacroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MACRO_LIST.writeId(packet); - packet.writeC(_updateType.getId()); - packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0x00); // modified, created or deleted macro's id + packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0); // modified, created or deleted macro's id packet.writeC(_count); // count of Macros packet.writeC(_macro != null ? 1 : 0); // unknown - if ((_macro != null) && (_updateType != MacroUpdateType.DELETE)) { packet.writeD(_macro.getId()); // Macro ID @@ -52,9 +50,7 @@ public class SendMacroList implements IClientOutgoingPacket packet.writeS(_macro.getDescr()); // Desc packet.writeS(_macro.getAcronym()); // acronym packet.writeD(_macro.getIcon()); // icon - packet.writeC(_macro.getCommands().size()); // count - int i = 1; for (MacroCmd cmd : _macro.getCommands()) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java index 47fada25be..21622b5f19 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java @@ -32,7 +32,6 @@ public class SendTradeRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_REQUEST.writeId(packet); - packet.writeD(_senderId); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java index 69aa749406..1513a0e3d1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java @@ -55,7 +55,6 @@ public class ServerObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SERVER_OBJECT_INFO.writeId(packet); - packet.writeD(_activeChar.getObjectId()); packet.writeD(_displayId + 1000000); packet.writeS(_name); // name @@ -70,8 +69,8 @@ public class ServerObjectInfo implements IClientOutgoingPacket packet.writeF(_collisionHeight); packet.writeD((int) (_isAttackable ? _activeChar.getCurrentHp() : 0)); packet.writeD(_isAttackable ? _activeChar.getMaxHp() : 0); - packet.writeD(0x01); // object type - packet.writeD(0x00); // special effects + packet.writeD(1); // object type + packet.writeD(0); // special effects return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java index 88b370ad8b..0164e5c4a2 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java @@ -34,7 +34,6 @@ public class SetSummonRemainTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SET_SUMMON_REMAIN_TIME.writeId(packet); - packet.writeD(_maxTime); packet.writeD(_remainingTime); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java index db28b72acf..016f5a0c9a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java @@ -38,7 +38,6 @@ public class ShopPreviewInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_INFO.writeId(packet); - packet.writeD(Inventory.PAPERDOLL_TOTALSLOTS); // Slots packet.writeD(getFromList(Inventory.PAPERDOLL_UNDER)); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index 4d605cfbb4..0cc66729ca 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -52,11 +52,9 @@ public class ShopPreviewList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_LIST.writeId(packet); - packet.writeD(5056); packet.writeQ(_money); // current money packet.writeD(_listId); - int newlength = 0; for (Product product : _list) { @@ -66,23 +64,20 @@ public class ShopPreviewList implements IClientOutgoingPacket } } packet.writeH(newlength); - for (Product product : _list) { if (!product.getItem().getCrystalType().isGreater(_expertise) && product.getItem().isEquipable()) { packet.writeD(product.getItemId()); packet.writeH(product.getItem().getType2()); // item type2 - if (product.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { packet.writeQ(product.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } else { - packet.writeQ(0x00); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand + packet.writeQ(0); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } - packet.writeQ(Config.WEAR_PRICE); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 298301ed0d..b13080ff28 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -40,7 +40,6 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_BUFF_STATUS_UPDATE.writeId(packet); - packet.writeD(_skillId); packet.writeH(_skillLevel); packet.writeH(_skillSubLevel); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index c6a67fb97c..b8624ce4cd 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -33,7 +33,6 @@ public class ShortCutInit implements IClientOutgoingPacket { return; } - _shortCuts = player.getAllShortCuts(); } @@ -41,24 +40,22 @@ public class ShortCutInit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); packet.writeD(sc.getSlot() + (sc.getPage() * 12)); - switch (sc.getType()) { case ITEM: { packet.writeD(sc.getId()); - packet.writeD(0x01); // Enabled or not + packet.writeD(1); // Enabled or not packet.writeD(sc.getSharedReuseGroup()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeQ(0x00); // Augment id - packet.writeD(0x00); // Visual id + packet.writeD(0); + packet.writeD(0); + packet.writeQ(0); // Augment id + packet.writeD(0); // Visual id break; } case SKILL: @@ -67,8 +64,8 @@ public class ShortCutInit implements IClientOutgoingPacket packet.writeH(sc.getLevel()); packet.writeH(sc.getSubLevel()); packet.writeD(sc.getSharedReuseGroup()); - packet.writeC(0x00); // C5 - packet.writeD(0x01); // C6 + packet.writeC(0); // C5 + packet.writeD(1); // C6 break; } case ACTION: @@ -77,7 +74,7 @@ public class ShortCutInit implements IClientOutgoingPacket case BOOKMARK: { packet.writeD(sc.getId()); - packet.writeD(0x01); // C6 + packet.writeD(1); // C6 } } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java index 43d61af661..f099eab47e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java @@ -37,7 +37,6 @@ public class ShortCutRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_REGISTER.writeId(packet); - packet.writeD(_shortcut.getType().ordinal()); packet.writeD(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client switch (_shortcut.getType()) @@ -47,10 +46,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeD(_shortcut.getId()); packet.writeD(_shortcut.getCharacterType()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeD(0x00); // unknown - packet.writeD(0x00); // unknown - packet.writeD(0x00); // item augment id - packet.writeD(0x00); // TODO: Find me, item visual id ? + packet.writeD(0); // unknown + packet.writeD(0); // unknown + packet.writeD(0); // item augment id + packet.writeD(0); // TODO: Find me, item visual id ? break; } case SKILL: @@ -59,10 +58,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeH(_shortcut.getLevel()); packet.writeH(_shortcut.getSubLevel()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeC(0x00); // C5 + packet.writeC(0); // C5 packet.writeD(_shortcut.getCharacterType()); - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me + packet.writeD(0); // TODO: Find me break; } case ACTION: diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java index d6f71b5f70..cfae3b3fad 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java @@ -54,7 +54,6 @@ public class ShowBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - packet.writeC(_showBoard); // c4 1 to show community 00 to hide packet.writeS("bypass _bbshome"); // top packet.writeS("bypass _bbsgetfav"); // favorite diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java index 4b62a7001b..4d62e99d7a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java @@ -32,7 +32,6 @@ public class ShowCalculator implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_CALC.writeId(packet); - packet.writeD(_calculatorId); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java index 55f58d5375..4574762467 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java @@ -32,9 +32,8 @@ public class ShowMiniMap implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_MINIMAP.writeId(packet); - packet.writeD(_mapId); - packet.writeC(0x00); // Seven Signs state + packet.writeC(0); // Seven Signs state return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java index 303eab4e8a..97100d09d2 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java @@ -34,7 +34,6 @@ public class ShowPCCafeCouponShowUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_PCCAFE_COUPON_SHOW_UI.writeId(packet); - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java index d86958e586..0a0f3ae861 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java @@ -35,7 +35,6 @@ public class ShowXMasSeal implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_XMAS_SEAL.writeId(packet); - packet.writeD(_item); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java index 66eccc7fbf..1baa030c4d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java @@ -28,9 +28,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = ca
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Attackers Clans?
* d = Number of Attackers Clans
* { //repeats
@@ -58,11 +58,10 @@ public class SiegeAttackerList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _castle.getSiege().getAttackerClans().size(); if (size > 0) { @@ -76,12 +75,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -90,8 +88,8 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index 5d5c831f14..8afd1f38ce 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -29,9 +29,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = 0xcb
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Defending Clans?
* d = Number of Defending Clans
* { //repeats
@@ -60,16 +60,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // Unknown - packet.writeD(0x01); // Unknown - packet.writeD(0x00); // Unknown - + packet.writeD(0); // Unknown + packet.writeD(1); // Unknown + packet.writeD(0); // Unknown final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0); packet.writeD(size); packet.writeD(size); - // Add owners final Clan ownerClan = _castle.getOwner(); if (ownerClan != null) @@ -78,14 +75,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket packet.writeS(ownerClan.getName()); packet.writeS(ownerClan.getLeaderName()); packet.writeD(ownerClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.OWNER.ordinal()); packet.writeD(ownerClan.getAllyId()); packet.writeS(ownerClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(ownerClan.getAllyCrestId()); } - // List of confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans()) { @@ -94,19 +90,17 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(defendingClan.getAllyCrestId()); } - // List of not confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans()) { @@ -115,12 +109,11 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER_PENDING.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 0a3fe46cb7..dfeefdaecf 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -59,13 +59,11 @@ public class SiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_INFO.writeId(packet); - if (_castle != null) { packet.writeD(_castle.getResidenceId()); - final int ownerId = _castle.getOwnerId(); - packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 0x01 : 0x00); + packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0); packet.writeD(ownerId); if (ownerId > 0) { @@ -89,7 +87,6 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { @@ -97,7 +94,7 @@ public class SiegeInfo implements IClientOutgoingPacket cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis()); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(Config.SIEGE_HOUR_LIST.size()); for (int hour : Config.SIEGE_HOUR_LIST) { @@ -108,7 +105,7 @@ public class SiegeInfo implements IClientOutgoingPacket else { packet.writeD((int) (_castle.getSiegeDate().getTimeInMillis() / 1000)); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index d11b3817c0..3c4c475339 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -51,12 +51,11 @@ public class SkillCoolTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SKILL_COOL_TIME.writeId(packet); - packet.writeD(_skillReuseTimeStamps.size()); for (TimeStamp ts : _skillReuseTimeStamps) { packet.writeD(ts.getSkillId()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD((int) ts.getReuse() / 1000); packet.writeD((int) Math.max(ts.getStamp() - _currentTime, 0) / 1000); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index de54232b51..ed4615c403 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -41,10 +41,9 @@ public class Snoop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SNOOP.writeId(packet); - packet.writeD(_convoId); packet.writeS(_name); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_type.getClientId()); packet.writeS(_speaker); packet.writeS(_msg); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java index 37827bdf6c..52f15519a5 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java @@ -37,10 +37,9 @@ public class SocialAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SOCIAL_ACTION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_actionId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index fd7e43a153..19066f5f85 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -33,16 +33,15 @@ public class SpawnItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPAWN_ITEM.writeId(packet); - packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeD(_item.isStackable() ? 0x01 : 0x00); + packet.writeD(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java index ccae75b850..04f3ad716c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java @@ -110,7 +110,6 @@ public class SpecialCamera implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPECIAL_CAMERA.writeId(packet); - packet.writeD(_id); packet.writeD(_force); packet.writeD(_angle1); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java index cdd3821740..281756e793 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java @@ -34,7 +34,6 @@ public class StartPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_PLEDGE_WAR.writeId(packet); - packet.writeS(_playerName); packet.writeS(_pledgeName); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java index 48b4238eea..27fb4f606b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java @@ -38,7 +38,6 @@ public class StartRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_side); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java index b4f421df36..067bdeb082 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java @@ -72,7 +72,6 @@ public class StaticObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATIC_OBJECT.writeId(packet); - packet.writeD(_staticObjectId); packet.writeD(_objectId); packet.writeD(_type); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index 928b54aa48..40836e4af8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -46,7 +46,6 @@ public class StatusUpdate implements IClientOutgoingPacket public void addUpdate(StatusUpdateType type, int level) { _updates.put(type, level); - if (_isPlayable) { switch (type) @@ -75,10 +74,9 @@ public class StatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATUS_UPDATE.writeId(packet); - packet.writeD(_objectId); // casterId - packet.writeD(_isVisible ? _casterObjectId : 0x00); - packet.writeC(_isVisible ? 0x01 : 0x00); + packet.writeD(_isVisible ? _casterObjectId : 0); + packet.writeC(_isVisible ? 1 : 0); packet.writeC(_updates.size()); for (Entry entry : _updates.entrySet()) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java index 9919307366..cf2b71df5a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java @@ -53,7 +53,6 @@ public class StopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java index 50fdc3fe4c..78fdb5d70c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java @@ -43,7 +43,6 @@ public class StopMoveInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java index 9c828c3962..b254cad8b1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java @@ -34,7 +34,6 @@ public class StopPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java index b0392de226..ca69cd5346 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java @@ -36,7 +36,6 @@ public class StopRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FINISH_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_speed); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index c1feb37b2f..2d92796c75 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -43,10 +43,8 @@ public class SummonInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class SummonInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class SummonInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,11 +154,9 @@ public class SummonInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - // Show red aura? - // if (_statusMask != 0) + // if (_statusMask != 0x00) // { // addComponentType(NpcInfoType.VISUAL_STATE); // } @@ -229,28 +206,24 @@ public class SummonInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.SUMMON_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -269,7 +242,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -285,19 +258,19 @@ public class SummonInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -309,20 +282,20 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -346,12 +319,12 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -381,12 +354,10 @@ public class SummonInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java index 864462f76f..6f88551204 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java @@ -34,7 +34,6 @@ public class SurrenderPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SURRENDER_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 746b2da3f7..b509d599db 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -161,7 +161,6 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } - _params[_paramIndex++] = param; } @@ -267,7 +266,6 @@ public class SystemMessage implements IClientOutgoingPacket { return addString(item.getName()); } - append(new SMParam(TYPE_ITEM_NAME, id)); return this; } @@ -389,7 +387,6 @@ public class SystemMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SYSTEM_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -402,13 +399,12 @@ public class SystemMessage implements IClientOutgoingPacket params[i] = _params[i].getValue(); } packet.writeH(SystemMessageId.S1_2.getId()); - packet.writeC(0x01); + packet.writeC(1); packet.writeC(TYPE_TEXT); packet.writeS(sml.getLocalisation(params)); return true; } } - packet.writeH(getId()); packet.writeC(_params.length); for (SMParam param : _params) @@ -418,9 +414,7 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } - packet.writeC(param.getType()); - switch (param.getType()) { case TYPE_ELEMENT_NAME: diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java index a91da07e77..d357efbb0e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java @@ -47,13 +47,12 @@ public class TargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_SELECTED.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java index 3dadd249f6..3d7208c06f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java @@ -42,12 +42,11 @@ public class TargetUnselected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_UNSELECTED.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index 943b5078b6..13f9b9565a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -41,14 +41,13 @@ public class TeleportToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TELEPORT_TO_LOCATION.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // Fade 0, Instant 1. + packet.writeD(0); // Fade 0, Instant 1. packet.writeD(_heading); - packet.writeD(0x00); // Unknown. + packet.writeD(0); // Unknown. return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java index cb82f2da59..8d09576d9d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java @@ -32,7 +32,6 @@ public class TradeDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_DONE.writeId(packet); - packet.writeD(_num); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java index 716ed2a099..6a94d2463f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java @@ -41,9 +41,9 @@ public class TradeOtherAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java index 3d0ef0b501..7907f3d498 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java @@ -41,9 +41,9 @@ public class TradeOwnAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c59568bf1d..3822108c5a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -58,7 +58,6 @@ public class TradeStart extends AbstractItemPacket { _mask |= 0x08; } - // Does not shows level if (_partner.isGM()) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java index f8e2a191de..e5ec2376cc 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java @@ -44,10 +44,10 @@ public class TradeUpdate extends AbstractItemPacket { OutgoingPackets.TRADE_UPDATE.writeId(packet); packet.writeC(_sendType); - packet.writeD(0x01); + packet.writeD(1); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2); writeItem(packet, _item, _count); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java index c7102ca385..728020c0b1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java @@ -32,7 +32,6 @@ public class TutorialEnableClientEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_ENABLE_CLIENT_EVENT.writeId(packet); - packet.writeD(_eventId); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java index 92ac75afcf..7cc33a0f80 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java @@ -48,7 +48,6 @@ public class TutorialShowHtml extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_HTML.writeId(packet); - packet.writeD(_type); packet.writeS(getHtml()); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java index 75a57be38b..2ee62835db 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java @@ -37,7 +37,6 @@ public class TutorialShowQuestionMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_QUESTION_MARK.writeId(packet); - packet.writeC(_markType); packet.writeD(_markId); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index a3e6690b24..6506847dd9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -35,7 +35,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class UserInfo extends AbstractMaskPacket { private Player _player; - private int _relation; private int _runSpd; private int _walkSpd; @@ -49,14 +48,12 @@ public class UserInfo extends AbstractMaskPacket private int _enchantLevel; private int _armorEnchant; private String _title; - private final byte[] _masks = new byte[] { (byte) 0x00, (byte) 0x00, (byte) 0x00 }; - private int _initSize = 5; public UserInfo(Player player) @@ -80,6 +77,7 @@ public class UserInfo extends AbstractMaskPacket _enchantLevel = player.getInventory().getWeaponEnchant(); _armorEnchant = player.getInventory().getArmorMinEnchant(); _title = player.getTitle(); + if (player.isGM() && player.isInvisible()) { _title = "[Invisible]"; @@ -135,29 +133,25 @@ public class UserInfo extends AbstractMaskPacket } OutgoingPackets.USER_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_initSize); packet.writeH(24); packet.writeB(_masks); - if (containsMask(UserInfoType.RELATION)) { packet.writeD(_relation); } - if (containsMask(UserInfoType.BASIC_INFO)) { packet.writeH(16 + (_player.getAppearance().getVisibleName().length() * 2)); packet.writeString(_player.getName()); - packet.writeC(_player.isGM() ? 0x01 : 0x00); + packet.writeC(_player.isGM() ? 1 : 0); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } - if (containsMask(UserInfoType.BASE_STATS)) { packet.writeH(18); @@ -170,7 +164,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getLUC()); packet.writeH(_player.getCHA()); } - if (containsMask(UserInfoType.MAX_HPCPMP)) { packet.writeH(14); @@ -178,7 +171,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMaxMp()); packet.writeD(_player.getMaxCp()); } - if (containsMask(UserInfoType.CURRENT_HPMPCP_EXP_SP)) { packet.writeH(38); @@ -189,23 +181,20 @@ public class UserInfo extends AbstractMaskPacket packet.writeQ(_player.getExp()); packet.writeF((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel()))); } - if (containsMask(UserInfoType.ENCHANTLEVEL)) { packet.writeH(4); packet.writeC(_enchantLevel); packet.writeC(_armorEnchant); } - if (containsMask(UserInfoType.APPAREANCE)) { packet.writeH(15); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); } - if (containsMask(UserInfoType.STATUS)) { packet.writeH(6); @@ -214,7 +203,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.getCrystallizeGrade() != ItemGrade.NONE ? 1 : 0); packet.writeC(_player.getAbilityPoints() - _player.getAbilityPointsUsed()); } - if (containsMask(UserInfoType.STATS)) { packet.writeH(56); @@ -233,7 +221,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); } - if (containsMask(UserInfoType.ELEMENTALS)) { packet.writeH(14); @@ -244,7 +231,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getDefenseElementValue(AttributeType.HOLY)); packet.writeH(_player.getDefenseElementValue(AttributeType.DARK)); } - if (containsMask(UserInfoType.POSITION)) { packet.writeH(18); @@ -253,7 +239,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getZ()); packet.writeD(_player.isInVehicle() ? _player.getVehicle().getObjectId() : 0); } - if (containsMask(UserInfoType.SPEED)) { packet.writeH(18); @@ -266,21 +251,18 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_flyRunSpd); packet.writeH(_flyWalkSpd); } - if (containsMask(UserInfoType.MULTIPLIER)) { packet.writeH(18); packet.writeF(_moveMultiplier); packet.writeF(_player.getAttackSpeedMultiplier()); } - if (containsMask(UserInfoType.COL_RADIUS_HEIGHT)) { packet.writeH(18); packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); } - if (containsMask(UserInfoType.ATK_ELEMENTAL)) { packet.writeH(5); @@ -288,7 +270,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); } - if (containsMask(UserInfoType.CLAN)) { packet.writeH(32 + (_title.length() * 2)); @@ -298,12 +279,11 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getClanCrestLargeId()); packet.writeD(_player.getClanCrestId()); packet.writeD(_player.getClanPrivileges().getBitmask()); - packet.writeC(_player.isClanLeader() ? 0x01 : 0x00); + packet.writeC(_player.isClanLeader() ? 1 : 0); packet.writeD(_player.getAllyId()); packet.writeD(_player.getAllyCrestId()); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); } - if (containsMask(UserInfoType.SOCIAL)) { packet.writeH(22); @@ -317,80 +297,71 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); } - if (containsMask(UserInfoType.VITA_FAME)) { packet.writeH(15); packet.writeD(_player.getVitalityPoints()); - packet.writeC(0x00); // Vita Bonus + packet.writeC(0); // Vita Bonus packet.writeD(_player.getFame()); packet.writeD(_player.getRaidbossPoints()); } - if (containsMask(UserInfoType.SLOTS)) { packet.writeH(12); // 152 packet.writeC(_player.getInventory().getTalismanSlots()); packet.writeC(_player.getInventory().getBroochJewelSlots()); packet.writeC(_player.getTeam().getId()); - packet.writeD(0x00); - + packet.writeD(0); if (_player.getInventory().getAgathionSlots() > 0) { - packet.writeC(0x01); // Charm slots + packet.writeC(1); // Charm slots packet.writeC(_player.getInventory().getAgathionSlots() - 1); packet.writeC(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152 } else { - packet.writeC(0x00); // Charm slots - packet.writeC(0x00); + packet.writeC(0); // Charm slots + packet.writeC(0); packet.writeC(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152 } } - if (containsMask(UserInfoType.MOVEMENTS)) { packet.writeH(4); packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); - packet.writeC(_player.isRunning() ? 0x01 : 0x00); + packet.writeC(_player.isRunning() ? 1 : 0); } - if (containsMask(UserInfoType.COLOR)) { packet.writeH(10); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); } - if (containsMask(UserInfoType.INVENTORY_LIMIT)) { packet.writeH(9); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); packet.writeH(_player.getInventoryLimit()); packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); } - if (containsMask(UserInfoType.TRUE_HERO)) { packet.writeH(9); - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeC(_player.isTrueHero() ? 100 : 0x00); + packet.writeD(0); + packet.writeH(0); + packet.writeC(_player.isTrueHero() ? 100 : 0); } - if (containsMask(UserInfoType.ATT_SPIRITS)) // 152 { packet.writeH(26); packet.writeD(-1); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - return true; } @@ -407,7 +378,6 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x10; // Party leader } } - if (clan != null) { relation |= 0x20; // Clan member @@ -416,12 +386,10 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x40; // Clan leader } } - if (player.isInSiege()) { relation |= 0x80; // In siege } - return relation; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java index 283bcf1614..90c416726a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java @@ -36,7 +36,6 @@ public class ValidateLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java index 4d8f9683d0..83f72bf981 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java @@ -40,7 +40,6 @@ public class ValidateLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java index b684e70bdc..71367cd26d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java @@ -36,7 +36,6 @@ public class VehicleCheckLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_CHECK_LOCATION.writeId(packet); - packet.writeD(_boat.getObjectId()); packet.writeD(_boat.getX()); packet.writeD(_boat.getY()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java index a4a5780f30..5b565c08b7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java @@ -46,7 +46,6 @@ public class VehicleDeparture implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_DEPARTURE.writeId(packet); - packet.writeD(_objId); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java index ec611028bf..4a995a6352 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java @@ -44,7 +44,6 @@ public class VehicleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java index 207a6fd899..bf629dcbbc 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java @@ -42,7 +42,6 @@ public class VehicleStarted implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_START.writeId(packet); - packet.writeD(_objectId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 35ca986d35..5eb9eb7ab9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -30,6 +30,7 @@ public class WareHouseDepositList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; public static final int FREIGHT = 1; + private final int _sendType; private final long _playerAdena; private final List _items = new ArrayList<>(); @@ -49,7 +50,6 @@ public class WareHouseDepositList extends AbstractItemPacket _sendType = sendType; _whType = type; _playerAdena = player.getAdena(); - final boolean isPrivate = _whType == PRIVATE; for (Item temp : player.getInventory().getAvailableItems(true, isPrivate, false)) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 7af1cd273c..5ece99310a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -32,6 +32,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private final int _sendType; private Player _player; private long _playerAdena; @@ -60,7 +61,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } - _items = _player.getActiveWarehouse().getItems(); for (Item item : _items) { @@ -78,15 +78,15 @@ public class WareHouseWithdrawalList extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeH(0x00); + packet.writeH(0); packet.writeD(_invSize); packet.writeD(_items.size()); for (Item item : _items) { writeItem(packet, item); packet.writeD(item.getObjectId()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } else diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java index 7442882a70..bd10e174c6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java @@ -59,7 +59,6 @@ public class ExAcquireAPSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_AP_SKILL_LIST.writeId(packet); - packet.writeD(_enable ? 1 : 0); packet.writeQ(Config.ABILITY_POINTS_RESET_SP); // Changed to from Adena to SP on Grand Crusade // packet.writeQ(_price); Removed on Grand Crusade diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java index f9af89e4db..ff296bf632 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java @@ -35,7 +35,6 @@ public class ExCloseAPListWnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_AP_LIST_WND.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java index d72baf2a44..69c47ce99f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java @@ -35,7 +35,6 @@ public class ExShowAPListWnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AP_LIST_WND.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java index 5f2dd05f3b..aea1476fb2 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java @@ -35,8 +35,7 @@ public class ExDivideAdenaCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_CANCEL.writeId(packet); - - packet.writeC(0x00); // TODO: Find me + packet.writeC(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java index 6af912cebf..de4e955aba 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java @@ -46,9 +46,8 @@ public class ExDivideAdenaDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_DONE.writeId(packet); - - packet.writeC(_isPartyLeader ? 0x01 : 0x00); - packet.writeC(_isCCLeader ? 0x01 : 0x00); + packet.writeC(_isPartyLeader ? 1 : 0); + packet.writeC(_isCCLeader ? 1 : 0); packet.writeD(_memberCount); packet.writeQ(_distributedAdenaCount); packet.writeQ(_adenaCount); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java index ab8a7471d6..32f99abfdc 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java @@ -38,8 +38,7 @@ public class ExAlchemyConversion implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_CONVERSION.writeId(packet); - - packet.writeC((_successCount == 0) && (_failureCount == 0) ? 0x01 : 0x00); + packet.writeC((_successCount == 0) && (_failureCount == 0) ? 1 : 0); packet.writeD(_successCount); packet.writeD(_failureCount); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java index be4a2a57e6..cb3cf4b3e0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java @@ -47,7 +47,6 @@ public class ExTryMixCube implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TRY_MIX_CUBE.writeId(packet); - packet.writeC(_type.ordinal()); packet.writeD(_items.size()); for (AlchemyResult holder : _items) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index 549def456e..84b5fead76 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -43,7 +43,6 @@ public class ExChooseShapeShiftingItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_SHAPE_SHIFTING_ITEM.writeId(packet); - packet.writeD(_targetType != null ? _targetType.ordinal() : 0); packet.writeD(_type != null ? _type.ordinal() : 0); packet.writeD(_itemId); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java index 33fb439aa5..ba55887a1a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java @@ -45,7 +45,6 @@ public class ExCuriousHouseMemberUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_UPDATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_maxHp); packet.writeD(_maxCp); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java index 8ad3659725..be2d29d864 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPacket { - public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0x00); - public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(0x01); + public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0); + public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(1); private final int _result; @@ -39,7 +39,6 @@ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPa public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_EXTRACTION_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java index ec82cc14f3..e84d7a7255 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; public static final ExPutShapeShiftingTargetItemResult FAILED = new ExPutShapeShiftingTargetItemResult(RESULT_FAILED, 0); @@ -43,7 +43,6 @@ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_resultId); packet.writeQ(_price); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java index f4d3118cc4..038eae0042 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExShapeShiftingResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; - public static final int RESULT_CLOSE = 0x02; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; + public static final int RESULT_CLOSE = 2; public static final ExShapeShiftingResult FAILED = new ExShapeShiftingResult(RESULT_FAILED, 0, 0); public static final ExShapeShiftingResult CLOSE = new ExShapeShiftingResult(RESULT_CLOSE, 0, 0); @@ -47,7 +47,6 @@ public class ExShapeShiftingResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHAPE_SHIFTING_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_targetItemId); packet.writeD(_extractItemId); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java index eaf0d209fd..4b48b09002 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java @@ -38,7 +38,7 @@ public class ExConfirmVipAttendanceCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CONFIRM_VIP_ATTENDANCE_CHECK.writeId(packet); - packet.writeC(_available ? 0x01 : 0x00); // can receive reward today? 1 else 0 + packet.writeC(_available ? 1 : 0); // can receive reward today? 1 else 0 packet.writeC(_index); // active reward index packet.writeD(0); packet.writeD(0); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java index 9d61fe68d6..dd94df023f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java @@ -45,10 +45,10 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket OutgoingPackets.EX_VIP_ATTENDANCE_ITEM_LIST.writeId(packet); packet.writeC(_available ? _index + 1 : _index); // index to receive? packet.writeC(_index); // last received index? - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeC(0x01); - packet.writeC(_available ? 0x01 : 0x00); // player can receive reward today? + packet.writeD(0); + packet.writeD(0); + packet.writeC(1); + packet.writeC(_available ? 1 : 0); // player can receive reward today? packet.writeC(250); packet.writeC(AttendanceRewardData.getInstance().getRewardsCount()); // reward size int rewardCounter = 0; @@ -57,11 +57,11 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket rewardCounter++; packet.writeD(reward.getId()); packet.writeQ(reward.getCount()); - packet.writeC(0x01); // is unknown? - packet.writeC((rewardCounter % 7) == 0 ? 0x01 : 0x00); // is last in row? + packet.writeC(1); // is unknown? + packet.writeC((rewardCounter % 7) == 0 ? 1 : 0); // is last in row? } - packet.writeC(0x00); - packet.writeD(0x00); + packet.writeC(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java index 7f1d6d60d1..73f93335ef 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java @@ -43,7 +43,6 @@ public class ExCuriousHouseMemberList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_LIST.writeId(packet); - packet.writeD(_id); packet.writeD(_maxPlayers); packet.writeD(_players.size()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java index b71caa5f14..5d9b34db61 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java @@ -37,7 +37,6 @@ public class ExCuriousHouseRemainTime implements IClientOutgoingPacket { OutgoingPackets.EX_CURIOUS_HOUSE_REMAIN_TIME.writeId(packet); packet.writeD(_time); - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java index 4c3ae253ea..c79b68becc 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java @@ -39,7 +39,6 @@ public class ExResponseCommissionBuyInfo extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_INFO.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java index ddfa8b6db1..c1d29735b8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java @@ -40,7 +40,6 @@ public class ExResponseCommissionBuyItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_ITEM.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java index aa4bbbde24..01e4782408 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java @@ -39,7 +39,6 @@ public class ExResponseCommissionDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_DELETE.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java index e7e3c39816..b915574175 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java @@ -55,7 +55,6 @@ public class ExResponseCommissionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_INFO.writeId(packet); - packet.writeD(_result); packet.writeD(_itemId); packet.writeQ(_presetPricePerUnit); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java index 4963393b42..a012b3ab30 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java @@ -64,7 +64,6 @@ public class ExResponseCommissionList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_LIST.writeId(packet); - packet.writeD(_replyType.getClientId()); switch (_replyType) { @@ -73,13 +72,11 @@ public class ExResponseCommissionList extends AbstractItemPacket { packet.writeD((int) Instant.now().getEpochSecond()); packet.writeD(_chunkId); - int chunkSize = _items.size() - _listIndexStart; if (chunkSize > MAX_CHUNK_SIZE) { chunkSize = MAX_CHUNK_SIZE; } - packet.writeD(chunkSize); for (int i = _listIndexStart; i < (_listIndexStart + chunkSize); i++) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java index b1b0a97d7a..183547af06 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java @@ -39,7 +39,6 @@ public class ExResponseCommissionRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_REGISTER.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java index 74d8a95587..b68386e4ed 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java @@ -35,8 +35,7 @@ public class ExShowCommission implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_COMMISSION.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java index 0c267ecf34..11b1ff1e0a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExEnchantFail implements IClientOutgoingPacket { public static final ExEnchantFail STATIC_PACKET = new ExEnchantFail(0, 0); + private final int _itemOne; private final int _itemTwo; @@ -39,7 +40,6 @@ public class ExEnchantFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_FAIL.writeId(packet); - packet.writeD(_itemOne); packet.writeD(_itemTwo); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java index 71ba811ed5..87d29a8e7c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java @@ -36,7 +36,6 @@ public class ExEnchantSucess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SUCESS.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java index eb4eb8b26c..ec67d50fb6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java @@ -39,7 +39,6 @@ public class ExGetCrystalizingEstimation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - packet.writeD(_items.size()); for (ItemChanceHolder holder : _items) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java index 23b770e406..ebe77fa654 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java @@ -29,7 +29,7 @@ public class ExShowUpgradeSystem extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_UPGRADE_SYSTEM.writeId(packet); - packet.writeH(0x01); + packet.writeH(1); return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java index 586d77c13f..2fb9bb65a1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java @@ -40,11 +40,9 @@ public class ExFactionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FACTION_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_openDialog ? 1 : 0); packet.writeD(Faction.values().length); - for (Faction faction : Faction.values()) { packet.writeC(faction.getId()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java index fa605b548a..a99ad7f4e3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java @@ -52,7 +52,7 @@ public class ExFishingStart implements IClientOutgoingPacket packet.writeD(_baitLocation.getX()); packet.writeD(_baitLocation.getY()); packet.writeD(_baitLocation.getZ()); - packet.writeC(0x01); // 0 = newbie, 1 = normal, 2 = night + packet.writeC(1); // 0 = newbie, 1 = normal, 2 = night return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java index 046ad04cb6..74501fe7ff 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java @@ -49,7 +49,6 @@ public class ExUserInfoFishing implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_FISHING.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_isFishing ? 1 : 0); if (_baitLocation == null) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index dc0e3e05bc..336a384bcc 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -47,9 +47,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FRIEND_DETAIL_INFO.writeId(packet); - packet.writeD(_objectId); - if (_friend == null) { packet.writeS(_name); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java index 0d4bb47ff0..a90b7b6083 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java @@ -33,8 +33,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x00); + packet.writeC(0); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java index 9add9c9caa..d24139644c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java @@ -49,7 +49,6 @@ public class FriendAddRequestResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_charId); packet.writeS(_charName); @@ -57,7 +56,7 @@ public class FriendAddRequestResult implements IClientOutgoingPacket packet.writeD(_charObjectId); packet.writeD(_charLevel); packet.writeD(_charClassId); - packet.writeH(0x00); // Always 0 on retail + packet.writeH(0); // Always 0 on retail return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java index a135944662..13a7d01967 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java @@ -86,12 +86,10 @@ public class FriendList implements IClientOutgoingPacket } continue; } - if (player1.isOnline()) { online = true; } - classid = player1.getClassId().getId(); level = player1.getLevel(); _info.add(new FriendInfo(objId, name, online, classid, level)); @@ -102,14 +100,13 @@ public class FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._classid); packet.writeD(info._level); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java index 07c23f9fd2..1bb4142e34 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java @@ -38,7 +38,6 @@ public class FriendRemove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_REMOVE.writeId(packet); - packet.writeD(_responce); packet.writeS(_charName); return true; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java index e8dbddcd63..a3990c0879 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java @@ -52,7 +52,6 @@ public class FriendStatus implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_STATUS.writeId(packet); - packet.writeD(_type); packet.writeS(_name); switch (_type) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java index 8752104e06..78da5850b8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java @@ -50,7 +50,6 @@ public class L2Friend implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND.writeId(packet); - packet.writeD(_action ? 1 : 3); // 1-add 3-remove packet.writeD(_objid); packet.writeS(_name); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java index b69a253635..e50693cb11 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java @@ -81,17 +81,16 @@ public class L2FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._level); packet.writeD(info._classId); - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java index 677c09091f..706c179a9c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java @@ -37,7 +37,6 @@ public class ExMentorAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_ADD.writeId(packet); - packet.writeS(_mentor.getName()); packet.writeD(_mentor.getActiveClass()); packet.writeD(_mentor.getLevel()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java index 4722a9cab3..18c1cdeedf 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java @@ -64,9 +64,8 @@ public class ExMentorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_LIST.writeId(packet); - packet.writeD(_type); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mentees.size()); for (Mentee mentee : _mentees) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java index d739dd94b7..2283920b98 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ListMenteeWaiting implements IClientOutgoingPacket { private static final int PLAYERS_PER_PAGE = 64; + private final List _possibleCandiates = new ArrayList<>(); private final int _page; @@ -51,18 +52,15 @@ public class ListMenteeWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_MENTEE_WAITING.writeId(packet); - - packet.writeD(0x01); // always 1 in retail + packet.writeD(1); // always 1 in retail if (_possibleCandiates.isEmpty()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } - packet.writeD(_possibleCandiates.size()); packet.writeD(_possibleCandiates.size() % PLAYERS_PER_PAGE); - for (Player player : _possibleCandiates) { if ((1 <= (PLAYERS_PER_PAGE * _page)) && (1 > (PLAYERS_PER_PAGE * (_page - 1)))) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java index e33e29a487..fc80b0a6c0 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java @@ -41,7 +41,6 @@ public class ExPledgeContributionInfo implements IClientOutgoingPacket { return false; } - OutgoingPackets.EX_PLEDGE_CONTRIBUTION_INFO.writeId(packet); packet.writeD(_player.getClanContribution()); packet.writeD(_player.getClanContribution()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java index e65c0ced20..64b1bfd2e6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java @@ -44,10 +44,8 @@ public class ExPledgeContributionRank implements IClientOutgoingPacket { return false; } - OutgoingPackets.EX_PLEDGE_CONTRIBUTION_RANK.writeId(packet); packet.writeC(_cycle); - packet.writeD(_clan.getMembersCount()); int order = 1; for (ClanMember member : _clan.getMembers()) @@ -70,7 +68,6 @@ public class ExPledgeContributionRank implements IClientOutgoingPacket packet.writeD(member.getClanContributionTotal()); } } - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java index c235245d89..e66b814d06 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java @@ -42,9 +42,7 @@ public class ExPledgeItemList extends AbstractItemPacket { return false; } - OutgoingPackets.EX_PLEDGE_ITEM_LIST.writeId(packet); - packet.writeH(ClanShopData.getInstance().getProducts().size()); // Product count. for (ClanShopProductHolder product : ClanShopData.getInstance().getProducts()) { @@ -61,7 +59,6 @@ public class ExPledgeItemList extends AbstractItemPacket packet.writeH(0); // Current stock packet.writeH(0); // Total stock } - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java index e4df4b523e..21c5ba1724 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java @@ -44,9 +44,7 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket { return false; } - OutgoingPackets.EX_PLEDGE_MASTERY_INFO.writeId(packet); - packet.writeD(clan.getUsedDevelopmentPoints()); // Consumed development points packet.writeD(clan.getTotalDevelopmentPoints()); // Total development points packet.writeD(16); // Mastery count @@ -56,8 +54,7 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket { final int id = mastery.getId(); packet.writeD(id); // Mastery - packet.writeD(0x00); // ? - + packet.writeD(0); // ? boolean available = true; if (clan.getLevel() < mastery.getClanLevel()) { @@ -76,11 +73,9 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket available = clan.hasMastery(previous); } } - - packet.writeC(clan.hasMastery(id) ? 0x02 : available ? 0x01 : 0x00); // Availability. + packet.writeC(clan.hasMastery(id) ? 2 : available ? 1 : 0); // Availability. } } - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java index d31a014aea..568aa70f70 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java @@ -46,15 +46,12 @@ public class ExPledgeMissionInfo implements IClientOutgoingPacket { return true; } - OutgoingPackets.EX_PLEDGE_MISSION_INFO.writeId(packet); - packet.writeD(_rewards.size()); for (DailyMissionDataHolder reward : _rewards) { int progress = reward.getProgress(_player); int status = reward.getStatus(_player); - // TODO: Figure out this. if (reward.isLevelUpMission()) { @@ -76,12 +73,10 @@ public class ExPledgeMissionInfo implements IClientOutgoingPacket { status = 2; } - packet.writeD(reward.getId()); packet.writeD(progress); packet.writeC(status); } - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java index ce1d6327e7..604181c6ed 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java @@ -41,10 +41,8 @@ public class ExPledgeMissionRewardCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_MISSION_REWARD_COUNT.writeId(packet); - packet.writeD(Math.min(_availableMissionsCount, _doneMissionsCount)); // Received missions rewards. packet.writeD(_availableMissionsCount); // Available missions rewards. 18 - for noble, 20 - for honnorable noble. - return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java index e59ebcfaab..22cf060348 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java @@ -43,7 +43,6 @@ public class ExPledgeShowInfoUpdate extends AbstractItemPacket { return false; } - OutgoingPackets.EX_PLEDGE_SHOW_INFO_UPDATE.writeId(packet); packet.writeD(clan.getId()); // Clan ID packet.writeD(ClanLevelData.getLevelRequirement(clan.getLevel())); // Next level cost diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index fb735b8925..e75426e598 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -69,7 +69,6 @@ public class ExBRBuyProduct implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUY_PRODUCT.writeId(packet); - packet.writeD(_reply); return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java index 742b3eba9d..91a186b81d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java @@ -39,10 +39,9 @@ public class ExBRGamePoint implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_GAME_POINT.writeId(packet); - packet.writeD(_charId); packet.writeQ(_charPoints); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java index 50f21df46a..e36f2ff502 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java @@ -45,7 +45,6 @@ public class ExBRProductInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_INFO.writeId(packet); - packet.writeD(_item.getBrId()); packet.writeD(_item.getPrice()); packet.writeD(_item.getItems().size()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java index dc851ffd43..0f042ba043 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java @@ -45,9 +45,8 @@ public class ExBRProductList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); // Adena - packet.writeQ(0x00); // Hero coins + packet.writeQ(0); // Hero coins packet.writeC(_type); // Type 0 - Home, 1 - History, 2 - Favorites packet.writeD(_primeList.size()); for (PrimeShopGroup brItem : _primeList) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java index b23e9fa8a9..f4406c1407 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java @@ -38,7 +38,6 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RAID_BOSS_SPAWN_INFO.writeId(packet); - packet.writeD(_bossIds.size()); // alive count for (int id : _bossIds) // alive ids { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java index 2463589c81..c09b3e899d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java @@ -47,18 +47,15 @@ public class ExFlyMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_mapId); - packet.writeD(_locations.size()); for (SayuneEntry loc : _locations) { packet.writeD(loc.getId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(loc.getX()); packet.writeD(loc.getY()); packet.writeD(loc.getZ()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java index 03fc6b580d..70b3fb25d2 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java @@ -47,16 +47,13 @@ public class ExFlyMoveBroadcast implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE_BROADCAST.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); packet.writeD(_mapId); - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD(_currentLoc.getX()); packet.writeD(_currentLoc.getY()); packet.writeD(_currentLoc.getZ()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java index cfe11a27e0..49e5d86910 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java @@ -35,7 +35,6 @@ public class ExNotifyFlyMoveStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_FLY_MOVE_START.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java index d5640a47ef..0efa37ae8c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java @@ -51,7 +51,6 @@ public class ExMoveToLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_SUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_targetX); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java index 0cbe2c3e02..a0314c39aa 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java @@ -46,7 +46,6 @@ public class ExShuttleGetOff implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_OFF.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_x); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java index 5211bef5ba..061bcafed9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java @@ -43,7 +43,6 @@ public class ExShuttleGetOn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_ON.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java index 97d54a9019..c8aee1fde7 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java @@ -43,7 +43,6 @@ public class ExShuttleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHUTTLE_INFO.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD(_shuttle.getX()); packet.writeD(_shuttle.getY()); @@ -60,8 +59,8 @@ public class ExShuttleInfo implements IClientOutgoingPacket packet.writeD(loc.getY()); packet.writeD(loc.getZ()); } - packet.writeD(stop.isDoorOpen() ? 0x01 : 0x00); - packet.writeD(stop.hasDoorChanged() ? 0x01 : 0x00); + packet.writeD(stop.isDoorOpen() ? 1 : 0); + packet.writeD(stop.hasDoorChanged() ? 1 : 0); } return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java index 6ba38f29a1..28b33b998e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java @@ -43,7 +43,6 @@ public class ExShuttleMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_MOVE.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD((int) _shuttle.getStat().getMoveSpeed()); packet.writeD((int) _shuttle.getStat().getRotationSpeed()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java index bf2b6ea6eb..6c31189d6a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java @@ -44,7 +44,6 @@ public class ExStopMoveInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_SHUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java index f7f6849732..8492f42a6e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java @@ -44,7 +44,6 @@ public class ExValidateLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_SHUTTLE.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java index 1d59c6d002..e7654ed911 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java @@ -60,7 +60,7 @@ public class AccountKicked implements IOutgoingPacket { OutgoingPackets.ACCOUNT_KICKED.writeId(packet); packet.writeD(_reason.getCode()); - return true; } } + diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 2e3a1f6163..1fe813e393 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: response + * Format: d d: response */ public class GGAuth implements IOutgoingPacket { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/network/serverpackets/Init.java index 4b3f71f30e..d725f45ca2 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/network/serverpackets/Init.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/network/serverpackets/Init.java @@ -52,7 +52,6 @@ public class Init implements IOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.INIT.writeId(packet); - packet.writeD(_sessionId); // session id packet.writeD(0x0000c621); // protocol revision diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index 8c534554a8..f4dcd22b00 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: the failure reason + * Format: d d: the failure reason */ public class LoginFail implements IOutgoingPacket { diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index c700328f3d..f8b05abb47 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -529,7 +529,7 @@ public class Lindvior extends AbstractNpcAI for (Location loc : CONTROL_GENERATOR_SPAWNS) { guard = (FriendlyNpc) addSpawn(NPC_GENERATOR, loc, true); - guard.setDisplayEffect(0x01); + guard.setDisplayEffect(1); guard.setScriptValue(i++); _generatorSpawn.add(guard); } @@ -685,7 +685,7 @@ public class Lindvior extends AbstractNpcAI if (!hasFlag(_activeMask, 1 << index)) { _activeMask |= 1 << index; - npc.setDisplayEffect(0x02); + npc.setDisplayEffect(2); sendEventTrigger(true, GENERATOR_TRIGERS[index]); _zoneLair.getPlayersInside().stream().forEach(p -> p.broadcastPacket(new Earthquake(p.getX(), p.getY(), p.getZ(), 20, 10))); if (hasFlag(_activeMask, 0xf)) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/BaseRecievePacket.java index c682cb741d..a6ed15ce32 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/BaseRecievePacket.java @@ -73,7 +73,7 @@ public abstract class BaseRecievePacket try { result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE); - result = result.substring(0, result.indexOf(0x00)); + result = result.substring(0, result.indexOf(0)); _off += (result.length() * 2) + 2; } catch (Exception e) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/BaseSendablePacket.java index a9d918de4c..8fa8491cbf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/commons/network/BaseSendablePacket.java @@ -117,16 +117,16 @@ public abstract class BaseSendablePacket public byte[] getBytes() { // if (this instanceof Init) - // writeD(0x00); // reserve for XOR initial key + // writeD(0); // reserve for XOR initial key - writeD(0x00); // reserve for checksum + writeD(0); // reserve for checksum final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++) { - writeC(0x00); + writeC(0); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/AttackType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/AttackType.java index 6064b10ed7..e9983f15e3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/AttackType.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/AttackType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum AttackType { - MISSED(0x01), - BLOCKED(0x02), - CRITICAL(0x04), - SHOT_USED(0x08); + MISSED(1), + BLOCKED(2), + CRITICAL(4), + SHOT_USED(8); private final int _mask; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/GroupType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/GroupType.java index 954aaace8b..916a14fd05 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/GroupType.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/GroupType.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum GroupType implements IUpdateTypeComponent { - NONE(0x01), - PARTY(0x02), - COMMAND_CHANNEL(0x04); + NONE(1), + PARTY(2), + COMMAND_CHANNEL(4); private int _mask; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/ItemListType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/ItemListType.java index 2d38c8f5b1..c80234439f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/ItemListType.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/ItemListType.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum ItemListType implements IUpdateTypeComponent { - AUGMENT_BONUS(0x01), - ELEMENTAL_ATTRIBUTE(0x02), - ENCHANT_EFFECT(0x04), - VISUAL_ID(0x08), - SOUL_CRYSTAL(0x10); + AUGMENT_BONUS(1), + ELEMENTAL_ATTRIBUTE(2), + ENCHANT_EFFECT(4), + VISUAL_ID(8), + SOUL_CRYSTAL(16); private final int _mask; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java index b3d08596c6..29403b783d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum MacroUpdateType { - ADD(0x01), - LIST(0x01), - MODIFY(0x02), - DELETE(0x00); + ADD(1), + LIST(1), + MODIFY(2), + DELETE(0); private final int _id; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java index 86c6159869..7776721c0f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java @@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum PartySmallWindowUpdateType implements IUpdateTypeComponent { - CURRENT_CP(0x01), - MAX_CP(0x02), - CURRENT_HP(0x04), - MAX_HP(0x08), - CURRENT_MP(0x10), - MAX_MP(0x20), - LEVEL(0x40), - CLASS_ID(0x80), - PARTY_SUBSTITUTE(0x100), - VITALITY_POINTS(0x200); + CURRENT_CP(1), + MAX_CP(2), + CURRENT_HP(4), + MAX_HP(8), + CURRENT_MP(16), + MAX_MP(32), + LEVEL(64), + CLASS_ID(128), + PARTY_SUBSTITUTE(256), + VITALITY_POINTS(512); private final int _mask; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 00bb331778..667ce7f17c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.Broadcast; import org.l2jmobius.gameserver.util.Util; /** - * Fromat:(ch) dddddc + * Format:(ch) dddddc * @author -Wooden- */ public class RequestExMagicSkillUseGround implements IClientIncomingPacket diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java index ec60042793..6054868de7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java @@ -39,7 +39,6 @@ public class AbnormalStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ABNORMAL_STATUS_UPDATE.writeId(packet); - packet.writeH(_effects.size()); for (BuffInfo info : _effects) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 1b8ddb2042..bec794bef3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -44,7 +44,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; } @@ -60,7 +59,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; setHtml(html); } @@ -77,13 +75,11 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } - if (!html.contains(""; return; } - _html = html; } @@ -96,7 +92,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } - setHtml(content); return true; } @@ -138,12 +133,10 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { player.clearHtmlActions(getScope()); } - if (_disabledValidation) { return; } - if (player != null) { Util.buildHtmlActionCache(player, getScope(), _npcObjId, _html); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index e9cd6a88b8..b99d4d3348 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -86,8 +86,8 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket= 0) || (item.getAttributeDefence(AttributeType.FIRE) > 0) || (item.getAttributeDefence(AttributeType.WATER) > 0) || (item.getAttributeDefence(AttributeType.WIND) > 0) || (item.getAttributeDefence(AttributeType.EARTH) > 0) || (item.getAttributeDefence(AttributeType.HOLY) > 0) || (item.getAttributeDefence(AttributeType.DARK) > 0)) { mask |= ItemListType.ELEMENTAL_ATTRIBUTE.getMask(); } - if (item.getEnchantOptions() != null) { for (int id : item.getEnchantOptions()) @@ -184,17 +182,14 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket 0) { mask |= ItemListType.VISUAL_ID.getMask(); } - if (((item.getSoulCrystalOptions() != null) && !item.getSoulCrystalOptions().isEmpty()) || ((item.getSoulCrystalSpecialOptions() != null) && !item.getSoulCrystalSpecialOptions().isEmpty())) { mask |= ItemListType.SOUL_CRYSTAL.getMask(); } - return mask; } @@ -262,7 +257,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); packet.writeC(removeSkills.size()); for (Skill removed : removeSkills) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java index 8fa6259f64..6451dffd02 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ActionFailed implements IClientOutgoingPacket { public static final ActionFailed STATIC_PACKET = new ActionFailed(); - private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); + private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); static { for (SkillCastingType castingType : SkillCastingType.values()) @@ -57,7 +57,6 @@ public class ActionFailed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ACTION_FAIL.writeId(packet); - packet.writeD(_castingType); // MagicSkillUse castingType return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java index 6e868368c9..30ce58da60 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java @@ -44,9 +44,8 @@ public class AgitDecoInfo implements IClientOutgoingPacket { continue; } - packet.writeC(_residense.hasFunction(type) ? 0x01 : 0x00); + packet.writeC(_residense.hasFunction(type) ? 1 : 0); } - // Unknown packet.writeD(0); // TODO: Find me! packet.writeD(0); // TODO: Find me! diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java index 6cb71fc985..4683fb30f0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java @@ -44,7 +44,6 @@ public class AllianceInfo implements IClientOutgoingPacket _name = leader.getAllyName(); _leaderC = leader.getName(); _leaderP = leader.getLeaderName(); - final Collection allies = ClanTable.getInstance().getClanAllies(allianceId); _allies = new ClanInfo[allies.size()]; int idx = 0; @@ -57,7 +56,6 @@ public class AllianceInfo implements IClientOutgoingPacket total += ci.getTotal(); online += ci.getOnline(); } - _total = total; _online = online; } @@ -66,18 +64,16 @@ public class AllianceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_INFO.writeId(packet); - packet.writeS(_name); packet.writeD(_total); packet.writeD(_online); packet.writeS(_leaderC); packet.writeS(_leaderP); - packet.writeD(_allies.length); for (ClanInfo aci : _allies) { packet.writeS(aci.getClan().getName()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(aci.getClan().getLevel()); packet.writeS(aci.getClan().getLeaderName()); packet.writeD(aci.getTotal()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java index f9d08f6600..186fd12e81 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java @@ -44,7 +44,6 @@ public class AllyCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java index 6218f1717f..1ae4653f91 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java @@ -38,7 +38,6 @@ public class AskJoinAlly implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_ALLIANCE.writeId(packet); - packet.writeD(_requestorObjId); packet.writeS(null); // Ally Name ? packet.writeS(null); // TODO: Find me! diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java index a66bb3cd33..b9cfbe81b9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java @@ -39,7 +39,6 @@ public class AskJoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_PARTY.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 05c420ff59..227ab571be 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -45,7 +45,6 @@ public class Attack implements IClientOutgoingPacket _attackerObjId = attacker.getObjectId(); _attackerLoc = new Location(attacker); _targetLoc = new Location(target); - final Player player = attacker.getActingPlayer(); if (player == null) { @@ -111,7 +110,6 @@ public class Attack implements IClientOutgoingPacket final Iterator it = _hits.iterator(); final Hit firstHit = it.next(); OutgoingPackets.ATTACK.writeId(packet); - packet.writeD(_attackerObjId); packet.writeD(firstHit.getTargetId()); packet.writeD(_soulshotVisualSubstitute); // Ertheia @@ -121,13 +119,11 @@ public class Attack implements IClientOutgoingPacket packet.writeD(_attackerLoc.getX()); packet.writeD(_attackerLoc.getY()); packet.writeD(_attackerLoc.getZ()); - packet.writeH(_hits.size() - 1); while (it.hasNext()) { writeHit(packet, it.next()); } - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java index bd6878eb42..8b85fe85e3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java @@ -35,7 +35,6 @@ public class AutoAttackStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_START.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java index e767d1877a..a294b1e212 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java @@ -35,7 +35,6 @@ public class AutoAttackStop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_STOP.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java index 3f329415df..0c79677eae 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java @@ -38,7 +38,6 @@ public class BlockListPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BLOCK_LIST.writeId(packet); - packet.writeD(_playersId.size()); for (int playerId : _playersId) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index f610cdc6aa..d95f0543b9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -45,8 +45,7 @@ public class BuyList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x00); // Type BUY + packet.writeD(0); // Type BUY packet.writeQ(_money); // current money packet.writeD(_listId); packet.writeD(_inventorySlots); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index cd25af908d..7cb2bf4425 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -50,36 +50,34 @@ public class BuyListSeed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BUY_LIST_SEED.writeId(packet); - packet.writeQ(_money); // current money - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeD(_manorId); // manor id - if (!_list.isEmpty()) { packet.writeH(_list.size()); // list length for (SeedProduction s : _list) { - packet.writeC(0x00); // mask item 0 to print minimal item information + packet.writeC(0); // mask item 0 to print minimal item information packet.writeD(s.getId()); // ObjectId packet.writeD(s.getId()); // ItemId packet.writeC(0xFF); // T1 packet.writeQ(s.getAmount()); // Quantity - packet.writeC(0x05); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item - packet.writeC(0x00); // Filler (always 0) - packet.writeH(0x00); // Equipped : 00-No, 01-yes - packet.writeQ(0x00); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand - packet.writeH(0x00); // Enchant level (pet level shown in control item) + packet.writeC(5); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item + packet.writeC(0); // Filler (always 0) + packet.writeH(0); // Equipped : 00-No, 01-yes + packet.writeQ(0); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand + packet.writeH(0); // Enchant level (pet level shown in control item) packet.writeD(-1); packet.writeD(-9999); - packet.writeC(0x01); // GOD Item enabled = 1 disabled (red) = 0 + packet.writeC(1); // GOD Item enabled = 1 disabled (red) = 0 packet.writeQ(s.getPrice()); // price } _list.clear(); } else { - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java index 3a7b67af23..f3dc872dca 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java @@ -32,8 +32,7 @@ public class CSShowComBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - - packet.writeC(0x01); // c4 1 to show community 00 to hide + packet.writeC(1); // c4 1 to show community 00 to hide packet.writeB(_html); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java index eacc27aa07..b18dac4cc3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java @@ -36,7 +36,6 @@ public class CameraMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CAMERA_MODE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java index 1682f5bc62..adea754676 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java @@ -39,7 +39,6 @@ public class ChairSit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAIR_SIT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_staticObjectId); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java index 2bc31a285a..de141fa067 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java @@ -38,7 +38,6 @@ public class ChangeMoveType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_MOVE_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_running ? RUN : WALK); packet.writeD(0); // c2 diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index 73277d923d..fbe5e39e2e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -22,17 +22,17 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ChangeWaitType implements IClientOutgoingPacket { + public static final int WT_SITTING = 0; + public static final int WT_STANDING = 1; + public static final int WT_START_FAKEDEATH = 2; + public static final int WT_STOP_FAKEDEATH = 3; + private final int _objectId; private final int _moveType; private final int _x; private final int _y; private final int _z; - public static final int WT_SITTING = 0; - public static final int WT_STANDING = 1; - public static final int WT_START_FAKEDEATH = 2; - public static final int WT_STOP_FAKEDEATH = 3; - public ChangeWaitType(Creature creature, int newMoveType) { _objectId = creature.getObjectId(); @@ -46,7 +46,6 @@ public class ChangeWaitType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_WAIT_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_moveType); packet.writeD(_x); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index 41180bac50..aa2e7b2eaa 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -30,7 +30,6 @@ public class CharCreateFail implements IClientOutgoingPacket public static final int REASON_CREATE_NOT_ALLOWED = 0x05; // "Characters cannot be created from this server." public static final int REASON_CHOOSE_ANOTHER_SVR = 0x06; // "Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please // choose another server." - private final int _error; public CharCreateFail(int errorCode) @@ -42,7 +41,6 @@ public class CharCreateFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index f0e99885ad..768617e558 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -31,8 +31,7 @@ public class CharCreateOk implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_SUCCESS.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index bed289ca0a..1674eef343 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -33,7 +33,6 @@ public class CharDeleteFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_DELETE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 207a2cf462..636f199190 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -34,6 +34,22 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { + private static final int[] PAPERDOLL_ORDER = new int[] + { + Inventory.PAPERDOLL_UNDER, + Inventory.PAPERDOLL_HEAD, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_LHAND, + Inventory.PAPERDOLL_GLOVES, + Inventory.PAPERDOLL_CHEST, + Inventory.PAPERDOLL_LEGS, + Inventory.PAPERDOLL_FEET, + Inventory.PAPERDOLL_CLOAK, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_HAIR, + Inventory.PAPERDOLL_HAIR2 + }; + private final Player _player; private final Clan _clan; private int _objId; @@ -56,22 +72,6 @@ public class CharInfo implements IClientOutgoingPacket private int _vehicleId = 0; private final boolean _gmSeeInvis; - private static final int[] PAPERDOLL_ORDER = new int[] - { - Inventory.PAPERDOLL_UNDER, - Inventory.PAPERDOLL_HEAD, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_LHAND, - Inventory.PAPERDOLL_GLOVES, - Inventory.PAPERDOLL_CHEST, - Inventory.PAPERDOLL_LEGS, - Inventory.PAPERDOLL_FEET, - Inventory.PAPERDOLL_CLOAK, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_HAIR, - Inventory.PAPERDOLL_HAIR2 - }; - public CharInfo(Player player, boolean gmSeeInvis) { _player = player; @@ -120,16 +120,15 @@ public class CharInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); // Confirmed packet.writeD(_y); // Confirmed packet.writeD(_z); // Confirmed packet.writeD(_vehicleId); // Confirmed packet.writeD(_objId); // Confirmed packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed - packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) @@ -153,10 +152,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.getPvpFlag()); packet.writeD(_player.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -167,53 +164,40 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); - packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeS(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle()); - packet.writeD(_player.getAppearance().getVisibleClanId()); packet.writeD(_player.getAppearance().getVisibleClanCrestId()); packet.writeD(_player.getAppearance().getVisibleAllyId()); packet.writeD(_player.getAppearance().getVisibleAllyCrestId()); - - packet.writeC(_player.isSitting() ? 0x00 : 0x01); // Confirmed - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // Confirmed - packet.writeC(_player.isInCombat() ? 0x01 : 0x00); // Confirmed - - packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 0x01 : 0x00); // Confirmed - - packet.writeC(_player.isInvisible() ? 0x01 : 0x00); - + packet.writeC(_player.isSitting() ? 0 : 1); // Confirmed + packet.writeC(_player.isRunning() ? 1 : 0); // Confirmed + packet.writeC(_player.isInCombat() ? 1 : 0); // Confirmed + packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 1 : 0); // Confirmed + packet.writeC(_player.isInvisible() ? 1 : 0); packet.writeC(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount packet.writeC(_player.getPrivateStoreType().getId()); // Confirmed packet.writeH(_player.getCubics().size()); // Confirmed _player.getCubics().keySet().forEach(packet::writeH); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); // Confirmed packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); packet.writeH(_player.getRecomHave()); // Confirmed packet.writeD(_player.getMountNpcId() == 0 ? 0 : _player.getMountNpcId() + 1000000); - packet.writeD(_player.getClassId().getId()); // Confirmed - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeC(_player.isMounted() ? 0 : _enchantLevel); // Confirmed - packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeD(_player.getClanCrestLargeId()); packet.writeC(_player.getNobleLevel()); // Confirmed packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 2 : 0); // 152 - Value for enabled changed to 2? packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed - final ILocational baitLocation = _player.getFishing().getBaitLocation(); if (baitLocation != null) { @@ -229,29 +213,21 @@ public class CharInfo implements IClientOutgoingPacket } packet.writeD(_player.getAppearance().getNameColor()); // Confirmed - packet.writeD(_heading); // Confirmed - packet.writeC(_player.getPledgeClass()); packet.writeH(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); // Confirmed - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - - packet.writeC(0x00); // nPvPRestrainStatus - + packet.writeC(0); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentHp())); // Confirmed packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - - packet.writeC(0x00); // cBRLectureMark + packet.writeC(0); // cBRLectureMark final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed @@ -263,14 +239,15 @@ public class CharInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } + packet.writeC(_player.isTrueHero() ? 100 : 0); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); // Hair accessory + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); // Hair accessory packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points + packet.writeD(0); + packet.writeD(0); - packet.writeD(0x00); - packet.writeD(0x00); + // Rank. packet.writeC(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : 0); - return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 7187b73184..11f5f4df52 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -40,17 +40,16 @@ public class CharSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTED.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getTitle()); packet.writeD(_sessionId); packet.writeD(_player.getClanId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x01); // active ?? + packet.writeD(1); // active ?? packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -62,25 +61,20 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_player.getReputation()); packet.writeD(_player.getPkKills()); packet.writeD(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_player.getClassId().getId()); - packet.writeB(new byte[16]); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeB(new byte[28]); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 88a0e7803b..815217150e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -45,10 +45,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { private static final Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); - private final String _loginName; - private final int _sessionId; - private int _activeId; - private final List _characterPackages; private static final int[] PAPERDOLL_ORDER = new int[] { @@ -113,7 +109,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_ARTIFACT20, // 152 Inventory.PAPERDOLL_ARTIFACT21 // 152 }; - private static final int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, @@ -127,6 +122,11 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_HAIR2, }; + private final String _loginName; + private final int _sessionId; + private int _activeId; + private final List _characterPackages; + /** * Constructor for CharSelectionInfo. * @param loginName @@ -157,16 +157,13 @@ public class CharSelectionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.size(); packet.writeD(size); // Created character count - packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) - packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 0x01 : 0x00); // if 1 can't create new char - packet.writeC(0x01); // 0=can't play, 1=can play free until level 85, 2=100% free play - packet.writeD(0x02); // if 1, Korean client - packet.writeC(0x00); // Gift message for inactive accounts // 152 - + packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 1 : 0); // if 1 can't create new char + packet.writeC(1); // 0=can't play, 1=can play free until level 85, 2=100% free play + packet.writeD(2); // if 1, Korean client + packet.writeC(0); // Gift message for inactive accounts // 152 // Balthus Knights if (Config.BALTHUS_KNIGHTS_ENABLED) { @@ -175,23 +172,22 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (Config.PREMIUM_SYSTEM_ENABLED) { PremiumManager.getInstance().loadPremiumData(_loginName); - packet.writeC(PremiumManager.getInstance().getPremiumExpiration(_loginName) > 0 ? 0x01 : 0x00); + packet.writeC(PremiumManager.getInstance().getPremiumExpiration(_loginName) > 0 ? 1 : 0); } else { - packet.writeC(0x00); + packet.writeC(0); } } else { - packet.writeC(0x01); + packet.writeC(1); } } else { - packet.writeC(0x00); + packet.writeC(0); } - long lastAccess = 0; if (_activeId == -1) { @@ -204,7 +200,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - for (int i = 0; i < size; i++) { final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); @@ -212,89 +207,72 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name packet.writeD(_sessionId); // Account ID - packet.writeD(0x00); // Clan ID - packet.writeD(0x00); // Builder level - + packet.writeD(0); // Clan ID + packet.writeD(0); // Builder level packet.writeD(charInfoPackage.getSex()); // Sex packet.writeD(charInfoPackage.getRace()); // Race packet.writeD(charInfoPackage.getBaseClassId()); - - packet.writeD(0x01); // GameServerName - + packet.writeD(1); // GameServerName packet.writeD(charInfoPackage.getX()); packet.writeD(charInfoPackage.getY()); packet.writeD(charInfoPackage.getZ()); packet.writeF(charInfoPackage.getCurrentHp()); packet.writeF(charInfoPackage.getCurrentMp()); - packet.writeQ(charInfoPackage.getSp()); packet.writeQ(charInfoPackage.getExp()); packet.writeF((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel()))); packet.writeD(charInfoPackage.getLevel()); - packet.writeD(charInfoPackage.getReputation()); packet.writeD(charInfoPackage.getPkKills()); packet.writeD(charInfoPackage.getPvPKills()); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); // Ertheia - packet.writeD(0x00); // Ertheia - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); // Ertheia + packet.writeD(0); // Ertheia for (int slot : getPaperdollOrder()) { packet.writeD(charInfoPackage.getPaperdollItemId(slot)); } - for (int slot : getPaperdollOrderVisualId()) { packet.writeD(charInfoPackage.getPaperdollItemVisualId(slot)); } - packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_CHEST)); // Upper Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_LEGS)); // Lower Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_HEAD)); // Headgear enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_GLOVES)); // Gloves enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_FEET)); // Boots enchant level - packet.writeD(charInfoPackage.getHairStyle()); packet.writeD(charInfoPackage.getHairColor()); packet.writeD(charInfoPackage.getFace()); - packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); - packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption1Id() : 0); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption2Id() : 0); - // packet.writeD(charInfoPackage.getTransformId()); // Used to display Transformations - packet.writeD(0x00); // Currently on retail when you are on character select you don't see your transformation. - - packet.writeD(0x00); // Pet NpcId - packet.writeD(0x00); // Pet level - packet.writeD(0x00); // Pet Food - packet.writeD(0x00); // Pet Food Level - packet.writeF(0x00); // Current pet HP - packet.writeF(0x00); // Current pet MP - + packet.writeD(0); // Currently on retail when you are on character select you don't see your transformation. + packet.writeD(0); // Pet NpcId + packet.writeD(0); // Pet level + packet.writeD(0); // Pet Food + packet.writeD(0); // Pet Food Level + packet.writeF(0); // Current pet HP + packet.writeF(0); // Current pet MP packet.writeD(charInfoPackage.getVitalityPoints()); // Vitality packet.writeD((int) Config.RATE_VITALITY_EXP_MULTIPLIER * 100); // Vitality Percent packet.writeD(charInfoPackage.getVitalityItemsUsed()); // Remaining vitality item uses - packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0x00 : 0x01); // Char is active or not - packet.writeC(charInfoPackage.isNoble() ? 0x01 : 0x00); - packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 0x02 : 0x00); // Hero glow - packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 0x01 : 0x00); // Show hair accessory if enabled + packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0 : 1); // Char is active or not + packet.writeC(charInfoPackage.isNoble() ? 1 : 0); + packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 2 : 0); // Hero glow + packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 1 : 0); // Show hair accessory if enabled } return true; } @@ -303,7 +281,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); - try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate")) { @@ -316,7 +293,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (charInfopackage != null) { characterList.add(charInfopackage); - final Player player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { @@ -330,7 +306,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return characterList; } @@ -372,7 +347,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { clan.removeClanMember(objectId, 0); } - GameClient.deleteCharByObjId(objectId); return null; } @@ -391,20 +365,16 @@ public class CharSelectionInfo implements IClientOutgoingPacket charInfopackage.setHairStyle(chardata.getInt("hairstyle")); charInfopackage.setHairColor(chardata.getInt("haircolor")); charInfopackage.setSex(chardata.getInt("sex")); - charInfopackage.setExp(chardata.getLong("exp")); charInfopackage.setSp(chardata.getLong("sp")); charInfopackage.setVitalityPoints(chardata.getInt("vitality_points")); charInfopackage.setClanId(chardata.getInt("clanid")); - charInfopackage.setRace(chardata.getInt("race")); - final int baseClassId = chardata.getInt("base_class"); final int activeClassId = chardata.getInt("classid"); charInfopackage.setX(chardata.getInt("x")); charInfopackage.setY(chardata.getInt("y")); charInfopackage.setZ(chardata.getInt("z")); - final int faction = chardata.getInt("faction"); if (faction == 1) { @@ -414,7 +384,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setEvil(); } - if (Config.MULTILANG_ENABLE) { String lang = chardata.getString("language"); @@ -424,22 +393,18 @@ public class CharSelectionInfo implements IClientOutgoingPacket } charInfopackage.setHtmlPrefix("data/lang/" + lang + "/"); } - // if is in subclass, load subclass exp, sp, level info if (baseClassId != activeClassId) { loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId); } - charInfopackage.setClassId(activeClassId); - // Get the augmentation id for equipped weapon int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); if (weaponObjId < 1) { weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); } - if (weaponObjId > 0) { try (Connection con = DatabaseFactory.getConnection(); @@ -465,7 +430,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } - // Check if the base class is set to zero and also doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly. if ((baseClassId == 0) && (activeClassId > 0)) { @@ -475,7 +439,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setBaseClassId(baseClassId); } - charInfopackage.setDeleteTimer(deletetime); charInfopackage.setLastAccess(chardata.getLong("lastAccess")); charInfopackage.setNoble(chardata.getInt("nobless") == 1); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java index 847e24db87..d59df7911a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java @@ -32,7 +32,6 @@ public class ChooseInventoryItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHOOSE_INVENTORY_ITEM.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java index 12a3940521..ac66c2fa0f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java @@ -32,7 +32,6 @@ public class ClientSetTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CLIENT_SET_TIME.writeId(packet); - packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // time in client minutes packet.writeD(6); // constant to match the server time( this determines the speed of the client clock) return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java index 195824578b..5fdb62f544 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java @@ -68,7 +68,6 @@ public class ConfirmDlg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CONFIRM_DLG.writeId(packet); - final SMParam[] params = _systemMessage.getParams(); packet.writeD(_systemMessage.getId()); packet.writeD(params.length); @@ -130,7 +129,6 @@ public class ConfirmDlg implements IClientOutgoingPacket } } } - packet.writeD(_time); packet.writeD(_requesterId); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index e11807bdba..63acd728ea 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -73,7 +73,6 @@ public class CreatureSay implements IClientOutgoingPacket _mask |= 0x08; } } - // Does not shows level if (sender.isGM()) { @@ -125,7 +124,6 @@ public class CreatureSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_sender == null ? 0 : _sender.getObjectId()); packet.writeD(_chatType.getClientId()); if (_senderName != null) @@ -156,7 +154,6 @@ public class CreatureSay implements IClientOutgoingPacket packet.writeS(s); } } - // Rank if ((_sender != null) && _sender.isPlayer()) { @@ -165,7 +162,6 @@ public class CreatureSay implements IClientOutgoingPacket { packet.writeC(0); // unknown clan byte } - final int rank = RankManager.getInstance().getPlayerGlobalRank(_sender.getActingPlayer()); if ((rank == 0) || (rank > 100)) { @@ -183,7 +179,6 @@ public class CreatureSay implements IClientOutgoingPacket { packet.writeC(3); } - if (clan != null) { packet.writeC(clan.getCastleId()); @@ -197,7 +192,6 @@ public class CreatureSay implements IClientOutgoingPacket { packet.writeC(0); } - return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index dfc40d995f..a307b06e4b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -38,9 +38,8 @@ public class DeleteObject implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DELETE_OBJECT.writeId(packet); - packet.writeD(_objectId); - packet.writeC(0x00); // c2 + packet.writeC(0); // c2 return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java index 982c8f3311..3b5917e55b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java @@ -50,7 +50,6 @@ public class Dice implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DICE.writeId(packet); - packet.writeD(_objectId); // object id of player packet.writeD(_itemId); // item id of dice (spade) 4625,4626,4627,4628 packet.writeD(_number); // number rolled diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 52daec99cc..609b485b51 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -57,7 +57,6 @@ public class Die implements IClientOutgoingPacket siegeClan = fort.getSiege().getAttackerClan(clan); isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan); } - // ClanHall check. if ((clan != null) && (clan.getHideoutId() > 0)) { @@ -92,12 +91,12 @@ public class Die implements IClientOutgoingPacket OutgoingPackets.DIE.writeId(packet); packet.writeD(_objectId); packet.writeQ(_flags); - packet.writeD(_isSweepable ? 0x01 : 0x00); - packet.writeD(0x00); // Feather item time. - packet.writeC(0x00); // Hide die animation. - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(_isSweepable ? 1 : 0); + packet.writeD(0); // Feather item time. + packet.writeC(0); // Hide die animation. + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java index 15404f9dee..5837faec19 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java @@ -33,7 +33,6 @@ public class DoorInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_INFO.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.getId()); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java index 54f8742a73..14d41afee7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java @@ -33,7 +33,6 @@ public class DoorStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_STATUS_UPDATE.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.isOpen() ? 0 : 1); packet.writeD(_door.getDamage()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index b12458e719..3035890956 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -40,20 +40,17 @@ public class DropItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DROP_ITEM.writeId(packet); - packet.writeD(_objectId); packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeC(_item.isStackable() ? 0x01 : 0x00); + packet.writeC(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - - packet.writeC(0x00); - // packet.writeD(0x01); if above C == true (1) then packet.readD() + packet.writeC(0); + // packet.writeD(1); if above C == true (1) then packet.readD() packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java index 631c43ba0c..99bd80d97e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java @@ -62,13 +62,12 @@ public class Earthquake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EARTHQUAKE.writeId(packet); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_intensity); packet.writeD(_duration); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 6063a54535..1a8b8ddfbb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -59,25 +59,20 @@ public class EnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_crystal); packet.writeQ(_count); - // Guessing. // With 166 options became 3x write integers instead of shorts and enchant level moved bellow. - // Commenting until actually knowing. // for (int option : _enchantOptions) // { // packet.writeD(option); // } - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_enchantLevel); // Confirmed. - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java index a12f0286f3..22648f887e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java @@ -41,7 +41,6 @@ public class EtcStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ETC_STATUS_UPDATE.writeId(packet); - packet.writeC(_player.getCharges()); // 1-7 increase force, level packet.writeD(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%) packet.writeC(0); // Weapon Grade Penalty [1-4] diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java index 5dca90f960..9f8d576148 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java @@ -24,13 +24,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class Ex2ndPasswordAck implements IClientOutgoingPacket { + // TODO: Enum + public static final int SUCCESS = 0; + public static final int WRONG_PATTERN = 1; + private final int _status; private final int _response; - // TODO: Enum - public static final int SUCCESS = 0x00; - public static final int WRONG_PATTERN = 0x01; - public Ex2ndPasswordAck(int status, int response) { _status = status; @@ -41,10 +41,9 @@ public class Ex2ndPasswordAck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_ACK.writeId(packet); - packet.writeC(_status); - packet.writeD(_response == WRONG_PATTERN ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(_response == WRONG_PATTERN ? 1 : 0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java index 48bde5161d..c86b5185d0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordCheck implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_NEW = 0x00; - public static final int PASSWORD_PROMPT = 0x01; - public static final int PASSWORD_OK = 0x02; + public static final int PASSWORD_NEW = 0; + public static final int PASSWORD_PROMPT = 1; + public static final int PASSWORD_OK = 2; private final int _windowType; @@ -40,9 +40,8 @@ public class Ex2ndPasswordCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_CHECK.writeId(packet); - packet.writeD(_windowType); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java index 1abf50ab01..f6731bf18f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordVerify implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_OK = 0x00; - public static final int PASSWORD_WRONG = 0x01; - public static final int PASSWORD_BAN = 0x02; + public static final int PASSWORD_OK = 0; + public static final int PASSWORD_WRONG = 1; + public static final int PASSWORD_BAN = 2; private final int _wrongTentatives; private final int _mode; @@ -42,7 +42,6 @@ public class Ex2ndPasswordVerify implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_VERIFY.writeId(packet); - packet.writeD(_mode); packet.writeD(_wrongTentatives); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java index 8f3d5ec764..528988ab5f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java @@ -45,10 +45,8 @@ public class ExAbnormalStatusUpdateFromTarget implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ABNORMAL_STATUS_UPDATE_FROM_TARGET.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeH(_effects.size()); - for (BuffInfo info : _effects) { packet.writeD(info.getSkill().getDisplayId()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java index c4b9cd8356..f3abd6ec5c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java @@ -41,7 +41,6 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRABLE_SKILL_LIST_BY_CLASS.writeId(packet); - packet.writeH(_type.getId()); packet.writeH(_learnable.size()); for (SkillLearn skill : _learnable) @@ -54,7 +53,7 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket packet.writeC(skill.getRequiredItems().size()); if (_type == AcquireSkillType.SUBPLEDGE) { - packet.writeH(0x00); + packet.writeH(0); } } return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java index fd0e2fc97c..8555bb6e86 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java @@ -61,7 +61,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_SKILL_INFO.writeId(packet); - packet.writeD(_id); packet.writeD(_level); packet.writeQ(_spCost); @@ -73,7 +72,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket packet.writeD(holder.getId()); packet.writeQ(holder.getCount()); } - packet.writeD(_skillRem.size()); for (Skill skill : _skillRem) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java index 29793f4d6c..ff8c526ec4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java @@ -36,7 +36,6 @@ public class ExAdenaInvenCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ADENA_INVEN_COUNT.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeH(_player.getInventory().getSize()); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java index 2aa2d85bc5..5ef11e0f1e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java @@ -50,13 +50,11 @@ public class ExAirShipInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_INFO.writeId(packet); - packet.writeD(_ship.getObjectId()); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(_captain); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); @@ -73,14 +71,13 @@ public class ExAirShipInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - packet.writeD(_ship.getFuel()); packet.writeD(_ship.getMaxFuel()); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java index 4cfc76bfba..8b37f4fc0a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java @@ -42,7 +42,6 @@ public class ExAirShipStopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_airShipId); packet.writeD(_playerId); packet.writeD(_x); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java index 33c57712da..52958f931b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java @@ -37,12 +37,10 @@ public class ExAirShipTeleportList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_TELEPORT_LIST.writeId(packet); - packet.writeD(_dockId); if (_teleports != null) { packet.writeD(_teleports.length); - for (int i = 0; i < _teleports.length; i++) { packet.writeD(i - 1); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java index 392b228f0d..7918022c72 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java @@ -50,13 +50,12 @@ public class ExAlchemySkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_SKILL_LIST.writeId(packet); - packet.writeD(_skills.size()); for (Skill skill : _skills) { packet.writeD(skill.getId()); packet.writeD(skill.getLevel()); - packet.writeQ(0x00); // Always 0 on Naia, SP i guess? + packet.writeQ(0); // Always 0 on Naia, SP i guess? packet.writeC(skill.getId() == CommonSkill.ALCHEMY_CUBE.getId() ? 0 : 1); // This is type in flash, visible or not } return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java index 3bfadd2650..ed7f8d4255 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java @@ -47,12 +47,10 @@ public class ExAlterSkillRequest implements IClientOutgoingPacket { return true; } - OutgoingPackets.EX_ALTER_SKILL_REQUEST.writeId(packet); packet.writeD(_nextSkillId); packet.writeD(_currentSkillId); packet.writeD(_alterTime); - if (_alterTime > 0) { _player.setAlterSkillActive(true); @@ -62,7 +60,6 @@ public class ExAlterSkillRequest implements IClientOutgoingPacket _player.setAlterSkillActive(false); }, _alterTime * 1000); } - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java index 3d7ee12a81..1990e1e701 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java @@ -37,7 +37,6 @@ public class ExAskCoupleAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_COUPLE_ACTION.writeId(packet); - packet.writeD(_actionId); packet.writeD(_objectId); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java index 61cabedd98..45615daf5a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java @@ -39,9 +39,8 @@ public class ExAskJoinMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_MPCC.writeId(packet); - packet.writeS(_requestorName); // name of CCLeader - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java index 17fa9d028f..908022ff7e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java @@ -38,7 +38,6 @@ public class ExAskJoinPartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_PARTY_ROOM.writeId(packet); - packet.writeS(_charName); packet.writeS(_roomName); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java index 2a6b958dc9..1551840013 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java @@ -38,7 +38,6 @@ public class ExAskModifyPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_MODIFY_PARTY_LOOTING.writeId(packet); - packet.writeS(_requestor); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java index 958e7c3d06..fa62c8a207 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java @@ -45,7 +45,6 @@ public class ExAttributeEnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ATTRIBUTE_ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeC(_isWeapon); packet.writeH(_type); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java index 1a3a1ef3fe..3d65055b3c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java @@ -41,9 +41,8 @@ public class ExAutoSoulShot implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AUTO_SOUL_SHOT.writeId(packet); - packet.writeD(_itemId); - packet.writeD(_enable ? 0x01 : 0x00); + packet.writeD(_enable ? 1 : 0); packet.writeD(_type); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java index 8680c6bd7a..a8137347ec 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java @@ -37,8 +37,7 @@ public class ExBaseAttributeCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASE_ATTRIBUTE_CANCEL_RESULT.writeId(packet); - - packet.writeD(0x01); // result + packet.writeD(1); // result packet.writeD(_objId); packet.writeD(_attribute); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java index 3fd8588108..13ad96137d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java @@ -75,7 +75,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 1149, 1150, 1151, 1152, 1153, 1154, 1155 }; - public static final int[] DEFAULT_ACTION_LIST = { 0, 1, 2, 3, @@ -146,7 +145,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 5012, 5013, 5014, 5015 }; //@formatter:on - public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST); private final int[] _actionIds; @@ -160,7 +158,6 @@ public class ExBasicActionList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASIC_ACTION_LIST.writeId(packet); - packet.writeD(_actionIds.length); for (int _actionId : _actionIds) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java index 4c4fac8c91..d32dca4d21 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java @@ -34,13 +34,14 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBeautyItemList implements IClientOutgoingPacket { - private int _colorCount; - private final BeautyData _beautyData; - private final Map> _colorData = new HashMap<>(); private static final int HAIR_TYPE = 0; private static final int FACE_TYPE = 1; private static final int COLOR_TYPE = 2; + private int _colorCount; + private final BeautyData _beautyData; + private final Map> _colorData = new HashMap<>(); + public ExBeautyItemList(Player player) { _beautyData = BeautyShopData.getInstance().getBeautyData(player.getRace(), player.getAppearance().getSexType()); @@ -60,7 +61,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BEAUTY_ITEM_LIST.writeId(packet); - packet.writeD(HAIR_TYPE); packet.writeD(_beautyData.getHairList().size()); for (BeautyItem hair : _beautyData.getHairList().values()) @@ -72,7 +72,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(hair.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(FACE_TYPE); packet.writeD(_beautyData.getFaceList().size()); for (BeautyItem face : _beautyData.getFaceList().values()) @@ -84,7 +83,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(face.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(COLOR_TYPE); packet.writeD(_colorCount); for (Entry> entry : _colorData.entrySet()) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java index 1825236886..6d4c45cb2b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java @@ -34,7 +34,6 @@ public class ExBirthdayPopup implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_BIRTH_DAY.writeId(packet); - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java index 7d2f17e697..43e525f05f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java @@ -26,6 +26,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBrBroadcastEventState implements IClientOutgoingPacket { + public static final int APRIL_FOOLS = 20090401; + public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) + public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) + public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) + public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) + private final int _eventId; private final int _eventState; private int _param0; @@ -36,12 +42,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket private String _param5; private String _param6; - public static final int APRIL_FOOLS = 20090401; - public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) - public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) - public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) - public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) - public ExBrBroadcastEventState(int eventId, int eventState) { _eventId = eventId; @@ -65,7 +65,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BROADCAST_EVENT_STATE.writeId(packet); - packet.writeD(_eventId); packet.writeD(_eventState); packet.writeD(_param0); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java index 1fd7ec663a..c0683c8797 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java @@ -44,7 +44,6 @@ public class ExBrBuffEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUFF_EVENT_STATE.writeId(packet); - packet.writeD(_type); packet.writeD(_value); packet.writeD(_state); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java index 943aae8a62..8e009d7b09 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java @@ -43,7 +43,6 @@ public class ExBrLoadEventTopRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_LOAD_EVENT_TOP_RANKERS.writeId(packet); - packet.writeD(_eventId); packet.writeD(_day); packet.writeD(_count); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java index 6a98c01654..9105e39efe 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java @@ -36,9 +36,8 @@ public class ExBrPremiumState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PREMIUM_STATE.writeId(packet); - packet.writeD(_player.getObjectId()); - packet.writeC(_player.hasPremiumStatus() ? 0x01 : 0x00); + packet.writeC(_player.hasPremiumStatus() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 381dd859ad..567cfc70f9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -59,10 +59,8 @@ public class ExBuySellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x01); // Type SELL + packet.writeD(1); // Type SELL packet.writeD(_inventorySlots); - if ((_sellList != null)) { packet.writeH(_sellList.size()); @@ -74,9 +72,8 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - if ((_refundList != null) && !_refundList.isEmpty()) { packet.writeH(_refundList.size()); @@ -90,10 +87,9 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - - packet.writeC(_done ? 0x01 : 0x00); + packet.writeC(_done ? 1 : 0); return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java index 2b43c0ce4b..e0ec81e0e7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java @@ -39,7 +39,6 @@ public class ExCastleState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CASTLE_STATE.writeId(packet); - packet.writeD(_castleId); packet.writeD(_castleSide.ordinal()); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java index b7f90d261b..a8196c7a83 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java @@ -52,7 +52,6 @@ public class ExChangeClientEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_CLIENT_EFFECT_INFO.writeId(packet); - packet.writeD(_type); packet.writeD(_key); packet.writeD(_value); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java index 472abc88df..eea59162ee 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java @@ -37,7 +37,6 @@ public class ExChangeNpcState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NPC_STATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java index 8cdcb4460d..45f2805517 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java @@ -49,7 +49,6 @@ public class ExChangePostState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_POST_STATE.writeId(packet); - packet.writeD(_receivedBoard ? 1 : 0); packet.writeD(_changedMsgIds.length); for (int postId : _changedMsgIds) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java index fc58ec9a2e..d765ab54e0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java @@ -35,7 +35,6 @@ public class ExChangeToAwakenedClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_TO_AWAKENED_CLASS.writeId(packet); - packet.writeD(_classId); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index 0fc5fb1c75..fec31d4775 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -47,7 +47,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket throw new IllegalArgumentException("Undefined Atribute item: " + stone); } _level = ElementalAttributeData.getInstance().getMaxElementLevel(_itemId); - // Register only items that can be put an attribute stone/crystal for (Item item : player.getInventory().getItems()) { @@ -62,7 +61,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_INVENTORY_ATTRIBUTE_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeQ(_count); packet.writeD(_atribute == AttributeType.FIRE ? 1 : 0); // Fire diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java index a272d85469..238882cd11 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java @@ -35,7 +35,6 @@ public class ExCloseMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java index d2ecd70952..877bca760a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java @@ -34,7 +34,6 @@ public class ExClosePartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_PARTY_ROOM.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java index 27c112776b..1d02c972b5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java @@ -54,7 +54,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLOSSEUM_FENCE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_clientState); packet.writeD(_x); @@ -62,7 +61,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_width); packet.writeD(_length); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java index 766d3619ad..b72bef93e8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java @@ -37,9 +37,8 @@ public class ExConfirmAddingContact implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AGIT_AUCTION_CMD.writeId(packet); - packet.writeS(_charName); - packet.writeD(_added ? 0x01 : 0x00); + packet.writeD(_added ? 1 : 0); return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java index beded32254..c832d507ed 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameAddPlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x01); - + packet.writeD(1); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java index 5f36f730d0..847ea93e6a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java @@ -45,9 +45,7 @@ public class ExCubeGameChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java index 66abbf4b75..a2f2e61ded 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java @@ -43,12 +43,10 @@ public class ExCubeGameChangeTeam implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x05); - + packet.writeD(5); packet.writeD(_player.getObjectId()); - packet.writeD(_fromRedTeam ? 0x01 : 0x00); - packet.writeD(_fromRedTeam ? 0x00 : 0x01); + packet.writeD(_fromRedTeam ? 1 : 0); + packet.writeD(_fromRedTeam ? 0 : 1); return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java index 5273b2099a..136b439283 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java @@ -39,9 +39,7 @@ public class ExCubeGameChangeTimeToStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x03); - + packet.writeD(3); packet.writeD(_seconds); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java index f81a302941..9bdba49029 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java @@ -35,7 +35,6 @@ public class ExCubeGameCloseUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0xffffffff); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java index 259a0e9407..3177e7a488 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java @@ -40,11 +40,9 @@ public class ExCubeGameEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x01); - - packet.writeD(_isRedTeamWin ? 0x01 : 0x00); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(1); + packet.writeD(_isRedTeamWin ? 1 : 0); + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java index 4d89e621ce..8b96bb545f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java @@ -55,14 +55,11 @@ public class ExCubeGameExtendedChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeD(_playerPoints); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java index e5a00f1ab7..c084789f13 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameRemovePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java index 00be884d2f..35a3f289d1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java @@ -35,8 +35,7 @@ public class ExCubeGameRequestReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x04); + packet.writeD(4); return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java index 1bc89e0c32..8b755dd3cc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java @@ -30,7 +30,6 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket // Players Lists private final List _bluePlayers; private final List _redPlayers; - // Common Values private final int _roomNumber; @@ -51,12 +50,9 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_roomNumber); packet.writeD(0xffffffff); - packet.writeD(_bluePlayers.size()); for (Player player : _bluePlayers) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java index 2f2c092c08..d000112787 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java @@ -31,7 +31,6 @@ public class ExCursedWeaponList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet); - final Set ids = CursedWeaponsManager.getInstance().getCursedWeaponsIds(); packet.writeD(ids.size()); ids.forEach(packet::writeD); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java index 2f60a1b80c..5bc7ff3238 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java @@ -39,7 +39,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet); - if (!_cursedWeaponInfo.isEmpty()) { packet.writeD(_cursedWeaponInfo.size()); @@ -47,7 +46,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { packet.writeD(w.id); packet.writeD(w.activated); - packet.writeD(w.pos.getX()); packet.writeD(w.pos.getY()); packet.writeD(w.pos.getZ()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java index a0ba15da9f..8bee464fb0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java @@ -41,7 +41,6 @@ public class ExDieInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIE_INFO.writeId(packet); - packet.writeH(_droppedItems.size()); for (Item item : _droppedItems) { @@ -49,17 +48,15 @@ public class ExDieInfo implements IClientOutgoingPacket packet.writeD(item.getEnchantLevel()); packet.writeD((int) item.getCount()); } - packet.writeD(_lastDamageTaken.size()); for (DamageTakenHolder damageHolder : _lastDamageTaken) { packet.writeS(damageHolder.getCreature().getName()); - packet.writeH(0x00); + packet.writeH(0); packet.writeD(damageHolder.getSkillId()); packet.writeF(damageHolder.getDamage()); - packet.writeD(0x00); + packet.writeD(0); } - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java index f475a02b28..0456fb9dae 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java @@ -34,7 +34,6 @@ public class ExDissmissMPCCRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DISSMISS_MPCC_ROOM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java index 258010f717..c731b7c7a9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java @@ -37,7 +37,6 @@ public class ExDuelAskStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_ASK_START.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDuel); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java index 043c82c0db..e9a31bee57 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java @@ -38,7 +38,6 @@ public class ExDuelEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_END.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java index 264409b3d6..e1fa1cea88 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java @@ -38,7 +38,6 @@ public class ExDuelReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_READY.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java index 488aafcb7d..ecdd528a16 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java @@ -38,7 +38,6 @@ public class ExDuelStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_START.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java index 7df040c5e7..5ed0c09675 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java @@ -36,7 +36,6 @@ public class ExDuelUpdateUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_UPDATE_USER_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeD(_player.getClassId().getId()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 7ab055a3d8..f58c0573a8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExEnchantSkillInfo implements IClientOutgoingPacket { private final Set _routes; - private final int _skillId; private final int _skillLevel; private final int _skillSubLevel; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 41368a8efb..e4ee350e64 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -50,7 +50,6 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_INFO_DETAIL.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java index 5cedcd6284..1d32f0d725 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java @@ -43,7 +43,6 @@ public class ExEnchantSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_LIST.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skills.size()); for (Skill skill : _skills) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java index 6ab5e869f2..853d74039f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java @@ -38,7 +38,6 @@ public class ExEnchantSkillResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_RESULT.writeId(packet); - packet.writeD(_enchanted ? 1 : 0); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java index 7b7d2d008d..410bf16510 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java @@ -42,7 +42,6 @@ public class ExEventMatchMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_EVENT_MATCH_MESSAGE.writeId(packet); - packet.writeC(_type); packet.writeS(_message); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java index 7264e90233..1946758bf5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java @@ -37,11 +37,9 @@ public class ExGetBookMarkInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOOK_MARK_INFO.writeId(packet); - - packet.writeD(0x00); // Dummy + packet.writeD(0); // Dummy packet.writeD(_player.getBookMarkSlot()); packet.writeD(_player.getTeleportBookmarks().size()); - for (TeleportBookmark tpbm : _player.getTeleportBookmarks()) { packet.writeD(tpbm.getId()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java index 36e7bb81af..201e8eb49b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java @@ -42,15 +42,14 @@ public class ExGetBossRecord implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOSS_RECORD.writeId(packet); - packet.writeD(_ranking); packet.writeD(_totalPoints); if (_bossRecordInfo == null) { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } else { @@ -59,7 +58,7 @@ public class ExGetBossRecord implements IClientOutgoingPacket { packet.writeD(entry.getKey()); packet.writeD(entry.getValue()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? } } return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java index ea0a5f8b18..85ccad0758 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java @@ -41,7 +41,6 @@ public class ExGetOffAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_OFF_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_x); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java index f8e16a4191..9a02e49223 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java @@ -39,7 +39,6 @@ public class ExGetOnAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_ON_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java index 51197344a5..704b3212a1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExGetPremiumItemList implements IClientOutgoingPacket { private final Player _player; - private final Map _map; public ExGetPremiumItemList(Player player) @@ -43,7 +42,6 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_PREMIUM_ITEM_LIST.writeId(packet); - packet.writeD(_map.size()); for (Entry entry : _map.entrySet()) { @@ -51,7 +49,7 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket packet.writeQ(entry.getKey()); packet.writeD(item.getItemId()); packet.writeQ(item.getCount()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeS(item.getSender()); } return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index a005fa8ad8..0200bdee08 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -40,7 +40,6 @@ public class ExHeroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HERO_LIST.writeId(packet); - packet.writeD(_heroList.size()); for (StatSet hero : _heroList.values()) { @@ -51,7 +50,7 @@ public class ExHeroList implements IClientOutgoingPacket packet.writeS(hero.getString(Hero.ALLY_NAME, "")); packet.writeD(hero.getInt(Hero.ALLY_CREST, 0)); packet.writeD(hero.getInt(Hero.COUNT)); - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index d5b5430142..0baca7cd86 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -48,8 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); - - packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade + packet.writeC(_hide ? 0 : 1); // Grand Crusade packet.writeD(_currentTemplateId); packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java index 81db66b88f..323c0cdf1e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java @@ -35,7 +35,6 @@ public class ExIsCharNameCreatable implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_IS_CHAR_NAME_CREATABLE.writeId(packet); - packet.writeD(_allowed); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java index 2cea176d69..4eea62de37 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java @@ -39,11 +39,11 @@ public class ExItemAnnounce implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_ANNOUNCE.writeId(packet); - packet.writeC(0x00); // item icon + packet.writeC(0); // item icon packet.writeString(_player.getName()); // name of player packet.writeD(_item.getId()); // item id packet.writeD(_item.getEnchantLevel()); // enchant level - packet.writeC(0x00); // name of item + packet.writeC(0); // name of item return true; } } \ No newline at end of file diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java index ecc751eab3..45def9e0be 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java @@ -38,7 +38,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { throw new NullPointerException(); } - if (currentAuction.getAuctionState() != ItemAuctionState.STARTED) { _timeRemaining = 0; @@ -47,7 +46,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { _timeRemaining = (int) (currentAuction.getFinishingTimeRemaining() / 1000); // in seconds } - _refresh = refresh; _currentAuction = currentAuction; _nextAuction = nextAuction; @@ -57,16 +55,12 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_AUCTION_INFO.writeId(packet); - - packet.writeC(_refresh ? 0x00 : 0x01); + packet.writeC(_refresh ? 0 : 1); packet.writeD(_currentAuction.getInstanceId()); - final ItemAuctionBid highestBid = _currentAuction.getHighestBid(); packet.writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid()); - packet.writeD(_timeRemaining); writeItem(packet, _currentAuction.getItemInfo()); - if (_nextAuction != null) { packet.writeQ(_nextAuction.getAuctionInitBid()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java index f66c77509f..e40ebdb90b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java @@ -44,7 +44,6 @@ public class ExItemAuctionStatus implements IClientOutgoingPacket _x = spawn.getX(); _y = spawn.getY(); _z = spawn.getZ(); - final ItemAuctionInstance manager = ItemAuctionManager.getInstance().getManagerInstance(AUCTION_MANAGER); if (manager != null) { @@ -64,7 +63,7 @@ public class ExItemAuctionStatus implements IClientOutgoingPacket packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); + packet.writeD(0); packet.writeH(_status); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java index 53ad8abd58..1c5e38cbab 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListMpccWaiting implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _rooms = new LinkedList<>(); @@ -53,7 +54,6 @@ public class ExListMpccWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_MPCC_WAITING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 78f2fec636..eafea24fa6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _players = new LinkedList<>(); @@ -60,7 +61,6 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(packet); - packet.writeD(_size); packet.writeD(_players.size()); for (Player player : _players) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java index 786c616875..c8723a9fc0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java @@ -46,7 +46,6 @@ public class ExMPCCPartyInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCPARTY_INFO_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_LeaderOID); packet.writeD(_memberCount); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java index 4bf07f0133..08259e4e6c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java @@ -37,7 +37,6 @@ public class ExMPCCPartymasterList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_PARTYMASTER_LIST.writeId(packet); - packet.writeD(_leadersName.size()); _leadersName.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java index abbdc8fe76..f021ef5f1f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java @@ -36,7 +36,6 @@ public class ExMPCCRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java index 154e156270..2eec590cb4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java @@ -41,7 +41,6 @@ public class ExMPCCRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java index 06e3027bfc..a0e9d0a4b0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java @@ -37,7 +37,6 @@ public class ExMPCCShowPartyMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCSHOW_PARTY_MEMBER_INFO.writeId(packet); - packet.writeD(_party.getMemberCount()); for (Player pc : _party.getMembers()) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java index e454a746f3..771b2f22cb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java @@ -49,7 +49,6 @@ public class ExMagicAttackInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAGIC_ATTACK_INFO.writeId(packet); - packet.writeD(_caster); packet.writeD(_target); packet.writeD(_type); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java index 9cfbeb5aee..1aaa5b6520 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java @@ -35,7 +35,6 @@ public class ExMailArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAIL_ARRIVED.writeId(packet); - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java index 983ff22b92..48156c0600 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java @@ -44,7 +44,6 @@ public class ExManageMpccRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MANAGE_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java index f710c006e8..9d7d14211e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java @@ -45,7 +45,6 @@ public class ExMoveToLocationAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_objId); packet.writeD(_tx); packet.writeD(_ty); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java index 3e3bdc9fed..87e44b51cd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java @@ -43,7 +43,6 @@ public class ExMoveToLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java index 7ab0d1c7da..3c1902892a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java @@ -40,11 +40,9 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet); - packet.writeS(_channel.getLeader().getName()); - packet.writeD(0x00); // Channel loot 0 or 1 + packet.writeD(0); // Channel loot 0 or 1 packet.writeD(_channel.getMemberCount()); - packet.writeD(_channel.getParties().size()); for (Party p : _channel.getParties()) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java index 1536bd5f9b..f2a32bb6e8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java @@ -43,7 +43,6 @@ public class ExNeedToChangeName implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEED_TO_CHANGE_NAME.writeId(packet); - packet.writeD(_type); packet.writeD(_subType); packet.writeS(_name); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java index be9bec8559..d18b4606b3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java @@ -35,7 +35,6 @@ public class ExNevitAdventEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CHANNELING_EFFECT.writeId(packet); - packet.writeD(_timeLeft); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java index 3a0367c178..09f6250f51 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java @@ -35,7 +35,6 @@ public class ExNevitAdventPointInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_AGATHION_ENERGY_INFO.writeId(packet); - packet.writeD(_points); // 72 = 1%, max 7200 = 100% return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java index 88fdaae499..ef220d86de 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java @@ -37,9 +37,8 @@ public class ExNevitAdventTimeChange implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - // state 0 - pause 1 - started - packet.writeC(_paused ? 0x00 : 0x01); + packet.writeC(_paused ? 0 : 1); // left time in ms max is 16000 its 4m and state is automatically changed to quit packet.writeD(_time); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java index fccdf510cc..4025bf78fa 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java @@ -34,7 +34,6 @@ public class ExNewSkillToLearnByLevelUp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEW_SKILL_TO_LEARN_BY_LEVEL_UP.writeId(packet); - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java index 324c18a517..f2ce8614dc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java @@ -43,8 +43,7 @@ public class ExNoticePostArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTICE_POST_ARRIVED.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java index afe3719d9b..050c7ccea5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java @@ -43,8 +43,7 @@ public class ExNoticePostSent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_WRITE_POST.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java index 5d98c20b09..e0bd08d39a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java @@ -30,7 +30,6 @@ public class ExNotifyPremiumItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_PREMIUM_ITEM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java index 6cb3724448..ba3c0cfeaa 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java @@ -34,7 +34,6 @@ public class ExOlympiadMatchEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MATCH_END.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java index 264d5aa484..7ffd5ed3bd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java @@ -55,19 +55,15 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x00); // Type 0 = Match List, 1 = Match Result - + packet.writeD(0); // Type 0 = Match List, 1 = Match Result packet.writeD(_games.size()); - packet.writeD(0x00); - + packet.writeD(0); for (OlympiadGameTask curGame : _games) { final AbstractOlympiadGame game = curGame.getGame(); if (game != null) { packet.writeD(game.getStadiumId()); // Stadium Id (Arena 1 = 0) - if (game instanceof OlympiadGameNonClassed) { packet.writeD(1); @@ -80,8 +76,7 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket { packet.writeD(0); } - - packet.writeD(curGame.isRunning() ? 0x02 : 0x01); // (1 = Standby, 2 = Playing) + packet.writeD(curGame.isRunning() ? 2 : 1); // (1 = Standby, 2 = Playing) packet.writeS(game.getPlayerNames()[0]); // Player 1 Name packet.writeS(game.getPlayerNames()[1]); // Player 2 Name } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java index 712651603d..b387271fba 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java @@ -53,9 +53,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x01); // Type 0 = Match List, 1 = Match Result - + packet.writeD(1); // Type 0 = Match List, 1 = Match Result packet.writeD(_tie ? 1 : 0); // 0 - win, 1 - tie packet.writeS(_winnerList.get(0).getName()); packet.writeD(_winTeam); @@ -69,9 +67,8 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } - packet.writeD(_loseTeam); packet.writeD(_loserList.size()); for (OlympiadInfo info : _loserList) @@ -83,7 +80,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java index 34d81d1f53..712b9e06c6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java @@ -38,7 +38,6 @@ public class ExOlympiadMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MODE.writeId(packet); - packet.writeC(_mode); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java index ebea6c56f3..5b4f2c2523 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java @@ -53,7 +53,6 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_SPELLED_INFO.writeId(packet); - packet.writeD(_playerId); packet.writeD(_effects.size() + _effects2.size()); for (BuffInfo info : _effects) @@ -62,7 +61,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(info.getSkill().getDisplayId()); packet.writeH(info.getSkill().getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(info.getSkill().getAbnormalType().getClientId()); writeOptionalD(packet, info.getSkill().isAura() ? -1 : info.getTime()); } @@ -73,7 +72,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(skill.getDisplayId()); packet.writeH(skill.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(skill.getAbnormalType().getClientId()); packet.writeH(-1); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java index 18c34fe9de..ca473edfcf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java @@ -76,7 +76,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_USER_INFO.writeId(packet); - if (_player != null) { packet.writeC(_player.getOlympiadSide()); @@ -91,7 +90,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket packet.writeS(_par.getName()); packet.writeD(_par.getBaseClass()); } - packet.writeD(_curHp); packet.writeD(_maxHp); packet.writeD(_curCp); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java index e84d0251bd..7ec64cc8c3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java @@ -35,7 +35,6 @@ public class ExOpenMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OPEN_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java index 90349cc1a2..5661dc9f57 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java @@ -56,7 +56,6 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PCCAFE_POINT_INFO.writeId(packet); - packet.writeD(_points); // num points packet.writeD(_mAddPoint); // points inc display packet.writeC(_mPeriodType); // period(0=don't show window,1=acquisition,2=use points) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java index f7e8b4a99a..248a2f7d98 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_ADD.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java index 832bee0012..1f452f4bae 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_DELETE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_summon.getSummonType()); packet.writeD(_summon.getOwner().getObjectId()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java index 0646a67001..703694fa2f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_UPDATE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 0e3edb3ea7..e4c6b79ae0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -47,7 +47,6 @@ public class ExPartyRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2bffdec368..2ebf1dc7f0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -43,10 +43,8 @@ public class ExPetInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class ExPetInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class ExPetInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,9 +154,8 @@ public class ExPetInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -227,28 +205,24 @@ public class ExPetInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PET_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -267,7 +241,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -283,19 +257,19 @@ public class ExPetInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -307,20 +281,20 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -344,12 +318,12 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -379,12 +353,10 @@ public class ExPetInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java index 082f4c7662..0f72c05a3a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java @@ -34,7 +34,6 @@ public class ExPlayScene implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLAY_SCENE.writeId(packet); - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java index e98d317e14..7e3803bdaa 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java @@ -36,7 +36,6 @@ public class ExPledgeCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_COUNT.writeId(packet); - packet.writeD(_count); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java index 838029e284..4084de3481 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java @@ -38,7 +38,6 @@ public class ExPledgeDraftListSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_DRAFT_LIST_SEARCH.writeId(packet); - packet.writeD(_pledgeRecruitList.size()); for (PledgeWaitingInfo prl : _pledgeRecruitList) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java index fb956e9996..44e34004ea 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java @@ -25,11 +25,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExPledgeEmblem implements IClientOutgoingPacket { + private static final int TOTAL_SIZE = 65664; + private final int _crestId; private final int _clanId; private final byte[] _data; private final int _chunkId; - private static final int TOTAL_SIZE = 65664; public ExPledgeEmblem(int crestId, byte[] chunkedData, int clanId, int chunkId) { @@ -43,7 +44,6 @@ public class ExPledgeEmblem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clanId); packet.writeD(_crestId); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java index ed19bf976b..b32f8c0645 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitApplyInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_APPLY_INFO.writeId(packet); - packet.writeD(_status.ordinal()); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java index fc98b7b6f7..af4af9c9c1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitBoardDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_DETAIL.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClanId()); packet.writeD(_pledgeRecruitInfo.getKarma()); packet.writeS(_pledgeRecruitInfo.getInformation()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index b4d48373a6..eda808e754 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -34,7 +34,6 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket private final int _clanOnCurrentPage; private final int _startIndex; private final int _endIndex; - static final int CLAN_PER_PAGE = 12; public ExPledgeRecruitBoardSearch(List clanList, int currentPage) @@ -51,11 +50,9 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_SEARCH.writeId(packet); - packet.writeD(_currentPage); packet.writeD(_totalNumberOfPage); packet.writeD(_clanOnCurrentPage); - for (int i = _startIndex; i < _endIndex; i++) { packet.writeD(_clanList.get(i).getClanId()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 4ae5ffe316..b1f139226d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -40,7 +40,6 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java index 77080a3820..5844f220ec 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java @@ -39,7 +39,6 @@ public class ExPledgeWaitingList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST.writeId(packet); - packet.writeD(pledgePlayerRecruitInfos.size()); for (PledgeApplicantInfo recruitInfo : pledgePlayerRecruitInfos.values()) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java index a9245c1309..6b88572057 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java @@ -30,7 +30,6 @@ public class ExPledgeWaitingListAlarm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_ALARM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java index 60997b3da0..28c3967119 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java @@ -40,7 +40,6 @@ public class ExPledgeWaitingListApplied implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_APPLIED.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClan().getId()); packet.writeS(_pledgeRecruitInfo.getClan().getName()); packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java index 66a06892c2..1f53d1bb38 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java @@ -36,7 +36,6 @@ public class ExPledgeWaitingUser implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_USER.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getPlayerId()); packet.writeS(_pledgeRecruitInfo.getMessage()); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java index 49bc9b0995..5f404779f5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java @@ -43,7 +43,6 @@ public class ExPrivateStoreSetWholeMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_objectId); packet.writeS(_msg); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java index cb5e8fbce9..ff996b5d0c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutCommissionResultForVariationMake implements IClientOutgoingPac public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_COMMISSION_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_gemstoneObjId); packet.writeD(_itemId); packet.writeQ(_gemstoneCount); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java index 81721e921f..098472b7ae 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantScrollItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SCROLL_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java index 871f377db2..ffea182a49 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java index c47a4bcff4..8016e128f4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java index c8b46be499..95c0c0e4e1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_INTENSIVE_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_refinerItemObjId); packet.writeD(_lifestoneItemId); packet.writeD(_gemstoneItemId); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 2128b2b19f..2970ca00a2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -41,13 +41,12 @@ public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_CANCEL.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); packet.writeD(_itemAug1); packet.writeD(_itemAug2); packet.writeQ(_price); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java index 80541e65cd..c25dd16b01 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java @@ -34,10 +34,9 @@ public class ExPutItemResultForVariationMake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java index fe5eb74eb0..bc8896164d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java @@ -56,13 +56,12 @@ public class ExQuestNpcLogList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_NPC_LOG_LIST.writeId(packet); - packet.writeD(_questId); packet.writeC(_npcLogList.size()); for (NpcLogListHolder holder : _npcLogList) { packet.writeD(holder.isNpcString() ? holder.getId() : holder.getId() + 1000000); - packet.writeC(holder.isNpcString() ? 0x01 : 0x00); + packet.writeC(holder.isNpcString() ? 1 : 0); packet.writeD(holder.getCount()); } return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java index 62d622caff..60616b256d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java @@ -35,7 +35,6 @@ public class ExRedSky implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RED_SKY.writeId(packet); - packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java index ce40b1a792..163faff855 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java @@ -36,7 +36,6 @@ public class ExRegenMax implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REGEN_MAX.writeId(packet); - packet.writeD(1); packet.writeD(_time); packet.writeD(_tickInterval); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java index d864795cd6..a17525576b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java @@ -34,7 +34,6 @@ public class ExRemoveEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REMOVE_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 57ed88ac29..4e479e75a6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -56,7 +56,6 @@ public class ExReplyReceivedPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_RECEIVED_POST.writeId(packet); - packet.writeD(_msg.getMailType().ordinal()); // GOD if (_msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED) { @@ -76,11 +75,10 @@ public class ExReplyReceivedPost extends AbstractItemPacket } packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown packet.writeS(_msg.getSenderName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -92,9 +90,8 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeQ(_msg.getReqAdena()); packet.writeD(_msg.hasAttachments() ? 1 : 0); packet.writeD(_msg.isReturned() ? 1 : 0); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 75f6596194..ed490eae91 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -54,14 +54,12 @@ public class ExReplySentPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_SENT_POST.writeId(packet); - - packet.writeD(0x00); // GOD + packet.writeD(0); // GOD packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); packet.writeS(_msg.getReceiverName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -73,11 +71,11 @@ public class ExReplySentPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeQ(_msg.getReqAdena()); - packet.writeD(_msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(_msg.isReturned() ? 0x01 : 00); + packet.writeD(_msg.hasAttachments() ? 1 : 0); + packet.writeD(_msg.isReturned() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index cc4f7ce1d8..e6a3f9bca2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -35,7 +35,6 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java index 2634aa1cdd..60201b177f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java @@ -35,7 +35,6 @@ public class ExRequestHackShield implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REQUEST_HACK_SHIELD.writeId(packet); - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java index c51ff31d0b..75e3b3a945 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java @@ -29,13 +29,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyList implements IClientOutgoingPacket { + public static final int SHOW_FACESHAPE = 1; + public static final int SHOW_HAIRSTYLE = 0; + private final Player _player; private final int _type; private final Map _beautyItem; - public static final int SHOW_FACESHAPE = 1; - public static final int SHOW_HAIRSTYLE = 0; - public ExResponseBeautyList(Player player, int type) { _player = player; @@ -54,7 +54,6 @@ public class ExResponseBeautyList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java index ca2ed360ab..4b19201833 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java @@ -25,16 +25,15 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket { + public static final int FAILURE = 0; + public static final int SUCCESS = 1; + public static final int CHANGE = 0; + public static final int RESTORE = 1; + private final Player _player; private final int _type; private final int _result; - public static final int FAILURE = 0; - public static final int SUCCESS = 1; - - public static final int CHANGE = 0; - public static final int RESTORE = 1; - public ExResponseBeautyRegistReset(Player player, int type, int result) { _player = player; @@ -46,7 +45,6 @@ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_REGIST_RESET.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java index 0e313ef3b7..c0922cfb04 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java @@ -36,10 +36,8 @@ public class ExResponseResetList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_RESET_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); - packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java index 01fe1945ef..a230033d67 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java @@ -37,7 +37,6 @@ public class ExRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ROTATION.writeId(packet); - packet.writeD(_charId); packet.writeD(_heading); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index c58ccfc233..2646a71e77 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -36,7 +36,6 @@ public class ExRpItemLink extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RP_ITEM_LINK.writeId(packet); - writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java index 04556bbed2..f0c6eba8e9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java @@ -34,7 +34,6 @@ public class ExSearchOrc implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEARCH_ORC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index 1e06cc2a3f..7a4dced122 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -38,7 +38,6 @@ public class ExSendManorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_MANOR_LIST.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java index b63c69f37e..2c25cc8bfc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java @@ -124,7 +124,6 @@ public class ExSendUIEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_UIEVENT.writeId(packet); - packet.writeD(_objectId); packet.writeD(_type); // 0 = show, 1 = hide (there is 2 = pause and 3 = resume also but they don't work well you can only pause count down and you cannot resume it because resume hides the counter). packet.writeD(0); // unknown diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java index 4378479707..716a3e8623 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java @@ -385,16 +385,13 @@ public class ExServerPrimitive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SERVER_PRIMITIVE.writeId(packet); - packet.writeS(_name); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(65535); // has to do something with display range and angle packet.writeD(65535); // has to do something with display range and angle - packet.writeD(_points.size() + _lines.size()); - for (Point point : _points) { packet.writeC(1); // Its the type in this case Point @@ -408,7 +405,6 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(point.getY()); packet.writeD(point.getZ()); } - for (Line line : _lines) { packet.writeC(2); // Its the type in this case Line diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java index fb32e199b2..51fb91b643 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java @@ -46,7 +46,6 @@ public class ExSetCompassZoneCode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_COMPASS_ZONE_CODE.writeId(packet); - packet.writeD(_zoneType); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java index 1d0fbae3a4..34dee8bda0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java @@ -38,7 +38,6 @@ public class ExSetPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_PARTY_LOOTING.writeId(packet); - packet.writeD(_result); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java index 7b14ec8412..4e491af9d1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java @@ -34,7 +34,6 @@ public class ExShowAdventurerGuideBook implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_ADVENTURER_GUIDE_BOOK.writeId(packet); - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index 82554fdc5f..1f8df76083 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -39,7 +39,6 @@ public class ExShowAgitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AGIT_INFO.writeId(packet); - final Collection clanHalls = ClanHallData.getInstance().getClanHalls(); packet.writeD(clanHalls.size()); clanHalls.forEach(clanHall -> diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index dd11ee0150..51e6646ff5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -44,7 +44,6 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BASE_ATTRIBUTE_CANCEL_WINDOW.writeId(packet); - packet.writeD(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java index 14e55d39f3..e22345c4fd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java @@ -25,13 +25,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExShowBeautyMenu implements IClientOutgoingPacket { - private final Player _player; - private final int _type; - // TODO: Enum public static final int MODIFY_APPEARANCE = 0; public static final int RESTORE_APPEARANCE = 1; + private final Player _player; + private final int _type; + public ExShowBeautyMenu(Player player, int type) { _player = player; @@ -42,7 +42,6 @@ public class ExShowBeautyMenu implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BEAUTY_MENU.writeId(packet); - packet.writeD(_type); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 15d011befc..b0d2b90494 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -41,7 +41,6 @@ public class ExShowCastleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CASTLE_INFO.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) @@ -65,8 +64,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } packet.writeD(castle.getTaxPercent(TaxType.BUY)); packet.writeD((int) (castle.getSiege().getSiegeDate().getTimeInMillis() / 1000)); - - packet.writeC(castle.getSiege().isInProgress() ? 0x01 : 0x00); // Grand Crusade + packet.writeC(castle.getSiege().isInProgress() ? 1 : 0); // Grand Crusade packet.writeC(castle.getSide().ordinal()); // Grand Crusade } return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java index aeb4079f3a..f9a6ebe0e7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java @@ -38,7 +38,6 @@ public class ExShowContactList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_SHOW_POST_FRIEND.writeId(packet); - packet.writeD(_contacts.size()); _contacts.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index a079ea3129..94b989b583 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -37,7 +37,6 @@ public class ExShowCropInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _crops = (nextPeriod && !manor.isManorApproved()) ? null : manor.getCropProcure(manorId, nextPeriod); } @@ -46,10 +45,9 @@ public class ExShowCropInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Crop Sales" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Crop Sales" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); + packet.writeD(0); if (_crops != null) { packet.writeD(_crops.size()); @@ -64,17 +62,17 @@ public class ExShowCropInfo implements IClientOutgoingPacket if (seed == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(seed.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(seed.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(seed.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index a1e06eb2bf..1c65dde1a6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -62,10 +62,8 @@ public class ExShowCropSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getCropId()); // crop id diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index ee9fa9fd37..b625a1e4e7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -39,7 +39,6 @@ public class ExShowFortressInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_INFO.writeId(packet); - final Collection forts = FortManager.getInstance().getForts(); packet.writeD(forts.size()); for (Fort fort : forts) @@ -47,7 +46,7 @@ public class ExShowFortressInfo implements IClientOutgoingPacket final Clan clan = fort.getOwnerClan(); packet.writeD(fort.getResidenceId()); packet.writeS(clan != null ? clan.getName() : ""); - packet.writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00); + packet.writeD(fort.getSiege().isInProgress() ? 1 : 0); // Time of possession packet.writeD(fort.getOwnedTime()); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index f389b26ed5..678ab43e96 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -42,11 +42,9 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_MAP_INFO.writeId(packet); - packet.writeD(_fortress.getResidenceId()); packet.writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status packet.writeD(_fortress.getFortSize()); // barracks count - final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId()); if ((commanders != null) && !commanders.isEmpty() && _fortress.getSiege().isInProgress()) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 27da99cf41..da186103ae 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -51,7 +51,6 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_SIEGE_INFO.writeId(packet); - packet.writeD(_fortId); // Fortress Id packet.writeD(_size); // Total Barracks Count if (_csize > 0) @@ -64,22 +63,22 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { case 0: { - packet.writeD(0x03); + packet.writeD(3); break; } case 1: { - packet.writeD(0x02); + packet.writeD(2); break; } case 2: { - packet.writeD(0x01); + packet.writeD(1); break; } case 3: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -92,27 +91,27 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket // TODO: once control room supported, update packet.writeD(0x0x) to support 5th room case 0: { - packet.writeD(0x05); + packet.writeD(5); break; } case 1: { - packet.writeD(0x04); + packet.writeD(4); break; } case 2: { - packet.writeD(0x03); + packet.writeD(3); break; } case 3: { - packet.writeD(0x02); + packet.writeD(2); break; } case 4: { - packet.writeD(0x01); + packet.writeD(1); break; } } @@ -124,7 +123,7 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { for (int i = 0; i < _size; i++) { - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java index 8bb38fd28c..bc1e679418 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java @@ -41,8 +41,7 @@ public class ExShowManorDefaultInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_MANOR_DEFAULT_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" and "Crop Sales" buttons + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" and "Crop Sales" buttons packet.writeD(_crops.size()); for (Seed crop : _crops) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 1d3312d668..d03ce2a5fd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -52,10 +52,8 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet); - packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java index cf38d18c1c..f41999329f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java @@ -34,7 +34,6 @@ public class ExShowQuestInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_INFO.writeId(packet); - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java index 70f31e318f..0fa64c401d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java @@ -37,7 +37,6 @@ public class ExShowQuestMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_MARK.writeId(packet); - packet.writeD(_questId); packet.writeD(_questState); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index ab85228caf..1a6ee00a10 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ExShowReceivedPostList implements IClientOutgoingPacket { - private final List _inbox; - private static final int MESSAGE_FEE = 100; private static final int MESSAGE_FEE_PER_SLOT = 1000; + private final List _inbox; + public ExShowReceivedPostList(int objectId) { _inbox = MailManager.getInstance().getInbox(objectId); @@ -45,7 +45,6 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { @@ -64,18 +63,18 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getSenderName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); + packet.writeD(msg.isUnread() ? 1 : 0); packet.writeD(((msg.getMailType() == MailType.COMMISSION_ITEM_SOLD) || (msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED)) ? 0 : 1); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(msg.isReturned() ? 0x01 : 0x00); - packet.writeD(0x00); // SysString in some case it seems + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(msg.isReturned() ? 1 : 0); + packet.writeD(0); // SysString in some case it seems } } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(MESSAGE_FEE); packet.writeD(MESSAGE_FEE_PER_SLOT); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java index 9679468789..deebb99c8f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java @@ -33,6 +33,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; */ public class ExShowScreenMessage implements IClientOutgoingPacket { + // Positions + public static final byte TOP_LEFT = 1; + public static final byte TOP_CENTER = 2; + public static final byte TOP_RIGHT = 3; + public static final byte MIDDLE_LEFT = 4; + public static final byte MIDDLE_CENTER = 5; + public static final byte MIDDLE_RIGHT = 6; + public static final byte BOTTOM_CENTER = 7; + public static final byte BOTTOM_RIGHT = 8; + private final int _type; private final int _sysMessageId; private final int _unk1; @@ -48,15 +58,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket private List _parameters; // Localisation related. private String _lang; - // Positions - public static final byte TOP_LEFT = 0x01; - public static final byte TOP_CENTER = 0x02; - public static final byte TOP_RIGHT = 0x03; - public static final byte MIDDLE_LEFT = 0x04; - public static final byte MIDDLE_CENTER = 0x05; - public static final byte MIDDLE_RIGHT = 0x06; - public static final byte BOTTOM_CENTER = 0x07; - public static final byte BOTTOM_RIGHT = 0x08; public void setLang(String lang) { @@ -265,7 +266,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SCREEN_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -284,9 +284,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(sml.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -308,9 +308,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -318,7 +318,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket } } } - packet.writeD(_type); packet.writeD(_sysMessageId); packet.writeD(_position); @@ -326,9 +325,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java index 29ab5d355f..6123b08991 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java @@ -37,7 +37,6 @@ public class ExShowSeedInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _seeds = (nextPeriod && !manor.isManorApproved()) ? null : manor.getSeedProduction(manorId, nextPeriod); } @@ -46,16 +45,14 @@ public class ExShowSeedInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown if (_seeds == null) { packet.writeD(0); return true; } - packet.writeD(_seeds.size()); for (SeedProduction seed : _seeds) { @@ -67,17 +64,17 @@ public class ExShowSeedInfo implements IClientOutgoingPacket if (s == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(s.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(s.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(s.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java index e628099700..eb6e686e10 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java @@ -32,13 +32,10 @@ public class ExShowSeedMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_MAP_INFO.writeId(packet); - packet.writeD(2); // seed count - // Seed of Destruction packet.writeD(1); // id 1? Grand Crusade packet.writeD(2770 + GraciaSeedsManager.getInstance().getSoDState()); // sys msg id - // Seed of Infinity packet.writeD(2); // id 2? Grand Crusade // Manager not implemented yet diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index c9bf485ee2..05c0401a7c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -62,10 +62,8 @@ public class ExShowSeedSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getSeedId()); // seed id diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 1994402da2..269bec5b97 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -47,7 +47,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _cropsItems.put(cropId, item); } } - for (CropProcure crop : CastleManorManager.getInstance().getCropProcure(_manorId, false)) { if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) @@ -61,7 +60,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_cropsItems.size()); // size for (Item item : _cropsItems.values()) @@ -70,9 +68,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket packet.writeD(item.getObjectId()); // Object id packet.writeD(item.getId()); // crop id packet.writeD(seed.getLevel()); // seed level - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(1)); // reward 1 id - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(2)); // reward 2 id if (_castleCrops.containsKey(item.getId())) { @@ -85,9 +83,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket else { packet.writeD(0xFFFFFFFF); // manor - packet.writeQ(0x00); // buy residual - packet.writeQ(0x00); // buy price - packet.writeC(0x00); // reward + packet.writeQ(0); // buy residual + packet.writeQ(0); // buy price + packet.writeC(0); // reward } packet.writeQ(item.getCount()); // my crops } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index db4bccc928..b61d5b2301 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -40,7 +40,6 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { @@ -50,17 +49,17 @@ public class ExShowSentPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getReceiverName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); - packet.writeD(0x01); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(msg.isUnread() ? 1 : 0); + packet.writeD(1); + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(0); } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java index 0e4e9fd2ef..0dca57f2f8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java @@ -48,7 +48,6 @@ public class ExShowTerritory implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TERRITORY.writeId(packet); - packet.writeD(_vertices.size()); packet.writeD(_minZ); packet.writeD(_maxZ); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java index 4e284f82c5..86e1009bbf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java @@ -46,7 +46,6 @@ public class ExShowTrace implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TRACE.writeId(packet); - packet.writeH(0); // type broken in H5 packet.writeD(0); // time broken in H5 packet.writeH(_locations.size()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java index 3245767ed7..836a5c9624 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java @@ -44,7 +44,6 @@ public class ExShowUsm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_USM.writeId(packet); - packet.writeD(_videoId); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java index 4acdffa842..1f1a14c31b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java @@ -34,7 +34,6 @@ public class ExShowVariationCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_CANCEL_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java index 3a2298019e..9870424e26 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java @@ -35,7 +35,6 @@ public class ExShowVariationMakeWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_MAKE_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java index 169827bab3..86211c8d97 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java @@ -44,10 +44,9 @@ public class ExSpawnEmitter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SPAWN_EMITTER.writeId(packet); - packet.writeD(_npcObjectId); packet.writeD(_playerObjectId); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java index 620800c1c4..534549b4fe 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java @@ -36,7 +36,6 @@ public class ExStartScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_START_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java index 0bd990cf34..babac59129 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java index 0e2689d598..d3e67afe99 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipObjId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java index 44b064113f..f5b3e1340f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java @@ -36,7 +36,6 @@ public class ExStopScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index 8029930c9a..367ac79be4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -66,7 +66,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket } OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet); - packet.writeD(_inventory); packet.writeD(_warehouse); // packet.writeD(_freight); // Removed with 152. diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java index 3293a5b557..57563ca2f9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java @@ -39,7 +39,6 @@ public class ExSubPledgeSkillAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUB_PLEDGET_SKILL_ADD.writeId(packet); - packet.writeD(_type); packet.writeD(_skillId); packet.writeD(_skillLevel); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java index d61dfa20ab..816d6f16a6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java @@ -97,7 +97,6 @@ public class ExSubjobInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUBJOB_INFO.writeId(packet); - packet.writeC(_type); packet.writeD(_currClassId); packet.writeD(_currRace); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java index 85616016c7..b7a152629d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java @@ -38,7 +38,6 @@ public class ExTacticalSign implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TACTICAL_SIGN.writeId(packet); - packet.writeD(_target.getObjectId()); packet.writeD(_tokenId); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java index 3486e6281d..9e03a8bd0a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java @@ -39,7 +39,6 @@ public class ExTeleportToLocationActivate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_TO_LOCATION_ACTIVATE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java index f860c2a40f..aab66c2e48 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java @@ -44,7 +44,6 @@ public class ExTryEnchantArtifactResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TRY_ENCHANT_ARTIFACT_RESULT.writeId(packet); - packet.writeD(_state); packet.writeD(_enchant); packet.writeD(0); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java index a214c53a0f..7bcddd964d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java @@ -27,6 +27,7 @@ public class ExUISetting implements IClientOutgoingPacket { public static final String UI_KEY_MAPPING_VAR = "UI_KEY_MAPPING"; public static final String SPLIT_VAR = " "; + private final byte[] _uiKeyMapping; public ExUISetting(Player player) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java index 187770cfc8..eff4285a8b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java @@ -37,7 +37,6 @@ public class ExUnReadMailCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_UN_READ_MAIL_COUNT.writeId(packet); - packet.writeD(_mailUnreadCount); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java index f992b3c937..e59c651371 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java @@ -41,7 +41,6 @@ public class ExUseSharedGroupItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USE_SHARED_GROUP_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeD(_grpId); packet.writeD(_remainingTime); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java index 474fcc5208..f49d451587 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class ExUserInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getTransformationId()); - final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); final boolean isInvisible = _player.isInvisible(); packet.writeD(abnormalVisualEffects.size() + (isInvisible ? 1 : 0)); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java index b841449ab3..1069a64e3e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java @@ -36,12 +36,9 @@ public class ExUserInfoCubic implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_CUBIC.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(_player.getCubics().size()); - _player.getCubics().keySet().forEach(packet::writeH); - packet.writeD(_player.getAgathionId()); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java index 3e4afb995b..6ef31d6117 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java @@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExUserInfoEquipSlot extends AbstractMaskPacket { private final Player _player; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -66,11 +65,9 @@ public class ExUserInfoEquipSlot extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_EQUIP_SLOT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(InventorySlot.values().length); // 152 packet.writeB(_masks); - final PlayerInventory inventory = _player.getInventory(); for (InventorySlot slot : InventorySlot.values()) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java index 3eb1cf9578..d655e48843 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java @@ -36,7 +36,6 @@ public class ExUserInfoInvenWeight implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_INVEN_WEIGHT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java index 91e0e92338..16aa81e9c0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java @@ -44,7 +44,6 @@ public class ExValidateLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java index 727267c9d5..50cb4025e4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java @@ -35,7 +35,6 @@ public class ExVariationCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_CANCEL_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java index 5cdc1b8d0e..4fde190ae2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java @@ -32,14 +32,13 @@ public class ExVariationResult implements IClientOutgoingPacket { _option1 = option1; _option2 = option2; - _success = success ? 0x01 : 0x00; + _success = success ? 1 : 0; } @Override public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_RESULT.writeId(packet); - packet.writeD(_option1); packet.writeD(_option2); packet.writeD(_success); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java index db0acfd5ff..60fb57c0b3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java @@ -41,10 +41,9 @@ public class ExVitalityEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_EFFECT_INFO.writeId(packet); - packet.writeD(_points); packet.writeD(_vitalityBonus); // Vitality Bonus - packet.writeH(0x00); // Vitality additional bonus in % + packet.writeH(0); // Vitality additional bonus in % packet.writeH(_vitalityItemsRemaining); // How much vitality items remaining for use packet.writeH(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java index 3cd9d26602..9a401c2321 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java @@ -35,7 +35,6 @@ public class ExVitalityPointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_POINT_INFO.writeId(packet); - packet.writeD(_vitalityPoints); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java index 71baff96ea..c4c5539ca4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java @@ -45,7 +45,6 @@ public class ExVoteSystemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VOTE_SYSTEM_INFO.writeId(packet); - packet.writeD(_recomLeft); packet.writeD(_recomHave); packet.writeD(_bonusTime); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java index 21411f5abc..452b0dc43a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java @@ -37,7 +37,6 @@ public class ExWorldChatCnt implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_WORLD_CHAT_CNT.writeId(packet); - packet.writeD(_points); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java index 5f935fe0dc..dc9c2288f8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java @@ -79,19 +79,17 @@ public class FakePlayerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // vehicleId + packet.writeD(0); // vehicleId packet.writeD(_objId); packet.writeS(_npc.getName()); - packet.writeH(_npc.getRace().ordinal()); - packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 0x01 : 0x00); + packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 1 : 0); packet.writeD(_fpcHolder.getClassId()); - - packet.writeD(0x00); // Inventory.PAPERDOLL_UNDER + packet.writeD(0); // Inventory.PAPERDOLL_UNDER packet.writeD(_fpcHolder.getEquipHead()); packet.writeD(_fpcHolder.getEquipRHand()); packet.writeD(_fpcHolder.getEquipLHand()); @@ -103,28 +101,22 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_fpcHolder.getEquipRHand()); // dual hand packet.writeD(_fpcHolder.getEquipHair()); packet.writeD(_fpcHolder.getEquipHair2()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderAugument()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } - packet.writeC(_fpcHolder.getArmorEnchantLevel()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderVisualId()) { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeC(_npc.getScriptValue()); // getPvpFlag() packet.writeD(_npc.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -135,16 +127,12 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_npc.getCollisionRadius()); packet.writeF(_npc.getCollisionHeight()); - packet.writeD(_fpcHolder.getHair()); packet.writeD(_fpcHolder.getHairColor()); packet.writeD(_fpcHolder.getFace()); - packet.writeS(_npc.getTemplate().getTitle()); - if (_clan != null) { packet.writeD(_clan.getId()); @@ -154,71 +142,51 @@ public class FakePlayerInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - - packet.writeC(0x01); // isSitting() ? 0x00 : 0x01 (at some initial tests it worked) - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); - packet.writeC(_npc.isInCombat() ? 0x01 : 0x00); - - packet.writeC(_npc.isAlikeDead() ? 0x01 : 0x00); - - packet.writeC(_npc.isInvisible() ? 0x01 : 0x00); - - packet.writeC(0x00); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount - packet.writeC(0x00); // getPrivateStoreType().getId() - - packet.writeH(0x00); // getCubics().size() + packet.writeC(1); // isSitting() ? 0 : 1 (at some initial tests it worked) + packet.writeC(_npc.isRunning() ? 1 : 0); + packet.writeC(_npc.isInCombat() ? 1 : 0); + packet.writeC(_npc.isAlikeDead() ? 1 : 0); + packet.writeC(_npc.isInvisible() ? 1 : 0); + packet.writeC(0); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount + packet.writeC(0); // getPrivateStoreType().getId() + packet.writeH(0); // getCubics().size() // getCubics().keySet().forEach(packet::writeH); - packet.writeC(0x00); - + packet.writeC(0); packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : 0); packet.writeH(_fpcHolder.getRecommends()); - packet.writeD(0x00); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 - + packet.writeD(0); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 packet.writeD(_fpcHolder.getClassId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(_fpcHolder.getWeaponEnchantLevel()); // isMounted() ? 0 : _enchantLevel - packet.writeC(_npc.getTeam().getId()); - - packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0x00); + packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0); packet.writeC(_fpcHolder.getNobleLevel()); - packet.writeC(_fpcHolder.isHero() ? 0x01 : 0x00); - - packet.writeC(_fpcHolder.isFishing() ? 0x01 : 0x00); - + packet.writeC(_fpcHolder.isHero() ? 1 : 0); + packet.writeC(_fpcHolder.isFishing() ? 1 : 0); packet.writeD(_fpcHolder.getBaitLocationX()); packet.writeD(_fpcHolder.getBaitLocationY()); packet.writeD(_fpcHolder.getBaitLocationZ()); - packet.writeD(_fpcHolder.getNameColor()); - packet.writeD(_heading); - packet.writeC(_fpcHolder.getPledgeStatus()); - packet.writeH(0x00); // getPledgeType() - + packet.writeH(0); // getPledgeType() packet.writeD(_fpcHolder.getTitleColor()); - - packet.writeC(0x00); // isCursedWeaponEquipped - - packet.writeD(0x00); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 - packet.writeD(0x00); // getTransformationDisplayId() + packet.writeC(0); // isCursedWeaponEquipped + packet.writeD(0); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 + packet.writeD(0); // getTransformationDisplayId() packet.writeD(_fpcHolder.getAgathionId()); - - packet.writeC(0x00); - - packet.writeD(0x00); // getCurrentCp() + packet.writeC(0); + packet.writeD(0); // getCurrentCp() packet.writeD(_npc.getMaxHp()); packet.writeD((int) Math.round(_npc.getCurrentHp())); packet.writeD(_npc.getMaxMp()); packet.writeD((int) Math.round(_npc.getCurrentMp())); - - packet.writeC(0x00); + packet.writeC(0); final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) @@ -229,9 +197,9 @@ public class FakePlayerInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(0x00); // cocPlayer.getPosition() - packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 0x01 : 0x00); - packet.writeC(0x00); // Used Ability Points + packet.writeC(0); // cocPlayer.getPosition() + packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 1 : 0); + packet.writeC(0); // Used Ability Points return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java index ae088538da..03223c8a3e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java @@ -62,7 +62,6 @@ public class FlyToLocation implements IClientOutgoingPacket _destY = destY; _destZ = destZ; _type = type; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -82,7 +81,6 @@ public class FlyToLocation implements IClientOutgoingPacket _flySpeed = flySpeed; _flyDelay = flyDelay; _animationSpeed = animationSpeed; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -103,7 +101,6 @@ public class FlyToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FLY_TO_LOCATION.writeId(packet); - packet.writeD(_chaObjId); packet.writeD(_destX); packet.writeD(_destY); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java index 1e52b0ef72..471d70f791 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java @@ -35,8 +35,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x01); + packet.writeC(1); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 81a384642c..fb7572fc5d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -50,7 +50,6 @@ public class GMHennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GMHENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON @@ -64,19 +63,19 @@ public class GMHennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(0x01); + packet.writeD(1); } if (_player.getHenna(4) != null) { packet.writeD(_player.getHenna(4).getDyeId()); - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 1 : 0); } else { - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid } return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java index 38ca4c7be0..59bf0d9d93 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java @@ -38,7 +38,6 @@ public class GMHide implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_HIDE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index a828a26584..117f9cf67d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -50,7 +50,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -79,28 +78,24 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); packet.writeD(_player.getPkKills()); - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollObjectId(slot)); } - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); } - for (int slot = 0; slot < 11; slot++) { final VariationInstance augment = _player.getInventory().getPaperdollAugmentation(slot); packet.writeD(augment != null ? augment.getOption1Id() : 0); // Confirmed packet.writeD(augment != null ? augment.getOption2Id() : 0); // Confirmed } - packet.writeC(_player.getInventory().getTalismanSlots()); // CT2.3 packet.writeC(_player.getInventory().canEquipCloak() ? 1 : 0); // CT2.3 - packet.writeD(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeH(0); packet.writeD(_player.getPAtk()); packet.writeD(_player.getPAtkSpd()); packet.writeD(_player.getPDef()); @@ -108,18 +103,14 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAccuracy()); packet.writeD(_player.getCriticalHit()); packet.writeD(_player.getMAtk()); - packet.writeD(_player.getMAtkSpd()); packet.writeD(_player.getPAtkSpd()); - packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicEvasionRate()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name packet.writeD(_player.getReputation()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -135,8 +126,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeD(_player.isGM() ? 0x01 : 0x00); // builder level - + packet.writeD(_player.isGM() ? 1 : 0); // builder level packet.writeS(_player.getTitle()); packet.writeD(_player.getClanId()); // pledge id packet.writeD(_player.getClanCrestId()); // pledge crest id @@ -146,26 +136,19 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeC(_player.getCreateItemLevel() > 0 ? 1 : 0); packet.writeD(_player.getPkKills()); packet.writeD(_player.getPvpKills()); - packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); - - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeC(321); - packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window - packet.writeC(_player.getNobleLevel()); - packet.writeC(_player.isHero() ? 0x01 : 0x00); - + packet.writeC(_player.isHero() ? 1 : 0); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); - final AttributeType attackAttribute = _player.getAttackElement(); packet.writeH(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); @@ -175,8 +158,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket } packet.writeD(_player.getFame()); packet.writeD(_player.getVitalityPoints()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index 1d88596096..552b6e6168 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -37,14 +37,12 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_player.getName()); packet.writeD(_clan.getId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); @@ -52,15 +50,14 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 packet.writeD(_clan.getAllyCrestId()); // c2 packet.writeD(_clan.isAtWar() ? 1 : 0); // c3 - packet.writeD(0x00); // T3 Unknown - + packet.writeD(0); // T3 Unknown packet.writeD(_clan.getMembers().size()); for (ClanMember member : _clan.getMembers()) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java index 93af10e254..3c155ff816 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -38,10 +38,8 @@ public class GMViewSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_SKILL_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_skills.size()); - final boolean isDisabled = (_player.getClan() != null) && (_player.getClan().getReputationScore() < 0); for (Skill skill : _skills) { @@ -49,7 +47,7 @@ public class GMViewSkillInfo implements IClientOutgoingPacket packet.writeH(skill.getDisplayLevel()); packet.writeH(skill.getSubLevel()); packet.writeD(skill.getDisplayId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(isDisabled && skill.isClanSkill() ? 1 : 0); packet.writeC(skill.isEnchantable() ? 1 : 0); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index f49138fafe..c909d5e6e1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -51,7 +51,6 @@ public class GMViewWarehouseWithdrawList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_WAREHOUSE_WITHDRAW_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java index d8c273f914..449271993b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java @@ -35,7 +35,6 @@ public class GameGuardQuery implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GAME_GUARD_QUERY.writeId(packet); - packet.writeD(0x27533DD9); packet.writeD(0x2E72A51D); packet.writeD(0x2017038B); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index b0c011b696..037b2e6b6b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -35,10 +35,8 @@ public class GetItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ITEM.writeId(packet); - packet.writeD(_playerId); packet.writeD(_item.getObjectId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java index f8c6126c87..5f4d7bf3ca 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java @@ -50,7 +50,6 @@ public class GetOffVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_OFF_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_x); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java index ffa8d5f310..77d1e6ba28 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java @@ -45,7 +45,6 @@ public class GetOnVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ON_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java index e5dcb9ded6..b1f5b588f9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java @@ -44,14 +44,13 @@ public class GmViewQuestInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_QUEST_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeH(_questList.size()); // quest count - for (Quest quest : _questList) { final QuestState qs = _player.getQuestState(quest.getName()); packet.writeD(quest.getId()); packet.writeD(qs == null ? 0 : qs.getCond()); } - packet.writeH(0x00); // some size + packet.writeH(0); // some size // for size; ddQQ return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 395487097c..4309e2d74f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -51,7 +51,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeQ(_player.getAdena()); // activeChar current amount of Adena packet.writeD(3); // available equip slot packet.writeD(_hennaEquipList.size()); - for (Henna henna : _hennaEquipList) { // Player must have at least one dye in inventory @@ -62,8 +61,8 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); // item Id of the dye packet.writeQ(henna.getWearCount()); // amount of dyes required packet.writeQ(henna.getWearFee()); // amount of Adena required - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not - packet.writeD(0x00); // TODO: Find me! + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // meet the requirement or not + packet.writeD(0); // TODO: Find me! } } return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 30dc837721..b84d2283e8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -51,7 +51,6 @@ public class HennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON @@ -65,9 +64,8 @@ public class HennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); } - final Henna premium = _player.getHenna(4); if (premium != null) { @@ -77,16 +75,15 @@ public class HennaInfo implements IClientOutgoingPacket final long currentTime = Chronos.currentTimeMillis(); duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000; } - packet.writeD(premium.getDyeId()); packet.writeD(duration); // Premium Slot Dye Time Left - packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 1 : 0); } else { - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid } return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index cf3d83263f..5b77709720 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -40,12 +40,11 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_ITEM_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getWearCount()); // total amount of dye require packet.writeQ(_henna.getWearFee()); // total amount of Adena require to draw symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to draw or not 0 is false and 1 is true + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to draw or not 0 is false and 1 is true packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() + _player.getHennaValue(BaseStat.INT)); // equip INT @@ -63,7 +62,7 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket packet.writeH(_player.getLUC() + _player.getHennaValue(BaseStat.LUC)); // equip LUC packet.writeD(_player.getCHA()); // current CHA packet.writeH(_player.getCHA() + _player.getHennaValue(BaseStat.CHA)); // equip CHA - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index cb1379ac29..fc93d02a73 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -40,12 +40,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getCancelCount()); // total amount of dye require packet.writeQ(_henna.getCancelFee()); // total amount of Adena require to remove symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to remove or not + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to remove or not packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() - _player.getHennaValue(BaseStat.INT)); // equip INT @@ -63,7 +62,7 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket packet.writeH(_player.getLUC() - _player.getHennaValue(BaseStat.LUC)); // equip LUC packet.writeD(_player.getCHA()); // current CHA packet.writeH(_player.getCHA() - _player.getHennaValue(BaseStat.CHA)); // equip CHA - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 844fad86c7..452d354ac4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -39,7 +39,7 @@ public class HennaRemoveList implements IClientOutgoingPacket OutgoingPackets.HENNA_UNEQUIP_LIST.writeId(packet); packet.writeQ(_player.getAdena()); final boolean premiumSlotEnabled = _player.getHenna(4) != null; - packet.writeD(premiumSlotEnabled ? 0x04 : 0x03); // seems to be max size + packet.writeD(premiumSlotEnabled ? 4 : 3); // seems to be max size packet.writeD((premiumSlotEnabled ? 4 : 3) - _player.getHennaEmptySlots()); // slots used for (Henna henna : _player.getHennaList()) { @@ -49,8 +49,8 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); packet.writeQ(henna.getCancelCount()); packet.writeQ(henna.getCancelFee()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index b5c8628b50..f2a9cf1822 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -89,14 +89,12 @@ public interface IClientOutgoingPacket extends IOutgoingPacket Inventory.PAPERDOLL_ARTIFACT20, Inventory.PAPERDOLL_ARTIFACT21, }; - int[] PAPERDOLL_ORDER_AUGMENT = new int[] { Inventory.PAPERDOLL_RHAND, Inventory.PAPERDOLL_LHAND, Inventory.PAPERDOLL_RHAND }; - int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 0c54e810f0..3378827f34 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -46,7 +46,6 @@ public class InventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index c4598a72e6..cef69ecb6f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -59,8 +59,8 @@ public class ItemList extends AbstractItemPacket } else { - packet.writeC(0x01); // _showWindow ? 0x01 : 0x00 - packet.writeD(0x00); + packet.writeC(1); // _showWindow ? 1 : 0 + packet.writeD(0); packet.writeD(_items.size()); } writeInventoryBlock(packet, _player.getInventory()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java index b32b4df4a3..c3b9918230 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java @@ -32,9 +32,8 @@ public class JoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PARTY.writeId(packet); - packet.writeD(_response); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java index 65e06efeb7..f347f7efcd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java @@ -32,7 +32,6 @@ public class JoinPledge implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PLEDGE.writeId(packet); - packet.writeD(_pledgeId); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index 96f6d7c34d..996622b9e9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -35,17 +35,16 @@ public class KeyPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VERSION_CHECK.writeId(packet); - packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok for (int i = 0; i < 8; i++) { packet.writeC(_key[i]); // key } - packet.writeD(0x01); + packet.writeD(1); packet.writeD(Config.SERVER_ID); // server id - packet.writeC(0x01); - packet.writeD(0x00); // obfuscation key - packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 0x01 : 0x00); // isClassic + packet.writeC(1); + packet.writeD(0); // obfuscation key + packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 1 : 0); // isClassic return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java index 484c10f0c4..62424fd03a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java @@ -40,7 +40,6 @@ public class L2FriendSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_SAY.writeId(packet); - packet.writeD(0); // ?? packet.writeS(_receiver); packet.writeS(_sender); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java index b875edb772..790d599b5b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java @@ -32,11 +32,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ListPartyWaiting implements IClientOutgoingPacket { + private static final int NUM_PER_PAGE = 64; + private final List _rooms = new LinkedList<>(); private final int _size; - private static final int NUM_PER_PAGE = 64; - public ListPartyWaiting(PartyMatchingRoomLevelType type, int location, int page, int requestorLevel) { final List rooms = MatchingRoomManager.getInstance().getPartyMathchingRooms(location, type, requestorLevel); @@ -57,7 +57,6 @@ public class ListPartyWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_PARTY_WATING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java index 4f8f9adc64..bb0ac61dbd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java @@ -54,7 +54,6 @@ public class LoginFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LOGIN_FAIL.writeId(packet); - packet.writeD(_success); packet.writeD(_reason); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java index 18a522c315..6743e3e66f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java @@ -32,7 +32,6 @@ public class MagicSkillCanceld implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_CANCELED.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java index d56de10079..7ab29cc1a8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java @@ -66,7 +66,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // MagicSkillUse castingType packet.writeD(_objectId); packet.writeD(_skillId); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java index 3df8463279..a86626cfa6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java @@ -84,7 +84,6 @@ public class MagicSkillUse implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_USE.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // Casting bar type: 0 - default, 1 - default up, 2 - blue, 3 - green, 4 - red. packet.writeD(_creature.getObjectId()); packet.writeD(_target.getObjectId()); @@ -111,7 +110,7 @@ public class MagicSkillUse implements IClientOutgoingPacket packet.writeD(_target.getX()); packet.writeD(_target.getY()); packet.writeD(_target.getZ()); - packet.writeD(_actionId >= 0 ? 0x01 : 0x00); // 1 when ID from RequestActionUse is used + packet.writeD(_actionId >= 0 ? 1 : 0); // 1 when ID from RequestActionUse is used packet.writeD(_actionId >= 0 ? _actionId : 0); // ID from RequestActionUse. Used to set cooldown on summon skills. return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java index 6b710c692e..12e2488f24 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java @@ -37,11 +37,9 @@ public class ManagePledgePower implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet); - packet.writeD(_rank); packet.writeD(_action); packet.writeD(_clan.getRankPrivs(_rank).getBitmask()); - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 95f4b6f201..4e2ab3f00b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -42,11 +42,9 @@ public class MonRaceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MON_RACE_INFO.writeId(packet); - packet.writeD(_unknown1); packet.writeD(_unknown2); - packet.writeD(0x08); - + packet.writeD(8); for (int i = 0; i < 8; i++) { packet.writeD(_monsters[i].getObjectId()); // npcObjectID @@ -68,7 +66,7 @@ public class MonRaceInfo implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java index 0093b3edc9..e6386921ff 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java @@ -45,13 +45,10 @@ public class MoveToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_xDst); packet.writeD(_yDst); packet.writeD(_zDst); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java index b1fb3ea003..59103c6c4c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java @@ -48,7 +48,6 @@ public class MoveToLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java index 30ff3c96af..aa261f924f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java @@ -50,11 +50,9 @@ public class MoveToPawn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_PAWN.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetId); packet.writeD(_distance); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index e1da19cc8f..50ff0191b8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -58,18 +58,16 @@ public class MultiSellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.MULTI_SELL_LIST.writeId(packet); - - packet.writeC(0x00); // Helios + packet.writeC(0); // Helios packet.writeD(_list.getId()); // list id - packet.writeC(0x00); // GOD Unknown + packet.writeC(0); // GOD Unknown packet.writeD(1 + (_index / PAGE_SIZE)); // page started from 1 - packet.writeD(_finished ? 0x01 : 0x00); // finished + packet.writeD(_finished ? 1 : 0); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - packet.writeC(0x00); // Grand Crusade - packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window - packet.writeD(0x20); // Helios - Always 32 - + packet.writeC(0); // Grand Crusade + packet.writeC(_list.isChanceMultisell() ? 1 : 0); // new multisell window + packet.writeD(32); // Helios - Always 32 while (_size-- > 0) { ItemInfo itemEnchantment = _list.getItemEnchantment(_index); @@ -86,19 +84,15 @@ public class MultiSellList extends AbstractItemPacket } } } - packet.writeD(_index); // Entry ID. Start from 1. packet.writeC(entry.isStackable() ? 1 : 0); - // Those values will be passed down to MultiSellChoose packet. packet.writeH(itemEnchantment != null ? itemEnchantment.getEnchantLevel() : 0); // enchant level writeItemAugment(packet, itemEnchantment); writeItemElemental(packet, itemEnchantment); writeItemEnsoulOptions(packet, itemEnchantment); - packet.writeH(entry.getProducts().size()); packet.writeH(entry.getIngredients().size()); - for (ItemChanceHolder product : entry.getProducts()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(product.getId()); @@ -122,7 +116,6 @@ public class MultiSellList extends AbstractItemPacket writeItemElemental(packet, displayItemEnchantment); writeItemEnsoulOptions(packet, displayItemEnchantment); } - for (ItemChanceHolder ingredient : entry.getIngredients()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(ingredient.getId()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java index 6e85f5348c..cd46aac3aa 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java @@ -45,11 +45,10 @@ public class MyTargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MY_TARGET_SELECTED.writeId(packet); - - packet.writeD(0x01); // Grand Crusade + packet.writeD(1); // Grand Crusade packet.writeD(_objectId); packet.writeH(_color); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java index 1901ad1297..166c5c1e00 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java @@ -36,7 +36,6 @@ public class NewCharacterSuccess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NEW_CHARACTER_SUCCESS.writeId(packet); - packet.writeD(_chars.size()); for (PlayerTemplate chr : _chars) { @@ -44,31 +43,24 @@ public class NewCharacterSuccess implements IClientOutgoingPacket { continue; } - // TODO: Unhardcode these packet.writeD(chr.getRace().ordinal()); packet.writeD(chr.getClassId().getId()); - packet.writeD(99); packet.writeD(chr.getBaseSTR()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseDEX()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseCON()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseINT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseWIT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseMEN()); packet.writeD(1); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java index be1605f679..6061ea26ef 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java @@ -38,7 +38,6 @@ public class NicknameChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NICK_NAME_CHANGED.writeId(packet); - packet.writeD(_objectId); packet.writeS(_title); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index f9cd107e2c..3e4837b4a4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -54,24 +54,20 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public NpcHtmlMessage(int npcObjId, int itemId) { super(npcObjId); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } public NpcHtmlMessage(int npcObjId, int itemId, String html) { super(npcObjId, html); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } @@ -79,11 +75,10 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java index 61f195e35d..05489103cb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java @@ -47,10 +47,8 @@ public class NpcInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -58,7 +56,6 @@ public class NpcInfo extends AbstractMaskPacket private int _clanId = 0; private int _statusMask = 0; private final Set _abnormalVisualEffects; - private String[] _localisation; public void setLang(String lang) @@ -101,112 +98,90 @@ public class NpcInfo extends AbstractMaskPacket { addComponentType(NpcInfoType.HEADING); } - if ((npc.getStat().getPAtkSpd() > 0) || (npc.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (npc.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((npc.getLeftHandItem() > 0) || (npc.getRightHandItem() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (npc.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (npc.getDisplayEffect() > 0) { addComponentType(NpcInfoType.DISPLAY_EFFECT); } - if (npc.isInsideZone(ZoneId.WATER) || npc.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (npc.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (npc.getCloneObjId() > 0) { addComponentType(NpcInfoType.CLONE); } - if (npc.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (npc.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (npc.getCurrentHp() <= npc.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (npc.getCurrentMp() <= npc.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (npc.getTemplate().isUsingServerSideName()) { addComponentType(NpcInfoType.NAME); } - if (npc.getTemplate().isUsingServerSideTitle() || (npc.isMonster() && (Config.SHOW_NPC_LEVEL || Config.SHOW_NPC_AGGRESSION)) || npc.isChampion() || npc.isTrap()) { addComponentType(NpcInfoType.TITLE); } - if (npc.getNameString() != null) { addComponentType(NpcInfoType.NAME_NPCSTRINGID); } - if (npc.getTitleString() != null) { addComponentType(NpcInfoType.TITLE_NPCSTRINGID); } - if (_npc.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (!_abnormalVisualEffects.isEmpty() || npc.isInvisible()) { addComponentType(NpcInfoType.ABNORMALS); } - if (npc.getEnchantEffect() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (npc.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (npc.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (npc.getClanId() > 0) { final Clan clan = ClanTable.getInstance().getClan(npc.getClanId()); @@ -220,14 +195,11 @@ public class NpcInfo extends AbstractMaskPacket addComponentType(NpcInfoType.CLAN); } } - addComponentType(NpcInfoType.COLOR_EFFECT); - if (npc.getPvpFlag() > 0) { addComponentType(NpcInfoType.PVP_FLAG); } - // TODO: Confirm me if (npc.isInCombat()) { @@ -245,8 +217,7 @@ public class NpcInfo extends AbstractMaskPacket { _statusMask |= 0x08; } - - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -296,27 +267,23 @@ public class NpcInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO.writeId(packet); - packet.writeD(_npc.getObjectId()); - packet.writeC(_npc.isShowSummonAnimation() ? 0x02 : 0x00); // // 0=teleported 1=default 2=summoned + packet.writeC(_npc.isShowSummonAnimation() ? 2 : 0); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 0x01 : 0x00); + packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { String title = _npc.getTitle(); - // Localisation related. if ((_localisation != null) && !_localisation[1].equals("")) { @@ -329,10 +296,8 @@ public class NpcInfo extends AbstractMaskPacket title = title.replace(NpcData.getInstance().getTemplate(_npc.getId()).getTitle(), _localisation[1]); } } - packet.writeS(title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -351,7 +316,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -366,20 +331,20 @@ public class NpcInfo extends AbstractMaskPacket if (containsMask(NpcInfoType.EQUIPPED)) { packet.writeD(_npc.getRightHandItem()); - packet.writeD(0x00); // Armor id? + packet.writeD(0); // Armor id? packet.writeD(_npc.getLeftHandItem()); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_npc.isDead() ? 0x00 : 0x01); + packet.writeC(_npc.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); + packet.writeC(_npc.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 0x01 : _npc.isFlying() ? 0x02 : 0x00); + packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -391,7 +356,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_npc.isFlying() ? 0x01 : 0x00); + packet.writeD(_npc.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { @@ -427,12 +392,12 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(0x00); // 2 - do some animation on spawn + packet.writeC(0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -464,12 +429,10 @@ public class NpcInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java index c95a8e5274..923e9cebad 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class NpcInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_npc.getObjectId()); packet.writeD(_npc.getTransformationDisplayId()); - final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size()); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java index a294edc57a..2a0ba41eeb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java @@ -38,7 +38,6 @@ public class NpcQuestHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NPC_QUEST_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_questId); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java index d3328ade97..fc6d0d4a3a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java @@ -106,7 +106,6 @@ public class NpcSay implements IClientOutgoingPacket { _parameters = new ArrayList<>(); } - for (String item : params) { if ((item != null) && (item.length() > 0)) @@ -127,11 +126,9 @@ public class NpcSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_SAY.writeId(packet); - packet.writeD(_objectId); packet.writeD(_textType.getClientId()); packet.writeD(_npcId); - // Localisation related. if (_lang != null) { @@ -147,7 +144,6 @@ public class NpcSay implements IClientOutgoingPacket } } } - packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java index 356e3f48a9..ac61f9d247 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java @@ -33,11 +33,10 @@ public class ObservationMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_START.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me packet.writeD(0xc0); // TODO: Find me return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java index 5c0a0766b3..896ccea02b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java @@ -33,7 +33,6 @@ public class ObservationReturn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_END.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java index c2f7ab404f..173772c870 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java @@ -37,7 +37,6 @@ public class OnEventTrigger implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EVENT_TRIGGER.writeId(packet); - packet.writeD(_emitterId); packet.writeC(_enabled); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index fbb5c84dfe..37d4fea9cf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -45,7 +45,6 @@ public class PackageSendableList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java index a53f589386..e24d63f717 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java @@ -39,7 +39,6 @@ public class PackageToList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_TO_LIST.writeId(packet); - packet.writeD(_players.size()); for (Entry entry : _players.entrySet()) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 655c7abcd1..44b23b37f4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -55,7 +55,6 @@ public class PartyMemberPosition implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); - packet.writeD(locations.size()); for (Entry entry : locations.entrySet()) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java index 9e275ec246..c9d3595037 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java @@ -36,7 +36,6 @@ public class PartyRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java index 2233054c14..76c4555d3b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java @@ -36,12 +36,10 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ADD.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); // c3 packet.writeD(_party.getDistributionType().getId()); // c3 packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); - packet.writeD((int) _member.getCurrentCp()); // c4 packet.writeD(_member.getMaxCp()); // c4 packet.writeD((int) _member.getCurrentHp()); @@ -51,9 +49,9 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket packet.writeD(_member.getVitalityPoints()); packet.writeC(_member.getLevel()); packet.writeH(_member.getClassId().getId()); - packet.writeC(0x00); + packet.writeC(0); packet.writeH(_member.getRace().ordinal()); - packet.writeD(0x00); // 228 + packet.writeD(0); // 228 return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java index e806018375..3a47801de1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java @@ -37,21 +37,17 @@ public class PartySmallWindowAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ALL.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); packet.writeC(_party.getDistributionType().getId()); packet.writeC(_party.getMemberCount() - 1); - for (Player member : _party.getMembers()) { if ((member != null) && (member != _exclude)) { packet.writeD(member.getObjectId()); packet.writeS(member.getName()); - packet.writeD((int) member.getCurrentCp()); // c4 packet.writeD(member.getMaxCp()); // c4 - packet.writeD((int) member.getCurrentHp()); packet.writeD(member.getMaxHp()); packet.writeD((int) member.getCurrentMp()); @@ -59,10 +55,9 @@ public class PartySmallWindowAll implements IClientOutgoingPacket packet.writeD(member.getVitalityPoints()); packet.writeC(member.getLevel()); packet.writeH(member.getClassId().getId()); - packet.writeC(0x01); // Unk + packet.writeC(1); // Unk packet.writeH(member.getRace().ordinal()); - packet.writeD(0x00); // 228 - + packet.writeD(0); // 228 final Summon pet = member.getPet(); packet.writeD(member.getServitors().size() + (pet != null ? 1 : 0)); // Summon size, one only atm if (pet != null) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java index 94a8a5a2ce..09ce132af4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java @@ -33,7 +33,6 @@ public class PartySmallWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_DELETE.writeId(packet); - packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java index c53c6c7779..e9ea2efbbe 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java @@ -42,7 +42,6 @@ public class PartySmallWindowUpdate extends AbstractMaskPacket _summon.getStat().getExp()) { packet.writeQ(_summon.getStat().getExp()); // 0% absolute value @@ -160,9 +148,7 @@ public class PetInfo implements IClientOutgoingPacket { packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value } - packet.writeQ(_summon.getExpForNextLevel()); // 100% absoulte value - packet.writeD(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight packet.writeD(_summon.getMaxLoad()); // max weight it can carry packet.writeD(_summon.getPAtk()); // patk @@ -178,25 +164,20 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD((int) _summon.getStat().getMoveSpeed()); // speed packet.writeD(_summon.getPAtkSpd()); // atkspeed packet.writeD(_summon.getMAtkSpd()); // casting speed - packet.writeC(0); // TODO: Check me, might be ride status packet.writeC(_summon.getTeam().getId()); // Confirmed packet.writeC(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed packet.writeC(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed - - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. - + packet.writeD(0); // TODO: Find me + packet.writeD(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. packet.writeC(_summon.getOwner().getSummonPoints()); // Used Summon Points packet.writeC(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points - final Set aves = _summon.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeH(aves.size()); // Confirmed for (AbnormalVisualEffect ave : aves) { packet.writeH(ave.getClientId()); // Confirmed } - packet.writeC(_statusMask); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 5b43daa74b..1f60ec39d1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -46,7 +46,6 @@ public class PetInventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.PET_INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index e4cf35779f..16dc83b7ed 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -35,7 +35,6 @@ public class PetItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java index fdb00ddbb1..913f65d470 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java @@ -38,7 +38,6 @@ public class PetStatusShow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_SHOW.writeId(packet); - packet.writeD(_summonType); packet.writeD(_summonObjectId); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 25c2c74292..823a8c405a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -52,7 +52,6 @@ public class PetStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_UPDATE.writeId(packet); - packet.writeD(_summon.getSummonType()); packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getX()); @@ -69,7 +68,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket packet.writeQ(_summon.getStat().getExp()); packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value packet.writeQ(_summon.getExpForNextLevel()); // 100% absolute value - packet.writeD(0x01); // TODO: Find me! + packet.writeD(1); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java index 4bc3570779..0898b01f67 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java @@ -63,7 +63,6 @@ public class PlaySound implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLAY_SOUND.writeId(packet); - packet.writeD(_unknown1); // unknown 0 for quest and ship; packet.writeS(_soundFile); packet.writeD(_unknown3); // unknown 0 for quest; 1 for ship; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java index fbe57d4aaf..5108fe7e1b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java @@ -44,7 +44,6 @@ public class PledgeCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java index aa11b1213e..6805f64d7c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java @@ -34,7 +34,6 @@ public class PledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_INFO.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getId()); packet.writeS(_clan.getName()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java index 7ae6a0d284..b28dbf33c3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java @@ -36,7 +36,6 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_MEMBER_INFO.writeId(packet); - packet.writeD(_member.getPledgeType()); packet.writeS(_member.getName()); packet.writeS(_member.getTitle()); // title diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java index eefd482979..6aa5067c8f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java @@ -36,7 +36,6 @@ public class PledgeReceivePowerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_POWER_INFO.writeId(packet); - packet.writeD(_member.getPowerGrade()); // power grade packet.writeS(_member.getName()); packet.writeD(_member.getClan().getRankPrivs(_member.getPowerGrade()).getBitmask()); // privileges diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 79d478aff9..f9387ea1d8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -40,8 +40,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_SUB_PLEDGE_CREATED.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); packet.writeD(_subPledge.getId()); packet.writeS(_subPledge.getName()); packet.writeS(getLeaderName()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java index 4d0efeb82a..7649947064 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java @@ -43,7 +43,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(packet); - packet.writeD(_tab); // page packet.writeD(_clanList.size()); for (ClanWar clanWar : _clanList) @@ -53,7 +52,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket { continue; } - packet.writeS(clan.getName()); packet.writeD(clanWar.getState().ordinal()); // type: 0 = Declaration, 1 = Blood Declaration, 2 = In War, 3 = Victory, 4 = Defeat, 5 = Tie, 6 = Error packet.writeD(clanWar.getRemainingTime()); // Time if friends to start remaining diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java index 2cbbdbf046..80d10fcb66 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java @@ -34,26 +34,25 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_INFO_UPDATE.writeId(packet); - // sending empty data so client will ask all the info in response ;) packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getLevel()); // clan level packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); // castle state ? + packet.writeD(0); // castle state ? packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); // clan reputation score - packet.writeD(0x00); // ? - packet.writeD(0x00); // ? + packet.writeD(0); // ? + packet.writeD(0); // ? packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); // c5 packet.writeD(_clan.getAllyCrestId()); // c5 packet.writeD(_clan.isAtWar() ? 1 : 0); // c5 - packet.writeD(0x00); // TODO: Find me! - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java index ae26e50dbb..2fa9f26d4a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java @@ -51,12 +51,11 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ADD.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); - packet.writeD(0x00); - packet.writeD(0x01); + packet.writeD(0); + packet.writeD(1); packet.writeD(_isOnline); // 1 = online 0 = offline packet.writeD(_pledgeType); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index 971d88c53d..8880e7853d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -57,30 +57,27 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(packet); - - packet.writeD(0x00); // _isSubPledge + packet.writeD(0); // _isSubPledge packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_name); packet.writeS(_leaderName); - packet.writeD(_clan.getCrestId()); // crest id .. is used again packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); // 0 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(0); // 0 packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.isAtWar() ? 1 : 0); // new c3 - packet.writeD(0x00); // Territory castle ID - + packet.writeD(0); // Territory castle ID packet.writeD(_members.size()); for (ClanMember m : _members) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java index 0fd387e419..154bcc610d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java @@ -32,7 +32,6 @@ public class PledgeShowMemberListDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_DELETE.writeId(packet); - packet.writeS(_player); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java index 9789e1e951..beefd2b6bd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java @@ -50,7 +50,6 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index 4e89797e45..09f70ea024 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -62,14 +62,14 @@ public class PledgeSkillList implements IClientOutgoingPacket { packet.writeD(sk.getDisplayId()); packet.writeH(sk.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } for (SubPledgeSkill sk : _subSkills) { packet.writeD(sk._subType); // Clan Sub-unit types packet.writeD(sk._skillId); packet.writeH(sk._skillLevel); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java index f3b8d4c26c..a94601294f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java @@ -37,7 +37,6 @@ public class PledgeSkillListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST_ADD.writeId(packet); - packet.writeD(_id); packet.writeD(_level); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java index 9e1b4843ac..5f32f2bf54 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java @@ -33,15 +33,14 @@ public class PledgeStatusChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_STATUS_CHANGED.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getLeaderId()); packet.writeD(_clan.getId()); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getAllyId()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.getCrestLargeId()); - packet.writeD(0x00); // pledge type ? + packet.writeD(0); // pledge type ? return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java index 5b56d0b28d..41d0f9f7d8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java @@ -44,12 +44,10 @@ public class PrivateStoreListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_LIST.writeId(packet); - packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); // Viewer's item count? + packet.writeD(0); // Viewer's item count? packet.writeD(_items.size()); - int slotNumber = 0; for (TradeItem item : _items) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 67b6ba8d94..d72050283e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -43,11 +43,10 @@ public class PrivateStoreListSell extends AbstractItemPacket else { OutgoingPackets.PRIVATE_STORE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index d05590cbde..df056c2e43 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -60,13 +60,13 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket { packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); + packet.writeD(0); for (Item item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item2 : _buyList) { writeItem(packet, item2); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index d8768104a4..6bbabb282b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -63,13 +63,13 @@ public class PrivateStoreManageListSell extends AbstractItemPacket packet.writeD(_objId); packet.writeD(_packageSale ? 1 : 0); packet.writeQ(_playerAdena); - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item2 : _sellList) { writeItem(packet, item2); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java index 8a5b9eef92..0d7bcbea16 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgBuy implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java index b00bd2add2..8fdb5701b8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgSell implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PvpBookList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PvpBookList.java index ac5e01a6a3..5d84e6471a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PvpBookList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PvpBookList.java @@ -32,7 +32,6 @@ public class PvpBookList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PVPBOOK_LIST.writeId(packet); - final int size = 1; packet.writeD(4); // show killer's location count packet.writeD(5); // teleport count diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java index c3958367e8..5ddaa46ba0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java @@ -40,7 +40,6 @@ public class RadarControl implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RADAR_CONTROL.writeId(packet); - packet.writeD(_showRadar); packet.writeD(_type); // maybe type packet.writeD(_x); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java index c7e4525bf2..bcfd911f58 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java @@ -40,10 +40,8 @@ public class RecipeBookItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_BOOK_ITEM_LIST.writeId(packet); - - packet.writeD(_isDwarvenCraft ? 0x00 : 0x01); // 0 = Dwarven - 1 = Common + packet.writeD(_isDwarvenCraft ? 0 : 1); // 0 = Dwarven - 1 = Common packet.writeD(_maxMp); - if (_recipes == null) { packet.writeD(0); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index d9c2621c84..a4e4641944 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -78,7 +78,6 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(_offeringMaximumAdena); // Adena worth of items for maximum offering. return true; } - PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java index a24ba356ef..ab67f9bff3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java @@ -50,7 +50,6 @@ public class RecipeShopItemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_ITEM_INFO.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD(_recipeId); packet.writeD((int) _manufacturer.getCurrentMp()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java index aac30faf53..ec67224b1e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java @@ -57,11 +57,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MANAGE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD((int) _seller.getAdena()); - packet.writeD(_isDwarven ? 0x00 : 0x01); - + packet.writeD(_isDwarven ? 0 : 1); if ((_recipes == null) || _recipes.isEmpty()) { packet.writeD(0); @@ -69,7 +67,6 @@ public class RecipeShopManageList implements IClientOutgoingPacket else { packet.writeD(_recipes.size()); // number of items in recipe book - int i = 1; for (RecipeHolder recipe : _recipes) { @@ -77,10 +74,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket packet.writeD(i++); } } - if ((_manufacture == null) || _manufacture.isEmpty()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -88,7 +84,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket for (Entry item : _manufacture) { packet.writeD(item.getKey()); - packet.writeD(0x00); // CanCraft? + packet.writeD(0); // CanCraft? packet.writeQ(item.getValue()); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java index c025b5e4ed..2b9bc5b6e7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java @@ -33,7 +33,6 @@ public class RecipeShopMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MSG.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeS(_player.getStoreName()); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java index 07ba331de9..8f504ce103 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java @@ -37,14 +37,13 @@ public class RecipeShopSellList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_SELL_LIST.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD((int) _manufacturer.getCurrentMp()); // Creator's MP packet.writeD(_manufacturer.getMaxMp()); // Creator's MP packet.writeQ(_buyer.getAdena()); // Buyer Adena if (!_manufacturer.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -52,7 +51,7 @@ public class RecipeShopSellList implements IClientOutgoingPacket for (Entry item : _manufacturer.getManufactureItems().entrySet()) { packet.writeD(item.getKey()); - packet.writeD(0x00); // CanCreate? + packet.writeD(0); // CanCreate? packet.writeQ(item.getValue()); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 74700e29b0..269e14d50b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -88,7 +88,6 @@ public class RelationChanged implements IClientOutgoingPacket { return; } - final Relation r = new Relation(); r._objId = activeChar.getObjectId(); r._relation = relation; @@ -102,7 +101,6 @@ public class RelationChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RELATION_CHANGED.writeId(packet); - packet.writeC(_mask); if (_multi == null) { @@ -122,7 +120,6 @@ public class RelationChanged implements IClientOutgoingPacket private void writeRelation(PacketWriter packet, Relation relation) { packet.writeD(relation._objId); - if ((_mask & SEND_DEFAULT) != SEND_DEFAULT) { packet.writeD(relation._relation); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java index b4e9dc25c5..4477cfb705 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java @@ -35,7 +35,6 @@ public class RequestEnchant implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java index 4ef15fb74c..7a0a6cbe58 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java @@ -33,7 +33,6 @@ public class Revive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.REVIVE.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java index 9c409601e3..b9ddf7733f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java @@ -42,7 +42,6 @@ public class Ride implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RIDE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_mounted); packet.writeD(_rideType); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 813ce03f4d..13ef62f55f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -49,11 +49,9 @@ public class SellListProcure implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SELL_LIST_PROCURE.writeId(packet); - packet.writeQ(_money); // money - packet.writeD(0x00); // lease ? + packet.writeD(0); // lease ? packet.writeH(_sellList.size()); // list size - for (Entry entry : _sellList.entrySet()) { final Item item = entry.getKey(); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java index baa37a8507..75b5b07854 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java @@ -39,12 +39,10 @@ public class SendMacroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MACRO_LIST.writeId(packet); - packet.writeC(_updateType.getId()); - packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0x00); // modified, created or deleted macro's id + packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0); // modified, created or deleted macro's id packet.writeC(_count); // count of Macros packet.writeC(_macro != null ? 1 : 0); // unknown - if ((_macro != null) && (_updateType != MacroUpdateType.DELETE)) { packet.writeD(_macro.getId()); // Macro ID @@ -52,9 +50,7 @@ public class SendMacroList implements IClientOutgoingPacket packet.writeS(_macro.getDescr()); // Desc packet.writeS(_macro.getAcronym()); // acronym packet.writeD(_macro.getIcon()); // icon - packet.writeC(_macro.getCommands().size()); // count - int i = 1; for (MacroCmd cmd : _macro.getCommands()) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java index 47fada25be..21622b5f19 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java @@ -32,7 +32,6 @@ public class SendTradeRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_REQUEST.writeId(packet); - packet.writeD(_senderId); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java index 69aa749406..1513a0e3d1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java @@ -55,7 +55,6 @@ public class ServerObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SERVER_OBJECT_INFO.writeId(packet); - packet.writeD(_activeChar.getObjectId()); packet.writeD(_displayId + 1000000); packet.writeS(_name); // name @@ -70,8 +69,8 @@ public class ServerObjectInfo implements IClientOutgoingPacket packet.writeF(_collisionHeight); packet.writeD((int) (_isAttackable ? _activeChar.getCurrentHp() : 0)); packet.writeD(_isAttackable ? _activeChar.getMaxHp() : 0); - packet.writeD(0x01); // object type - packet.writeD(0x00); // special effects + packet.writeD(1); // object type + packet.writeD(0); // special effects return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java index 88b370ad8b..0164e5c4a2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java @@ -34,7 +34,6 @@ public class SetSummonRemainTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SET_SUMMON_REMAIN_TIME.writeId(packet); - packet.writeD(_maxTime); packet.writeD(_remainingTime); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java index db28b72acf..016f5a0c9a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java @@ -38,7 +38,6 @@ public class ShopPreviewInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_INFO.writeId(packet); - packet.writeD(Inventory.PAPERDOLL_TOTALSLOTS); // Slots packet.writeD(getFromList(Inventory.PAPERDOLL_UNDER)); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index 358ee2361b..3e7efda220 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -49,11 +49,9 @@ public class ShopPreviewList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_LIST.writeId(packet); - packet.writeD(5056); packet.writeQ(_money); // current money packet.writeD(_listId); - int newlength = 0; for (Product product : _list) { @@ -63,23 +61,20 @@ public class ShopPreviewList implements IClientOutgoingPacket } } packet.writeH(newlength); - for (Product product : _list) { if (product.getItem().isEquipable()) { packet.writeD(product.getItemId()); packet.writeH(product.getItem().getType2()); // item type2 - if (product.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { packet.writeQ(product.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } else { - packet.writeQ(0x00); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand + packet.writeQ(0); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } - packet.writeQ(Config.WEAR_PRICE); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 298301ed0d..b13080ff28 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -40,7 +40,6 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_BUFF_STATUS_UPDATE.writeId(packet); - packet.writeD(_skillId); packet.writeH(_skillLevel); packet.writeH(_skillSubLevel); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index 33d36611b8..be5e1fadab 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -33,7 +33,6 @@ public class ShortCutInit implements IClientOutgoingPacket { return; } - _shortCuts = player.getAllShortCuts(); } @@ -41,26 +40,23 @@ public class ShortCutInit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); packet.writeD(sc.getSlot() + (sc.getPage() * 12)); - - packet.writeC(0x00); // 228 - + packet.writeC(0); // 228 switch (sc.getType()) { case ITEM: { packet.writeD(sc.getId()); - packet.writeD(0x01); // Enabled or not + packet.writeD(1); // Enabled or not packet.writeD(sc.getSharedReuseGroup()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeQ(0x00); // Augment id - packet.writeD(0x00); // Visual id + packet.writeD(0); + packet.writeD(0); + packet.writeQ(0); // Augment id + packet.writeD(0); // Visual id break; } case SKILL: @@ -69,8 +65,8 @@ public class ShortCutInit implements IClientOutgoingPacket packet.writeH(sc.getLevel()); packet.writeH(sc.getSubLevel()); packet.writeD(sc.getSharedReuseGroup()); - packet.writeC(0x00); // C5 - packet.writeD(0x01); // C6 + packet.writeC(0); // C5 + packet.writeD(1); // C6 break; } case ACTION: @@ -79,7 +75,7 @@ public class ShortCutInit implements IClientOutgoingPacket case BOOKMARK: { packet.writeD(sc.getId()); - packet.writeD(0x01); // C6 + packet.writeD(1); // C6 } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java index 7f584f966f..f85ada83c7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java @@ -37,12 +37,9 @@ public class ShortCutRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_REGISTER.writeId(packet); - packet.writeD(_shortcut.getType().ordinal()); packet.writeD(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client - - packet.writeC(0x00); // 228 - + packet.writeC(0); // 228 switch (_shortcut.getType()) { case ITEM: @@ -50,10 +47,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeD(_shortcut.getId()); packet.writeD(_shortcut.getCharacterType()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeD(0x00); // unknown - packet.writeD(0x00); // unknown - packet.writeD(0x00); // item augment id - packet.writeD(0x00); // TODO: Find me, item visual id ? + packet.writeD(0); // unknown + packet.writeD(0); // unknown + packet.writeD(0); // item augment id + packet.writeD(0); // TODO: Find me, item visual id ? break; } case SKILL: @@ -62,10 +59,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeH(_shortcut.getLevel()); packet.writeH(_shortcut.getSubLevel()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeC(0x00); // C5 + packet.writeC(0); // C5 packet.writeD(_shortcut.getCharacterType()); - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me + packet.writeD(0); // TODO: Find me break; } case ACTION: diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java index d6f71b5f70..cfae3b3fad 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java @@ -54,7 +54,6 @@ public class ShowBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - packet.writeC(_showBoard); // c4 1 to show community 00 to hide packet.writeS("bypass _bbshome"); // top packet.writeS("bypass _bbsgetfav"); // favorite diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java index 4b62a7001b..4d62e99d7a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java @@ -32,7 +32,6 @@ public class ShowCalculator implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_CALC.writeId(packet); - packet.writeD(_calculatorId); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java index 55f58d5375..4574762467 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java @@ -32,9 +32,8 @@ public class ShowMiniMap implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_MINIMAP.writeId(packet); - packet.writeD(_mapId); - packet.writeC(0x00); // Seven Signs state + packet.writeC(0); // Seven Signs state return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java index 303eab4e8a..97100d09d2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java @@ -34,7 +34,6 @@ public class ShowPCCafeCouponShowUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_PCCAFE_COUPON_SHOW_UI.writeId(packet); - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java index d86958e586..0a0f3ae861 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java @@ -35,7 +35,6 @@ public class ShowXMasSeal implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_XMAS_SEAL.writeId(packet); - packet.writeD(_item); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java index 66eccc7fbf..1baa030c4d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java @@ -28,9 +28,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = ca
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Attackers Clans?
* d = Number of Attackers Clans
* { //repeats
@@ -58,11 +58,10 @@ public class SiegeAttackerList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _castle.getSiege().getAttackerClans().size(); if (size > 0) { @@ -76,12 +75,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -90,8 +88,8 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index 5d5c831f14..8afd1f38ce 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -29,9 +29,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = 0xcb
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Defending Clans?
* d = Number of Defending Clans
* { //repeats
@@ -60,16 +60,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // Unknown - packet.writeD(0x01); // Unknown - packet.writeD(0x00); // Unknown - + packet.writeD(0); // Unknown + packet.writeD(1); // Unknown + packet.writeD(0); // Unknown final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0); packet.writeD(size); packet.writeD(size); - // Add owners final Clan ownerClan = _castle.getOwner(); if (ownerClan != null) @@ -78,14 +75,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket packet.writeS(ownerClan.getName()); packet.writeS(ownerClan.getLeaderName()); packet.writeD(ownerClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.OWNER.ordinal()); packet.writeD(ownerClan.getAllyId()); packet.writeS(ownerClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(ownerClan.getAllyCrestId()); } - // List of confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans()) { @@ -94,19 +90,17 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(defendingClan.getAllyCrestId()); } - // List of not confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans()) { @@ -115,12 +109,11 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER_PENDING.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 0a3fe46cb7..dfeefdaecf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -59,13 +59,11 @@ public class SiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_INFO.writeId(packet); - if (_castle != null) { packet.writeD(_castle.getResidenceId()); - final int ownerId = _castle.getOwnerId(); - packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 0x01 : 0x00); + packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0); packet.writeD(ownerId); if (ownerId > 0) { @@ -89,7 +87,6 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { @@ -97,7 +94,7 @@ public class SiegeInfo implements IClientOutgoingPacket cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis()); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(Config.SIEGE_HOUR_LIST.size()); for (int hour : Config.SIEGE_HOUR_LIST) { @@ -108,7 +105,7 @@ public class SiegeInfo implements IClientOutgoingPacket else { packet.writeD((int) (_castle.getSiegeDate().getTimeInMillis() / 1000)); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index d11b3817c0..3c4c475339 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -51,12 +51,11 @@ public class SkillCoolTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SKILL_COOL_TIME.writeId(packet); - packet.writeD(_skillReuseTimeStamps.size()); for (TimeStamp ts : _skillReuseTimeStamps) { packet.writeD(ts.getSkillId()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD((int) ts.getReuse() / 1000); packet.writeD((int) Math.max(ts.getStamp() - _currentTime, 0) / 1000); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index de54232b51..ed4615c403 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -41,10 +41,9 @@ public class Snoop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SNOOP.writeId(packet); - packet.writeD(_convoId); packet.writeS(_name); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_type.getClientId()); packet.writeS(_speaker); packet.writeS(_msg); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java index 37827bdf6c..52f15519a5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java @@ -37,10 +37,9 @@ public class SocialAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SOCIAL_ACTION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_actionId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index fd7e43a153..19066f5f85 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -33,16 +33,15 @@ public class SpawnItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPAWN_ITEM.writeId(packet); - packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeD(_item.isStackable() ? 0x01 : 0x00); + packet.writeD(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java index ccae75b850..04f3ad716c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java @@ -110,7 +110,6 @@ public class SpecialCamera implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPECIAL_CAMERA.writeId(packet); - packet.writeD(_id); packet.writeD(_force); packet.writeD(_angle1); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java index cdd3821740..281756e793 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java @@ -34,7 +34,6 @@ public class StartPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_PLEDGE_WAR.writeId(packet); - packet.writeS(_playerName); packet.writeS(_pledgeName); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java index 48b4238eea..27fb4f606b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java @@ -38,7 +38,6 @@ public class StartRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_side); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java index b4f421df36..067bdeb082 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java @@ -72,7 +72,6 @@ public class StaticObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATIC_OBJECT.writeId(packet); - packet.writeD(_staticObjectId); packet.writeD(_objectId); packet.writeD(_type); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index 928b54aa48..40836e4af8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -46,7 +46,6 @@ public class StatusUpdate implements IClientOutgoingPacket public void addUpdate(StatusUpdateType type, int level) { _updates.put(type, level); - if (_isPlayable) { switch (type) @@ -75,10 +74,9 @@ public class StatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATUS_UPDATE.writeId(packet); - packet.writeD(_objectId); // casterId - packet.writeD(_isVisible ? _casterObjectId : 0x00); - packet.writeC(_isVisible ? 0x01 : 0x00); + packet.writeD(_isVisible ? _casterObjectId : 0); + packet.writeC(_isVisible ? 1 : 0); packet.writeC(_updates.size()); for (Entry entry : _updates.entrySet()) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java index 9919307366..cf2b71df5a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java @@ -53,7 +53,6 @@ public class StopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java index 50fdc3fe4c..78fdb5d70c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java @@ -43,7 +43,6 @@ public class StopMoveInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java index 9c828c3962..b254cad8b1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java @@ -34,7 +34,6 @@ public class StopPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java index b0392de226..ca69cd5346 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java @@ -36,7 +36,6 @@ public class StopRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FINISH_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_speed); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index c1feb37b2f..2d92796c75 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -43,10 +43,8 @@ public class SummonInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class SummonInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class SummonInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,11 +154,9 @@ public class SummonInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - // Show red aura? - // if (_statusMask != 0) + // if (_statusMask != 0x00) // { // addComponentType(NpcInfoType.VISUAL_STATE); // } @@ -229,28 +206,24 @@ public class SummonInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.SUMMON_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -269,7 +242,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -285,19 +258,19 @@ public class SummonInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -309,20 +282,20 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -346,12 +319,12 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -381,12 +354,10 @@ public class SummonInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java index 864462f76f..6f88551204 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java @@ -34,7 +34,6 @@ public class SurrenderPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SURRENDER_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 746b2da3f7..b509d599db 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -161,7 +161,6 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } - _params[_paramIndex++] = param; } @@ -267,7 +266,6 @@ public class SystemMessage implements IClientOutgoingPacket { return addString(item.getName()); } - append(new SMParam(TYPE_ITEM_NAME, id)); return this; } @@ -389,7 +387,6 @@ public class SystemMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SYSTEM_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -402,13 +399,12 @@ public class SystemMessage implements IClientOutgoingPacket params[i] = _params[i].getValue(); } packet.writeH(SystemMessageId.S1_2.getId()); - packet.writeC(0x01); + packet.writeC(1); packet.writeC(TYPE_TEXT); packet.writeS(sml.getLocalisation(params)); return true; } } - packet.writeH(getId()); packet.writeC(_params.length); for (SMParam param : _params) @@ -418,9 +414,7 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } - packet.writeC(param.getType()); - switch (param.getType()) { case TYPE_ELEMENT_NAME: diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java index a91da07e77..d357efbb0e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java @@ -47,13 +47,12 @@ public class TargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_SELECTED.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java index 3dadd249f6..3d7208c06f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java @@ -42,12 +42,11 @@ public class TargetUnselected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_UNSELECTED.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index 943b5078b6..13f9b9565a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -41,14 +41,13 @@ public class TeleportToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TELEPORT_TO_LOCATION.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // Fade 0, Instant 1. + packet.writeD(0); // Fade 0, Instant 1. packet.writeD(_heading); - packet.writeD(0x00); // Unknown. + packet.writeD(0); // Unknown. return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java index cb82f2da59..8d09576d9d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java @@ -32,7 +32,6 @@ public class TradeDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_DONE.writeId(packet); - packet.writeD(_num); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java index 716ed2a099..6a94d2463f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java @@ -41,9 +41,9 @@ public class TradeOtherAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java index 3d0ef0b501..7907f3d498 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java @@ -41,9 +41,9 @@ public class TradeOwnAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c59568bf1d..3822108c5a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -58,7 +58,6 @@ public class TradeStart extends AbstractItemPacket { _mask |= 0x08; } - // Does not shows level if (_partner.isGM()) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java index f8e2a191de..e5ec2376cc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java @@ -44,10 +44,10 @@ public class TradeUpdate extends AbstractItemPacket { OutgoingPackets.TRADE_UPDATE.writeId(packet); packet.writeC(_sendType); - packet.writeD(0x01); + packet.writeD(1); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2); writeItem(packet, _item, _count); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java index c7102ca385..728020c0b1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java @@ -32,7 +32,6 @@ public class TutorialEnableClientEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_ENABLE_CLIENT_EVENT.writeId(packet); - packet.writeD(_eventId); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java index 92ac75afcf..7cc33a0f80 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java @@ -48,7 +48,6 @@ public class TutorialShowHtml extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_HTML.writeId(packet); - packet.writeD(_type); packet.writeS(getHtml()); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java index 75a57be38b..2ee62835db 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java @@ -37,7 +37,6 @@ public class TutorialShowQuestionMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_QUESTION_MARK.writeId(packet); - packet.writeC(_markType); packet.writeD(_markId); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index da5800b76b..73e34d81a6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class UserInfo extends AbstractMaskPacket { private Player _player; - private int _relation; private int _runSpd; private int _walkSpd; @@ -50,7 +49,6 @@ public class UserInfo extends AbstractMaskPacket private int _enchantLevel; private int _armorEnchant; private String _title; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -58,7 +56,6 @@ public class UserInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 5; public UserInfo(Player player) @@ -82,6 +79,7 @@ public class UserInfo extends AbstractMaskPacket _enchantLevel = player.getInventory().getWeaponEnchant(); _armorEnchant = player.getInventory().getArmorMinEnchant(); _title = player.getTitle(); + if (player.isGM() && player.isInvisible()) { _title = "[Invisible]"; @@ -137,29 +135,25 @@ public class UserInfo extends AbstractMaskPacket } OutgoingPackets.USER_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_initSize); packet.writeH(25); // 196 - 25 packet.writeB(_masks); - if (containsMask(UserInfoType.RELATION)) { packet.writeD(_relation); } - if (containsMask(UserInfoType.BASIC_INFO)) { packet.writeH(16 + (_player.getAppearance().getVisibleName().length() * 2)); packet.writeString(_player.getName()); - packet.writeC(_player.isGM() ? 0x01 : 0x00); + packet.writeC(_player.isGM() ? 1 : 0); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } - if (containsMask(UserInfoType.BASE_STATS)) { packet.writeH(18); @@ -172,7 +166,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getLUC()); packet.writeH(_player.getCHA()); } - if (containsMask(UserInfoType.MAX_HPCPMP)) { packet.writeH(14); @@ -180,7 +173,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMaxMp()); packet.writeD(_player.getMaxCp()); } - if (containsMask(UserInfoType.CURRENT_HPMPCP_EXP_SP)) { packet.writeH(38); @@ -191,23 +183,20 @@ public class UserInfo extends AbstractMaskPacket packet.writeQ(_player.getExp()); packet.writeF((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel()))); } - if (containsMask(UserInfoType.ENCHANTLEVEL)) { packet.writeH(4); packet.writeC(_enchantLevel); packet.writeC(_armorEnchant); } - if (containsMask(UserInfoType.APPAREANCE)) { packet.writeH(15); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); } - if (containsMask(UserInfoType.STATUS)) { packet.writeH(6); @@ -216,7 +205,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.getCrystallizeGrade() != ItemGrade.NONE ? 1 : 0); packet.writeC(_player.getAbilityPoints() - _player.getAbilityPointsUsed()); } - if (containsMask(UserInfoType.STATS)) { packet.writeH(56); @@ -235,7 +223,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); } - if (containsMask(UserInfoType.ELEMENTALS)) { packet.writeH(14); @@ -246,7 +233,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getDefenseElementValue(AttributeType.HOLY)); packet.writeH(_player.getDefenseElementValue(AttributeType.DARK)); } - if (containsMask(UserInfoType.POSITION)) { packet.writeH(18); @@ -255,7 +241,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getZ()); packet.writeD(_player.isInVehicle() ? _player.getVehicle().getObjectId() : 0); } - if (containsMask(UserInfoType.SPEED)) { packet.writeH(18); @@ -268,21 +253,18 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_flyRunSpd); packet.writeH(_flyWalkSpd); } - if (containsMask(UserInfoType.MULTIPLIER)) { packet.writeH(18); packet.writeF(_moveMultiplier); packet.writeF(_player.getAttackSpeedMultiplier()); } - if (containsMask(UserInfoType.COL_RADIUS_HEIGHT)) { packet.writeH(18); packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); } - if (containsMask(UserInfoType.ATK_ELEMENTAL)) { packet.writeH(5); @@ -290,7 +272,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); } - if (containsMask(UserInfoType.CLAN)) { packet.writeH(32 + (_title.length() * 2)); @@ -300,12 +281,11 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getClanCrestLargeId()); packet.writeD(_player.getClanCrestId()); packet.writeD(_player.getClanPrivileges().getBitmask()); - packet.writeC(_player.isClanLeader() ? 0x01 : 0x00); + packet.writeC(_player.isClanLeader() ? 1 : 0); packet.writeD(_player.getAllyId()); packet.writeD(_player.getAllyCrestId()); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); } - if (containsMask(UserInfoType.SOCIAL)) { packet.writeH(30); // 228 @@ -318,98 +298,86 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getPvpKills()); packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); - packet.writeD(0x00); // 196 - packet.writeD(0x00); // 228 + packet.writeD(0); // 196 + packet.writeD(0); // 228 } - if (containsMask(UserInfoType.VITA_FAME)) { packet.writeH(19); // 196 packet.writeD(_player.getVitalityPoints()); - packet.writeC(0x00); // Vita Bonus + packet.writeC(0); // Vita Bonus packet.writeD(_player.getFame()); packet.writeD(_player.getRaidbossPoints()); - packet.writeC(0x00); // 196 + packet.writeC(0); // 196 packet.writeH(_player.getSymbolSealPoints()); // Henna Seal Engraving Gauge - packet.writeC(0x00); // 196 + packet.writeC(0); // 196 } - if (containsMask(UserInfoType.SLOTS)) { packet.writeH(12); // 152 packet.writeC(_player.getInventory().getTalismanSlots()); packet.writeC(_player.getInventory().getBroochJewelSlots()); packet.writeC(_player.getTeam().getId()); - packet.writeD(0x00); - + packet.writeD(0); if (_player.getInventory().getAgathionSlots() > 0) { - packet.writeC(0x01); // Charm slots + packet.writeC(1); // Charm slots packet.writeC(_player.getInventory().getAgathionSlots() - 1); packet.writeC(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152 } else { - packet.writeC(0x00); // Charm slots - packet.writeC(0x00); + packet.writeC(0); // Charm slots + packet.writeC(0); packet.writeC(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152 } } - if (containsMask(UserInfoType.MOVEMENTS)) { packet.writeH(4); packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); - packet.writeC(_player.isRunning() ? 0x01 : 0x00); + packet.writeC(_player.isRunning() ? 1 : 0); } - if (containsMask(UserInfoType.COLOR)) { packet.writeH(10); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); } - if (containsMask(UserInfoType.INVENTORY_LIMIT)) { packet.writeH(13); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); packet.writeH(_player.getInventoryLimit()); - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 } - if (containsMask(UserInfoType.TRUE_HERO)) { packet.writeH(9); - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeC(_player.isTrueHero() ? 100 : 0x00); + packet.writeD(0); + packet.writeH(0); + packet.writeC(_player.isTrueHero() ? 100 : 0); } - if (containsMask(UserInfoType.ATT_SPIRITS)) // 152 { packet.writeH(26); packet.writeD(-1); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - if (containsMask(UserInfoType.RANKING)) // 196 { packet.writeH(6); packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : 0); } - return true; } @@ -426,7 +394,6 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x10; // Party leader } } - if (clan != null) { relation |= 0x20; // Clan member @@ -435,12 +402,10 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x40; // Clan leader } } - if (player.isInSiege()) { relation |= 0x80; // In siege } - return relation; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java index 283bcf1614..90c416726a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java @@ -36,7 +36,6 @@ public class ValidateLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java index 4d8f9683d0..83f72bf981 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java @@ -40,7 +40,6 @@ public class ValidateLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java index b684e70bdc..71367cd26d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java @@ -36,7 +36,6 @@ public class VehicleCheckLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_CHECK_LOCATION.writeId(packet); - packet.writeD(_boat.getObjectId()); packet.writeD(_boat.getX()); packet.writeD(_boat.getY()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java index a4a5780f30..5b565c08b7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java @@ -46,7 +46,6 @@ public class VehicleDeparture implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_DEPARTURE.writeId(packet); - packet.writeD(_objId); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java index ec611028bf..4a995a6352 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java @@ -44,7 +44,6 @@ public class VehicleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java index 207a6fd899..bf629dcbbc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java @@ -42,7 +42,6 @@ public class VehicleStarted implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_START.writeId(packet); - packet.writeD(_objectId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 35ca986d35..5eb9eb7ab9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -30,6 +30,7 @@ public class WareHouseDepositList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; public static final int FREIGHT = 1; + private final int _sendType; private final long _playerAdena; private final List _items = new ArrayList<>(); @@ -49,7 +50,6 @@ public class WareHouseDepositList extends AbstractItemPacket _sendType = sendType; _whType = type; _playerAdena = player.getAdena(); - final boolean isPrivate = _whType == PRIVATE; for (Item temp : player.getInventory().getAvailableItems(true, isPrivate, false)) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 7af1cd273c..5ece99310a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -32,6 +32,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private final int _sendType; private Player _player; private long _playerAdena; @@ -60,7 +61,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } - _items = _player.getActiveWarehouse().getItems(); for (Item item : _items) { @@ -78,15 +78,15 @@ public class WareHouseWithdrawalList extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeH(0x00); + packet.writeH(0); packet.writeD(_invSize); packet.writeD(_items.size()); for (Item item : _items) { writeItem(packet, item); packet.writeD(item.getObjectId()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } else diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java index 7442882a70..bd10e174c6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java @@ -59,7 +59,6 @@ public class ExAcquireAPSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_AP_SKILL_LIST.writeId(packet); - packet.writeD(_enable ? 1 : 0); packet.writeQ(Config.ABILITY_POINTS_RESET_SP); // Changed to from Adena to SP on Grand Crusade // packet.writeQ(_price); Removed on Grand Crusade diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java index f9af89e4db..ff296bf632 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java @@ -35,7 +35,6 @@ public class ExCloseAPListWnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_AP_LIST_WND.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java index d72baf2a44..69c47ce99f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java @@ -35,7 +35,6 @@ public class ExShowAPListWnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AP_LIST_WND.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java index 5f2dd05f3b..aea1476fb2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java @@ -35,8 +35,7 @@ public class ExDivideAdenaCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_CANCEL.writeId(packet); - - packet.writeC(0x00); // TODO: Find me + packet.writeC(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java index 6af912cebf..de4e955aba 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java @@ -46,9 +46,8 @@ public class ExDivideAdenaDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_DONE.writeId(packet); - - packet.writeC(_isPartyLeader ? 0x01 : 0x00); - packet.writeC(_isCCLeader ? 0x01 : 0x00); + packet.writeC(_isPartyLeader ? 1 : 0); + packet.writeC(_isCCLeader ? 1 : 0); packet.writeD(_memberCount); packet.writeQ(_distributedAdenaCount); packet.writeQ(_adenaCount); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java index ab8a7471d6..32f99abfdc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java @@ -38,8 +38,7 @@ public class ExAlchemyConversion implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_CONVERSION.writeId(packet); - - packet.writeC((_successCount == 0) && (_failureCount == 0) ? 0x01 : 0x00); + packet.writeC((_successCount == 0) && (_failureCount == 0) ? 1 : 0); packet.writeD(_successCount); packet.writeD(_failureCount); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java index be4a2a57e6..cb3cf4b3e0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java @@ -47,7 +47,6 @@ public class ExTryMixCube implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TRY_MIX_CUBE.writeId(packet); - packet.writeC(_type.ordinal()); packet.writeD(_items.size()); for (AlchemyResult holder : _items) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index 549def456e..84b5fead76 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -43,7 +43,6 @@ public class ExChooseShapeShiftingItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_SHAPE_SHIFTING_ITEM.writeId(packet); - packet.writeD(_targetType != null ? _targetType.ordinal() : 0); packet.writeD(_type != null ? _type.ordinal() : 0); packet.writeD(_itemId); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java index 33fb439aa5..ba55887a1a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java @@ -45,7 +45,6 @@ public class ExCuriousHouseMemberUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_UPDATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_maxHp); packet.writeD(_maxCp); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java index 8ad3659725..be2d29d864 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPacket { - public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0x00); - public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(0x01); + public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0); + public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(1); private final int _result; @@ -39,7 +39,6 @@ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPa public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_EXTRACTION_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java index ec82cc14f3..e84d7a7255 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; public static final ExPutShapeShiftingTargetItemResult FAILED = new ExPutShapeShiftingTargetItemResult(RESULT_FAILED, 0); @@ -43,7 +43,6 @@ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_resultId); packet.writeQ(_price); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java index f4d3118cc4..038eae0042 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExShapeShiftingResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; - public static final int RESULT_CLOSE = 0x02; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; + public static final int RESULT_CLOSE = 2; public static final ExShapeShiftingResult FAILED = new ExShapeShiftingResult(RESULT_FAILED, 0, 0); public static final ExShapeShiftingResult CLOSE = new ExShapeShiftingResult(RESULT_CLOSE, 0, 0); @@ -47,7 +47,6 @@ public class ExShapeShiftingResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHAPE_SHIFTING_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_targetItemId); packet.writeD(_extractItemId); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java index eaf0d209fd..4b48b09002 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java @@ -38,7 +38,7 @@ public class ExConfirmVipAttendanceCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CONFIRM_VIP_ATTENDANCE_CHECK.writeId(packet); - packet.writeC(_available ? 0x01 : 0x00); // can receive reward today? 1 else 0 + packet.writeC(_available ? 1 : 0); // can receive reward today? 1 else 0 packet.writeC(_index); // active reward index packet.writeD(0); packet.writeD(0); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java index 9d61fe68d6..dd94df023f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java @@ -45,10 +45,10 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket OutgoingPackets.EX_VIP_ATTENDANCE_ITEM_LIST.writeId(packet); packet.writeC(_available ? _index + 1 : _index); // index to receive? packet.writeC(_index); // last received index? - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeC(0x01); - packet.writeC(_available ? 0x01 : 0x00); // player can receive reward today? + packet.writeD(0); + packet.writeD(0); + packet.writeC(1); + packet.writeC(_available ? 1 : 0); // player can receive reward today? packet.writeC(250); packet.writeC(AttendanceRewardData.getInstance().getRewardsCount()); // reward size int rewardCounter = 0; @@ -57,11 +57,11 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket rewardCounter++; packet.writeD(reward.getId()); packet.writeQ(reward.getCount()); - packet.writeC(0x01); // is unknown? - packet.writeC((rewardCounter % 7) == 0 ? 0x01 : 0x00); // is last in row? + packet.writeC(1); // is unknown? + packet.writeC((rewardCounter % 7) == 0 ? 1 : 0); // is last in row? } - packet.writeC(0x00); - packet.writeD(0x00); + packet.writeC(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java index 0282966053..9963a080c6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java @@ -41,7 +41,7 @@ public class ExActivateAutoShortcut implements IClientOutgoingPacket { OutgoingPackets.EX_ACTIVATE_AUTO_SHORTCUT.writeId(packet); packet.writeH(_position); - packet.writeC(_active ? 0x01 : 0x00); + packet.writeC(_active ? 1 : 0); return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java index 7f1d6d60d1..73f93335ef 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java @@ -43,7 +43,6 @@ public class ExCuriousHouseMemberList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_LIST.writeId(packet); - packet.writeD(_id); packet.writeD(_maxPlayers); packet.writeD(_players.size()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java index b71caa5f14..5d9b34db61 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java @@ -37,7 +37,6 @@ public class ExCuriousHouseRemainTime implements IClientOutgoingPacket { OutgoingPackets.EX_CURIOUS_HOUSE_REMAIN_TIME.writeId(packet); packet.writeD(_time); - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java index 4c3ae253ea..c79b68becc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java @@ -39,7 +39,6 @@ public class ExResponseCommissionBuyInfo extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_INFO.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java index ddfa8b6db1..c1d29735b8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java @@ -40,7 +40,6 @@ public class ExResponseCommissionBuyItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_ITEM.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java index aa4bbbde24..01e4782408 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java @@ -39,7 +39,6 @@ public class ExResponseCommissionDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_DELETE.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java index e7e3c39816..b915574175 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java @@ -55,7 +55,6 @@ public class ExResponseCommissionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_INFO.writeId(packet); - packet.writeD(_result); packet.writeD(_itemId); packet.writeQ(_presetPricePerUnit); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java index 4963393b42..a012b3ab30 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java @@ -64,7 +64,6 @@ public class ExResponseCommissionList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_LIST.writeId(packet); - packet.writeD(_replyType.getClientId()); switch (_replyType) { @@ -73,13 +72,11 @@ public class ExResponseCommissionList extends AbstractItemPacket { packet.writeD((int) Instant.now().getEpochSecond()); packet.writeD(_chunkId); - int chunkSize = _items.size() - _listIndexStart; if (chunkSize > MAX_CHUNK_SIZE) { chunkSize = MAX_CHUNK_SIZE; } - packet.writeD(chunkSize); for (int i = _listIndexStart; i < (_listIndexStart + chunkSize); i++) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java index b1b0a97d7a..183547af06 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java @@ -39,7 +39,6 @@ public class ExResponseCommissionRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_REGISTER.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java index 74d8a95587..b68386e4ed 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java @@ -35,8 +35,7 @@ public class ExShowCommission implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_COMMISSION.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java index 0c267ecf34..11b1ff1e0a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExEnchantFail implements IClientOutgoingPacket { public static final ExEnchantFail STATIC_PACKET = new ExEnchantFail(0, 0); + private final int _itemOne; private final int _itemTwo; @@ -39,7 +40,6 @@ public class ExEnchantFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_FAIL.writeId(packet); - packet.writeD(_itemOne); packet.writeD(_itemTwo); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java index 71ba811ed5..87d29a8e7c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java @@ -36,7 +36,6 @@ public class ExEnchantSucess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SUCESS.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java index eb4eb8b26c..ec67d50fb6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java @@ -39,7 +39,6 @@ public class ExGetCrystalizingEstimation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - packet.writeD(_items.size()); for (ItemChanceHolder holder : _items) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java index 23b770e406..ebe77fa654 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java @@ -29,7 +29,7 @@ public class ExShowUpgradeSystem extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_UPGRADE_SYSTEM.writeId(packet); - packet.writeH(0x01); + packet.writeH(1); return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java index 586d77c13f..2fb9bb65a1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java @@ -40,11 +40,9 @@ public class ExFactionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FACTION_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_openDialog ? 1 : 0); packet.writeD(Faction.values().length); - for (Faction faction : Faction.values()) { packet.writeC(faction.getId()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java index fa605b548a..a99ad7f4e3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java @@ -52,7 +52,7 @@ public class ExFishingStart implements IClientOutgoingPacket packet.writeD(_baitLocation.getX()); packet.writeD(_baitLocation.getY()); packet.writeD(_baitLocation.getZ()); - packet.writeC(0x01); // 0 = newbie, 1 = normal, 2 = night + packet.writeC(1); // 0 = newbie, 1 = normal, 2 = night return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java index 046ad04cb6..74501fe7ff 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java @@ -49,7 +49,6 @@ public class ExUserInfoFishing implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_FISHING.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_isFishing ? 1 : 0); if (_baitLocation == null) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index dc0e3e05bc..336a384bcc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -47,9 +47,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FRIEND_DETAIL_INFO.writeId(packet); - packet.writeD(_objectId); - if (_friend == null) { packet.writeS(_name); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java index 0d4bb47ff0..a90b7b6083 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java @@ -33,8 +33,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x00); + packet.writeC(0); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java index 9add9c9caa..d24139644c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java @@ -49,7 +49,6 @@ public class FriendAddRequestResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_charId); packet.writeS(_charName); @@ -57,7 +56,7 @@ public class FriendAddRequestResult implements IClientOutgoingPacket packet.writeD(_charObjectId); packet.writeD(_charLevel); packet.writeD(_charClassId); - packet.writeH(0x00); // Always 0 on retail + packet.writeH(0); // Always 0 on retail return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java index a135944662..13a7d01967 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java @@ -86,12 +86,10 @@ public class FriendList implements IClientOutgoingPacket } continue; } - if (player1.isOnline()) { online = true; } - classid = player1.getClassId().getId(); level = player1.getLevel(); _info.add(new FriendInfo(objId, name, online, classid, level)); @@ -102,14 +100,13 @@ public class FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._classid); packet.writeD(info._level); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java index 07c23f9fd2..1bb4142e34 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java @@ -38,7 +38,6 @@ public class FriendRemove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_REMOVE.writeId(packet); - packet.writeD(_responce); packet.writeS(_charName); return true; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java index e8dbddcd63..a3990c0879 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java @@ -52,7 +52,6 @@ public class FriendStatus implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_STATUS.writeId(packet); - packet.writeD(_type); packet.writeS(_name); switch (_type) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java index 8752104e06..78da5850b8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java @@ -50,7 +50,6 @@ public class L2Friend implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND.writeId(packet); - packet.writeD(_action ? 1 : 3); // 1-add 3-remove packet.writeD(_objid); packet.writeS(_name); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java index b69a253635..e50693cb11 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java @@ -81,17 +81,16 @@ public class L2FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._level); packet.writeD(info._classId); - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java index 0d4fa5cb5d..d0b92dbd1d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java @@ -40,7 +40,7 @@ public class TimedHuntingZoneEnter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); - packet.writeC(0x01); // bEnterSuccess + packet.writeC(1); // bEnterSuccess packet.writeD(_zoneId); packet.writeD((int) ((Chronos.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) packet.writeD(_player.getTimedHuntingZoneRemainingTime(_zoneId) / 1000); // nRemainTime (zone left time) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java index 2c93f25c76..c80dbcfa6a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java @@ -35,7 +35,7 @@ public class TimedHuntingZoneExit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); - packet.writeC(0x00); // bEnterSuccess + packet.writeC(0); // bEnterSuccess return true; } } \ No newline at end of file diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java index 677c09091f..706c179a9c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java @@ -37,7 +37,6 @@ public class ExMentorAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_ADD.writeId(packet); - packet.writeS(_mentor.getName()); packet.writeD(_mentor.getActiveClass()); packet.writeD(_mentor.getLevel()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java index 4722a9cab3..18c1cdeedf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java @@ -64,9 +64,8 @@ public class ExMentorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_LIST.writeId(packet); - packet.writeD(_type); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mentees.size()); for (Mentee mentee : _mentees) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java index d739dd94b7..2283920b98 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ListMenteeWaiting implements IClientOutgoingPacket { private static final int PLAYERS_PER_PAGE = 64; + private final List _possibleCandiates = new ArrayList<>(); private final int _page; @@ -51,18 +52,15 @@ public class ListMenteeWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_MENTEE_WAITING.writeId(packet); - - packet.writeD(0x01); // always 1 in retail + packet.writeD(1); // always 1 in retail if (_possibleCandiates.isEmpty()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } - packet.writeD(_possibleCandiates.size()); packet.writeD(_possibleCandiates.size() % PLAYERS_PER_PAGE); - for (Player player : _possibleCandiates) { if ((1 <= (PLAYERS_PER_PAGE * _page)) && (1 > (PLAYERS_PER_PAGE * (_page - 1)))) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java index e33e29a487..fc80b0a6c0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java @@ -41,7 +41,6 @@ public class ExPledgeContributionInfo implements IClientOutgoingPacket { return false; } - OutgoingPackets.EX_PLEDGE_CONTRIBUTION_INFO.writeId(packet); packet.writeD(_player.getClanContribution()); packet.writeD(_player.getClanContribution()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java index e65c0ced20..64b1bfd2e6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java @@ -44,10 +44,8 @@ public class ExPledgeContributionRank implements IClientOutgoingPacket { return false; } - OutgoingPackets.EX_PLEDGE_CONTRIBUTION_RANK.writeId(packet); packet.writeC(_cycle); - packet.writeD(_clan.getMembersCount()); int order = 1; for (ClanMember member : _clan.getMembers()) @@ -70,7 +68,6 @@ public class ExPledgeContributionRank implements IClientOutgoingPacket packet.writeD(member.getClanContributionTotal()); } } - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java index c235245d89..e66b814d06 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java @@ -42,9 +42,7 @@ public class ExPledgeItemList extends AbstractItemPacket { return false; } - OutgoingPackets.EX_PLEDGE_ITEM_LIST.writeId(packet); - packet.writeH(ClanShopData.getInstance().getProducts().size()); // Product count. for (ClanShopProductHolder product : ClanShopData.getInstance().getProducts()) { @@ -61,7 +59,6 @@ public class ExPledgeItemList extends AbstractItemPacket packet.writeH(0); // Current stock packet.writeH(0); // Total stock } - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java index e4df4b523e..21c5ba1724 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java @@ -44,9 +44,7 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket { return false; } - OutgoingPackets.EX_PLEDGE_MASTERY_INFO.writeId(packet); - packet.writeD(clan.getUsedDevelopmentPoints()); // Consumed development points packet.writeD(clan.getTotalDevelopmentPoints()); // Total development points packet.writeD(16); // Mastery count @@ -56,8 +54,7 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket { final int id = mastery.getId(); packet.writeD(id); // Mastery - packet.writeD(0x00); // ? - + packet.writeD(0); // ? boolean available = true; if (clan.getLevel() < mastery.getClanLevel()) { @@ -76,11 +73,9 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket available = clan.hasMastery(previous); } } - - packet.writeC(clan.hasMastery(id) ? 0x02 : available ? 0x01 : 0x00); // Availability. + packet.writeC(clan.hasMastery(id) ? 2 : available ? 1 : 0); // Availability. } } - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java index d31a014aea..568aa70f70 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java @@ -46,15 +46,12 @@ public class ExPledgeMissionInfo implements IClientOutgoingPacket { return true; } - OutgoingPackets.EX_PLEDGE_MISSION_INFO.writeId(packet); - packet.writeD(_rewards.size()); for (DailyMissionDataHolder reward : _rewards) { int progress = reward.getProgress(_player); int status = reward.getStatus(_player); - // TODO: Figure out this. if (reward.isLevelUpMission()) { @@ -76,12 +73,10 @@ public class ExPledgeMissionInfo implements IClientOutgoingPacket { status = 2; } - packet.writeD(reward.getId()); packet.writeD(progress); packet.writeC(status); } - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java index ce1d6327e7..604181c6ed 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java @@ -41,10 +41,8 @@ public class ExPledgeMissionRewardCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_MISSION_REWARD_COUNT.writeId(packet); - packet.writeD(Math.min(_availableMissionsCount, _doneMissionsCount)); // Received missions rewards. packet.writeD(_availableMissionsCount); // Available missions rewards. 18 - for noble, 20 - for honnorable noble. - return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java index e59ebcfaab..22cf060348 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java @@ -43,7 +43,6 @@ public class ExPledgeShowInfoUpdate extends AbstractItemPacket { return false; } - OutgoingPackets.EX_PLEDGE_SHOW_INFO_UPDATE.writeId(packet); packet.writeD(clan.getId()); // Clan ID packet.writeD(ClanLevelData.getLevelRequirement(clan.getLevel())); // Next level cost diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index fb735b8925..e75426e598 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -69,7 +69,6 @@ public class ExBRBuyProduct implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUY_PRODUCT.writeId(packet); - packet.writeD(_reply); return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java index 742b3eba9d..91a186b81d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java @@ -39,10 +39,9 @@ public class ExBRGamePoint implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_GAME_POINT.writeId(packet); - packet.writeD(_charId); packet.writeQ(_charPoints); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java index 50f21df46a..e36f2ff502 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java @@ -45,7 +45,6 @@ public class ExBRProductInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_INFO.writeId(packet); - packet.writeD(_item.getBrId()); packet.writeD(_item.getPrice()); packet.writeD(_item.getItems().size()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java index dc851ffd43..0f042ba043 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java @@ -45,9 +45,8 @@ public class ExBRProductList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); // Adena - packet.writeQ(0x00); // Hero coins + packet.writeQ(0); // Hero coins packet.writeC(_type); // Type 0 - Home, 1 - History, 2 - Favorites packet.writeD(_primeList.size()); for (PrimeShopGroup brItem : _primeList) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java index b23e9fa8a9..f4406c1407 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java @@ -38,7 +38,6 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RAID_BOSS_SPAWN_INFO.writeId(packet); - packet.writeD(_bossIds.size()); // alive count for (int id : _bossIds) // alive ids { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java index 64c9f64e69..8cc3ba0278 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java @@ -47,7 +47,6 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_HERO_AND_LEGEND_INFO.writeId(packet); - if (!Hero.getInstance().getHeroes().isEmpty()) { try (Connection con = DatabaseFactory.getConnection(); @@ -63,7 +62,6 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket { packet.writeC(1); // ?? shows 78 on JP packet.writeC(1); // ?? shows 0 on JP - packet.writeString(rset.getString("char_name")); final int clanId = rset.getInt("clanid"); if (clanId > 0) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java index 1806b92dad..4281856780 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java @@ -55,7 +55,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MY_RANKING_INFO.writeId(packet); - final Date date = new Date(); final Calendar calendar = new GregorianCalendar(); calendar.setTime(date); @@ -101,7 +100,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket { PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } - int previousPlace = 0; int previousWins = 0; int previousLoses = 0; @@ -130,7 +128,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket { PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } - int heroCount = 0; int legendCount = 0; if (Hero.getInstance().getCompleteHeroes().containsKey(_player.getObjectId())) @@ -139,7 +136,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket heroCount = hero.getInt("count", 0); legendCount = hero.getInt("legend_count", 0); } - packet.writeD(year); // Year packet.writeD(month); // Month packet.writeD(Olympiad.getInstance().getCurrentCycle() - 1); // cycle ? diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java index 3587fd1bf7..7a233e49d3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java @@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExOlympiadRankingInfo implements IClientOutgoingPacket { private final Player _player; - private final int _tabId; private final int _rankingType; private final int _unk; @@ -58,14 +57,12 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_RANKING_INFO.writeId(packet); - packet.writeC(_tabId); // Tab id packet.writeC(_rankingType); // ranking type packet.writeC(_unk); // unk, shows 1 all time packet.writeD(_classId); // class id (default 148) or caller class id for personal rank packet.writeD(_serverId); // 0 - all servers, server id - for caller server packet.writeD(933); // unk, 933 all time - if (!_playerList.isEmpty()) { switch (_tabId) @@ -75,14 +72,12 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket if (_rankingType == 0) { packet.writeD(_playerList.size() > 100 ? 100 : _playerList.size()); - for (Integer id : _playerList.keySet()) { final StatSet player = _playerList.get(id); packet.writeString(player.getString("name")); // name packet.writeString(player.getString("clanName")); // clan name packet.writeD(id); // rank - if (!_snapshotList.isEmpty()) { for (Integer id2 : _snapshotList.keySet()) @@ -98,7 +93,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket { packet.writeD(id); } - packet.writeD(Config.SERVER_ID);// server id packet.writeD(player.getInt("level"));// level packet.writeD(player.getInt("classId"));// class id @@ -119,7 +113,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket if (player.getInt("charId") == _player.getObjectId()) { found = true; - final int first = id > 10 ? (id - 9) : 1; final int last = _playerList.size() >= (id + 10) ? id + 10 : id + (_playerList.size() - id); if (first == 1) @@ -130,7 +123,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket { packet.writeD(last - first); } - for (int id2 = first; id2 <= last; id2++) { final StatSet plr = _playerList.get(id2); @@ -152,7 +144,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket { packet.writeD(id2); } - packet.writeD(Config.SERVER_ID); packet.writeD(plr.getInt("level")); packet.writeD(plr.getInt("classId")); @@ -186,7 +177,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket } } packet.writeD(count > 50 ? 50 : count); - int i = 1; for (Integer id : _playerList.keySet()) { @@ -222,7 +212,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket { packet.writeD(i); } - packet.writeD(Config.SERVER_ID); packet.writeD(player.getInt("level")); packet.writeD(player.getInt("classId")); @@ -250,7 +239,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket i++; } } - for (Integer id : classList.keySet()) { final StatSet player = classList.get(id); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java index cf2632ed57..a9a31f88fb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java @@ -48,7 +48,6 @@ public class ExRankingCharInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RANKING_CHAR_INFO.writeId(packet); - if (!_playerList.isEmpty()) { for (Integer id : _playerList.keySet()) @@ -58,7 +57,6 @@ public class ExRankingCharInfo implements IClientOutgoingPacket { packet.writeD(id); // server rank packet.writeD(player.getInt("raceRank")); // race rank - for (Integer id2 : _snapshotList.keySet()) { final StatSet snapshot = _snapshotList.get(id2); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java index 588bee4582..cd0ee7a3d4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java @@ -33,11 +33,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExRankingCharRankers implements IClientOutgoingPacket { private final Player _player; - private final int _race; private final int _group; private final int _scope; - private final Map _playerList; private final Map _snapshotList; @@ -55,11 +53,9 @@ public class ExRankingCharRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RANKING_CHAR_RANKERS.writeId(packet); - packet.writeC(_group); packet.writeC(_scope); packet.writeD(_race); - if (!_playerList.isEmpty()) { switch (_group) @@ -70,7 +66,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket { final int count = _playerList.size() > 150 ? 150 : _playerList.size(); packet.writeD(count); - for (Integer id : _playerList.keySet()) { final StatSet player = _playerList.get(id); @@ -127,7 +122,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket packet.writeD(plr.getInt("classId")); packet.writeD(plr.getInt("race")); packet.writeD(id2); // server rank - if (!_snapshotList.isEmpty()) { for (Integer id3 : _snapshotList.keySet()) @@ -164,7 +158,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } } packet.writeD(count > 100 ? 100 : count); - int i = 1; for (Integer id : _playerList.keySet()) { @@ -212,7 +205,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket else { boolean found = false; - final Map raceList = new ConcurrentHashMap<>(); int i = 1; for (Integer id : _playerList.keySet()) @@ -224,7 +216,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket i++; } } - for (Integer id : raceList.keySet()) { final StatSet player = raceList.get(id); @@ -277,9 +268,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket i++; } } - packet.writeD(clanList.size()); - for (Integer id : clanList.keySet()) { final StatSet player = clanList.get(id); @@ -333,9 +322,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } } friendList.add(_player.getObjectId()); - packet.writeD(count); - for (int id : _playerList.keySet()) { final StatSet player = _playerList.get(id); @@ -370,7 +357,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket else { packet.writeD(1); - packet.writeString(_player.getName()); if (_player.getClan() != null) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java index 2463589c81..c09b3e899d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java @@ -47,18 +47,15 @@ public class ExFlyMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_mapId); - packet.writeD(_locations.size()); for (SayuneEntry loc : _locations) { packet.writeD(loc.getId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(loc.getX()); packet.writeD(loc.getY()); packet.writeD(loc.getZ()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java index 03fc6b580d..70b3fb25d2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java @@ -47,16 +47,13 @@ public class ExFlyMoveBroadcast implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE_BROADCAST.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); packet.writeD(_mapId); - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD(_currentLoc.getX()); packet.writeD(_currentLoc.getY()); packet.writeD(_currentLoc.getZ()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java index cfe11a27e0..49e5d86910 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java @@ -35,7 +35,6 @@ public class ExNotifyFlyMoveStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_FLY_MOVE_START.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java index d5640a47ef..0efa37ae8c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java @@ -51,7 +51,6 @@ public class ExMoveToLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_SUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_targetX); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java index 0cbe2c3e02..a0314c39aa 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java @@ -46,7 +46,6 @@ public class ExShuttleGetOff implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_OFF.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_x); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java index 5211bef5ba..061bcafed9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java @@ -43,7 +43,6 @@ public class ExShuttleGetOn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_ON.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java index 97d54a9019..c8aee1fde7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java @@ -43,7 +43,6 @@ public class ExShuttleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHUTTLE_INFO.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD(_shuttle.getX()); packet.writeD(_shuttle.getY()); @@ -60,8 +59,8 @@ public class ExShuttleInfo implements IClientOutgoingPacket packet.writeD(loc.getY()); packet.writeD(loc.getZ()); } - packet.writeD(stop.isDoorOpen() ? 0x01 : 0x00); - packet.writeD(stop.hasDoorChanged() ? 0x01 : 0x00); + packet.writeD(stop.isDoorOpen() ? 1 : 0); + packet.writeD(stop.hasDoorChanged() ? 1 : 0); } return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java index 6ba38f29a1..28b33b998e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java @@ -43,7 +43,6 @@ public class ExShuttleMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_MOVE.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD((int) _shuttle.getStat().getMoveSpeed()); packet.writeD((int) _shuttle.getStat().getRotationSpeed()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java index bf2b6ea6eb..6c31189d6a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java @@ -44,7 +44,6 @@ public class ExStopMoveInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_SHUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java index f7f6849732..8492f42a6e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java @@ -44,7 +44,6 @@ public class ExValidateLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_SHUTTLE.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java index 1d59c6d002..e7654ed911 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java @@ -60,7 +60,7 @@ public class AccountKicked implements IOutgoingPacket { OutgoingPackets.ACCOUNT_KICKED.writeId(packet); packet.writeD(_reason.getCode()); - return true; } } + diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 2e3a1f6163..1fe813e393 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: response + * Format: d d: response */ public class GGAuth implements IOutgoingPacket { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/network/serverpackets/Init.java index 4b3f71f30e..d725f45ca2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/network/serverpackets/Init.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/network/serverpackets/Init.java @@ -52,7 +52,6 @@ public class Init implements IOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.INIT.writeId(packet); - packet.writeD(_sessionId); // session id packet.writeD(0x0000c621); // protocol revision diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index 8c534554a8..f4dcd22b00 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: the failure reason + * Format: d d: the failure reason */ public class LoginFail implements IOutgoingPacket { diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index c700328f3d..f8b05abb47 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -529,7 +529,7 @@ public class Lindvior extends AbstractNpcAI for (Location loc : CONTROL_GENERATOR_SPAWNS) { guard = (FriendlyNpc) addSpawn(NPC_GENERATOR, loc, true); - guard.setDisplayEffect(0x01); + guard.setDisplayEffect(1); guard.setScriptValue(i++); _generatorSpawn.add(guard); } @@ -685,7 +685,7 @@ public class Lindvior extends AbstractNpcAI if (!hasFlag(_activeMask, 1 << index)) { _activeMask |= 1 << index; - npc.setDisplayEffect(0x02); + npc.setDisplayEffect(2); sendEventTrigger(true, GENERATOR_TRIGERS[index]); _zoneLair.getPlayersInside().stream().forEach(p -> p.broadcastPacket(new Earthquake(p.getX(), p.getY(), p.getZ(), 20, 10))); if (hasFlag(_activeMask, 0xf)) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/BaseRecievePacket.java index c682cb741d..a6ed15ce32 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/BaseRecievePacket.java @@ -73,7 +73,7 @@ public abstract class BaseRecievePacket try { result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE); - result = result.substring(0, result.indexOf(0x00)); + result = result.substring(0, result.indexOf(0)); _off += (result.length() * 2) + 2; } catch (Exception e) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/BaseSendablePacket.java index a9d918de4c..8fa8491cbf 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/commons/network/BaseSendablePacket.java @@ -117,16 +117,16 @@ public abstract class BaseSendablePacket public byte[] getBytes() { // if (this instanceof Init) - // writeD(0x00); // reserve for XOR initial key + // writeD(0); // reserve for XOR initial key - writeD(0x00); // reserve for checksum + writeD(0); // reserve for checksum final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++) { - writeC(0x00); + writeC(0); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/AttackType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/AttackType.java index 6064b10ed7..e9983f15e3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/AttackType.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/AttackType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum AttackType { - MISSED(0x01), - BLOCKED(0x02), - CRITICAL(0x04), - SHOT_USED(0x08); + MISSED(1), + BLOCKED(2), + CRITICAL(4), + SHOT_USED(8); private final int _mask; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/GroupType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/GroupType.java index 954aaace8b..916a14fd05 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/GroupType.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/GroupType.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum GroupType implements IUpdateTypeComponent { - NONE(0x01), - PARTY(0x02), - COMMAND_CHANNEL(0x04); + NONE(1), + PARTY(2), + COMMAND_CHANNEL(4); private int _mask; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/ItemListType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/ItemListType.java index 2d38c8f5b1..c80234439f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/ItemListType.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/ItemListType.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum ItemListType implements IUpdateTypeComponent { - AUGMENT_BONUS(0x01), - ELEMENTAL_ATTRIBUTE(0x02), - ENCHANT_EFFECT(0x04), - VISUAL_ID(0x08), - SOUL_CRYSTAL(0x10); + AUGMENT_BONUS(1), + ELEMENTAL_ATTRIBUTE(2), + ENCHANT_EFFECT(4), + VISUAL_ID(8), + SOUL_CRYSTAL(16); private final int _mask; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java index b3d08596c6..29403b783d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum MacroUpdateType { - ADD(0x01), - LIST(0x01), - MODIFY(0x02), - DELETE(0x00); + ADD(1), + LIST(1), + MODIFY(2), + DELETE(0); private final int _id; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java index 86c6159869..7776721c0f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java @@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum PartySmallWindowUpdateType implements IUpdateTypeComponent { - CURRENT_CP(0x01), - MAX_CP(0x02), - CURRENT_HP(0x04), - MAX_HP(0x08), - CURRENT_MP(0x10), - MAX_MP(0x20), - LEVEL(0x40), - CLASS_ID(0x80), - PARTY_SUBSTITUTE(0x100), - VITALITY_POINTS(0x200); + CURRENT_CP(1), + MAX_CP(2), + CURRENT_HP(4), + MAX_HP(8), + CURRENT_MP(16), + MAX_MP(32), + LEVEL(64), + CLASS_ID(128), + PARTY_SUBSTITUTE(256), + VITALITY_POINTS(512); private final int _mask; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 00bb331778..667ce7f17c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.Broadcast; import org.l2jmobius.gameserver.util.Util; /** - * Fromat:(ch) dddddc + * Format:(ch) dddddc * @author -Wooden- */ public class RequestExMagicSkillUseGround implements IClientIncomingPacket diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java index ec60042793..6054868de7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java @@ -39,7 +39,6 @@ public class AbnormalStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ABNORMAL_STATUS_UPDATE.writeId(packet); - packet.writeH(_effects.size()); for (BuffInfo info : _effects) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 1b8ddb2042..bec794bef3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -44,7 +44,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; } @@ -60,7 +59,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; setHtml(html); } @@ -77,13 +75,11 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } - if (!html.contains(""; return; } - _html = html; } @@ -96,7 +92,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } - setHtml(content); return true; } @@ -138,12 +133,10 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { player.clearHtmlActions(getScope()); } - if (_disabledValidation) { return; } - if (player != null) { Util.buildHtmlActionCache(player, getScope(), _npcObjId, _html); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index f143a8aec9..f10f114f31 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -71,7 +71,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket= 0) || (item.getAttributeDefence(AttributeType.FIRE) > 0) || (item.getAttributeDefence(AttributeType.WATER) > 0) || (item.getAttributeDefence(AttributeType.WIND) > 0) || (item.getAttributeDefence(AttributeType.EARTH) > 0) || (item.getAttributeDefence(AttributeType.HOLY) > 0) || (item.getAttributeDefence(AttributeType.DARK) > 0)) { mask |= ItemListType.ELEMENTAL_ATTRIBUTE.getMask(); } - if (item.getEnchantOptions() != null) { for (int id : item.getEnchantOptions()) @@ -186,22 +180,18 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket 0) { mask |= ItemListType.VISUAL_ID.getMask(); } - if (((item.getSoulCrystalOptions() != null) && !item.getSoulCrystalOptions().isEmpty()) || ((item.getSoulCrystalSpecialOptions() != null) && !item.getSoulCrystalSpecialOptions().isEmpty())) { mask |= ItemListType.SOUL_CRYSTAL.getMask(); } - // if (item.isBlessed()) // { // mask |= ItemListType.BLESSED.getMask(); // } - return mask; } @@ -269,7 +259,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); packet.writeC(removeSkills.size()); for (Skill removed : removeSkills) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java index 8fa6259f64..6451dffd02 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ActionFailed implements IClientOutgoingPacket { public static final ActionFailed STATIC_PACKET = new ActionFailed(); - private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); + private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); static { for (SkillCastingType castingType : SkillCastingType.values()) @@ -57,7 +57,6 @@ public class ActionFailed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ACTION_FAIL.writeId(packet); - packet.writeD(_castingType); // MagicSkillUse castingType return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java index 6e868368c9..30ce58da60 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java @@ -44,9 +44,8 @@ public class AgitDecoInfo implements IClientOutgoingPacket { continue; } - packet.writeC(_residense.hasFunction(type) ? 0x01 : 0x00); + packet.writeC(_residense.hasFunction(type) ? 1 : 0); } - // Unknown packet.writeD(0); // TODO: Find me! packet.writeD(0); // TODO: Find me! diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java index 6cb71fc985..4683fb30f0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java @@ -44,7 +44,6 @@ public class AllianceInfo implements IClientOutgoingPacket _name = leader.getAllyName(); _leaderC = leader.getName(); _leaderP = leader.getLeaderName(); - final Collection allies = ClanTable.getInstance().getClanAllies(allianceId); _allies = new ClanInfo[allies.size()]; int idx = 0; @@ -57,7 +56,6 @@ public class AllianceInfo implements IClientOutgoingPacket total += ci.getTotal(); online += ci.getOnline(); } - _total = total; _online = online; } @@ -66,18 +64,16 @@ public class AllianceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_INFO.writeId(packet); - packet.writeS(_name); packet.writeD(_total); packet.writeD(_online); packet.writeS(_leaderC); packet.writeS(_leaderP); - packet.writeD(_allies.length); for (ClanInfo aci : _allies) { packet.writeS(aci.getClan().getName()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(aci.getClan().getLevel()); packet.writeS(aci.getClan().getLeaderName()); packet.writeD(aci.getTotal()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java index f9d08f6600..186fd12e81 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java @@ -44,7 +44,6 @@ public class AllyCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java index 6218f1717f..1ae4653f91 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java @@ -38,7 +38,6 @@ public class AskJoinAlly implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_ALLIANCE.writeId(packet); - packet.writeD(_requestorObjId); packet.writeS(null); // Ally Name ? packet.writeS(null); // TODO: Find me! diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java index a66bb3cd33..b9cfbe81b9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java @@ -39,7 +39,6 @@ public class AskJoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_PARTY.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 05c420ff59..227ab571be 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -45,7 +45,6 @@ public class Attack implements IClientOutgoingPacket _attackerObjId = attacker.getObjectId(); _attackerLoc = new Location(attacker); _targetLoc = new Location(target); - final Player player = attacker.getActingPlayer(); if (player == null) { @@ -111,7 +110,6 @@ public class Attack implements IClientOutgoingPacket final Iterator it = _hits.iterator(); final Hit firstHit = it.next(); OutgoingPackets.ATTACK.writeId(packet); - packet.writeD(_attackerObjId); packet.writeD(firstHit.getTargetId()); packet.writeD(_soulshotVisualSubstitute); // Ertheia @@ -121,13 +119,11 @@ public class Attack implements IClientOutgoingPacket packet.writeD(_attackerLoc.getX()); packet.writeD(_attackerLoc.getY()); packet.writeD(_attackerLoc.getZ()); - packet.writeH(_hits.size() - 1); while (it.hasNext()) { writeHit(packet, it.next()); } - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java index bd6878eb42..8b85fe85e3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java @@ -35,7 +35,6 @@ public class AutoAttackStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_START.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java index e767d1877a..a294b1e212 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java @@ -35,7 +35,6 @@ public class AutoAttackStop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_STOP.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java index 3f329415df..0c79677eae 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java @@ -38,7 +38,6 @@ public class BlockListPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BLOCK_LIST.writeId(packet); - packet.writeD(_playersId.size()); for (int playerId : _playersId) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index f610cdc6aa..d95f0543b9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -45,8 +45,7 @@ public class BuyList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x00); // Type BUY + packet.writeD(0); // Type BUY packet.writeQ(_money); // current money packet.writeD(_listId); packet.writeD(_inventorySlots); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index cd25af908d..7cb2bf4425 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -50,36 +50,34 @@ public class BuyListSeed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BUY_LIST_SEED.writeId(packet); - packet.writeQ(_money); // current money - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeD(_manorId); // manor id - if (!_list.isEmpty()) { packet.writeH(_list.size()); // list length for (SeedProduction s : _list) { - packet.writeC(0x00); // mask item 0 to print minimal item information + packet.writeC(0); // mask item 0 to print minimal item information packet.writeD(s.getId()); // ObjectId packet.writeD(s.getId()); // ItemId packet.writeC(0xFF); // T1 packet.writeQ(s.getAmount()); // Quantity - packet.writeC(0x05); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item - packet.writeC(0x00); // Filler (always 0) - packet.writeH(0x00); // Equipped : 00-No, 01-yes - packet.writeQ(0x00); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand - packet.writeH(0x00); // Enchant level (pet level shown in control item) + packet.writeC(5); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item + packet.writeC(0); // Filler (always 0) + packet.writeH(0); // Equipped : 00-No, 01-yes + packet.writeQ(0); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand + packet.writeH(0); // Enchant level (pet level shown in control item) packet.writeD(-1); packet.writeD(-9999); - packet.writeC(0x01); // GOD Item enabled = 1 disabled (red) = 0 + packet.writeC(1); // GOD Item enabled = 1 disabled (red) = 0 packet.writeQ(s.getPrice()); // price } _list.clear(); } else { - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java index 3a7b67af23..f3dc872dca 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java @@ -32,8 +32,7 @@ public class CSShowComBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - - packet.writeC(0x01); // c4 1 to show community 00 to hide + packet.writeC(1); // c4 1 to show community 00 to hide packet.writeB(_html); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java index eacc27aa07..b18dac4cc3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java @@ -36,7 +36,6 @@ public class CameraMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CAMERA_MODE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java index 1682f5bc62..adea754676 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java @@ -39,7 +39,6 @@ public class ChairSit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAIR_SIT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_staticObjectId); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java index 2bc31a285a..de141fa067 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java @@ -38,7 +38,6 @@ public class ChangeMoveType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_MOVE_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_running ? RUN : WALK); packet.writeD(0); // c2 diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index 73277d923d..fbe5e39e2e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -22,17 +22,17 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ChangeWaitType implements IClientOutgoingPacket { + public static final int WT_SITTING = 0; + public static final int WT_STANDING = 1; + public static final int WT_START_FAKEDEATH = 2; + public static final int WT_STOP_FAKEDEATH = 3; + private final int _objectId; private final int _moveType; private final int _x; private final int _y; private final int _z; - public static final int WT_SITTING = 0; - public static final int WT_STANDING = 1; - public static final int WT_START_FAKEDEATH = 2; - public static final int WT_STOP_FAKEDEATH = 3; - public ChangeWaitType(Creature creature, int newMoveType) { _objectId = creature.getObjectId(); @@ -46,7 +46,6 @@ public class ChangeWaitType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_WAIT_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_moveType); packet.writeD(_x); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index 41180bac50..aa2e7b2eaa 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -30,7 +30,6 @@ public class CharCreateFail implements IClientOutgoingPacket public static final int REASON_CREATE_NOT_ALLOWED = 0x05; // "Characters cannot be created from this server." public static final int REASON_CHOOSE_ANOTHER_SVR = 0x06; // "Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please // choose another server." - private final int _error; public CharCreateFail(int errorCode) @@ -42,7 +41,6 @@ public class CharCreateFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index f0e99885ad..768617e558 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -31,8 +31,7 @@ public class CharCreateOk implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_SUCCESS.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index bed289ca0a..1674eef343 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -33,7 +33,6 @@ public class CharDeleteFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_DELETE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index c4b6d6ff28..762e2d3462 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -35,6 +35,22 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { + private static final int[] PAPERDOLL_ORDER = new int[] + { + Inventory.PAPERDOLL_UNDER, + Inventory.PAPERDOLL_HEAD, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_LHAND, + Inventory.PAPERDOLL_GLOVES, + Inventory.PAPERDOLL_CHEST, + Inventory.PAPERDOLL_LEGS, + Inventory.PAPERDOLL_FEET, + Inventory.PAPERDOLL_CLOAK, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_HAIR, + Inventory.PAPERDOLL_HAIR2 + }; + private final Player _player; private final Clan _clan; private int _objId; @@ -57,22 +73,6 @@ public class CharInfo implements IClientOutgoingPacket private int _vehicleId = 0; private final boolean _gmSeeInvis; - private static final int[] PAPERDOLL_ORDER = new int[] - { - Inventory.PAPERDOLL_UNDER, - Inventory.PAPERDOLL_HEAD, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_LHAND, - Inventory.PAPERDOLL_GLOVES, - Inventory.PAPERDOLL_CHEST, - Inventory.PAPERDOLL_LEGS, - Inventory.PAPERDOLL_FEET, - Inventory.PAPERDOLL_CLOAK, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_HAIR, - Inventory.PAPERDOLL_HAIR2 - }; - public CharInfo(Player player, boolean gmSeeInvis) { _player = player; @@ -121,17 +121,15 @@ public class CharInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); // Confirmed packet.writeD(_y); // Confirmed packet.writeD(_z); // Confirmed packet.writeD(_vehicleId); // Confirmed packet.writeD(_objId); // Confirmed packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed - packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) @@ -155,10 +153,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.getPvpFlag()); packet.writeD(_player.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -169,53 +165,40 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); - packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeS(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle()); - packet.writeD(_player.getAppearance().getVisibleClanId()); packet.writeD(_player.getAppearance().getVisibleClanCrestId()); packet.writeD(_player.getAppearance().getVisibleAllyId()); packet.writeD(_player.getAppearance().getVisibleAllyCrestId()); - - packet.writeC(_player.isSitting() ? 0x00 : 0x01); // Confirmed - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // Confirmed - packet.writeC(_player.isInCombat() ? 0x01 : 0x00); // Confirmed - - packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 0x01 : 0x00); // Confirmed - - packet.writeC(_player.isInvisible() ? 0x01 : 0x00); - + packet.writeC(_player.isSitting() ? 0 : 1); // Confirmed + packet.writeC(_player.isRunning() ? 1 : 0); // Confirmed + packet.writeC(_player.isInCombat() ? 1 : 0); // Confirmed + packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 1 : 0); // Confirmed + packet.writeC(_player.isInvisible() ? 1 : 0); packet.writeC(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount packet.writeC(_player.getPrivateStoreType().getId()); // Confirmed packet.writeH(_player.getCubics().size()); // Confirmed _player.getCubics().keySet().forEach(packet::writeH); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); // Confirmed packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); packet.writeH(_player.getRecomHave()); // Confirmed packet.writeD(_player.getMountNpcId() == 0 ? 0 : _player.getMountNpcId() + 1000000); - packet.writeD(_player.getClassId().getId()); // Confirmed - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeC(_player.isMounted() ? 0 : _enchantLevel); // Confirmed - packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeD(_player.getClanCrestLargeId()); packet.writeC(_player.getNobleLevel()); // Confirmed packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 2 : 0); // 152 - Value for enabled changed to 2? packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed - final ILocational baitLocation = _player.getFishing().getBaitLocation(); if (baitLocation != null) { @@ -231,29 +214,21 @@ public class CharInfo implements IClientOutgoingPacket } packet.writeD(_player.getAppearance().getNameColor()); // Confirmed - packet.writeD(_heading); // Confirmed - packet.writeC(_player.getPledgeClass()); packet.writeH(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); // Confirmed - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - - packet.writeC(0x00); // nPvPRestrainStatus - + packet.writeC(0); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentHp())); // Confirmed packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - - packet.writeC(0x00); // cBRLectureMark + packet.writeC(0); // cBRLectureMark final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed @@ -265,11 +240,11 @@ public class CharInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(_player.isTrueHero() ? 100 : 0); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); // Hair accessory - packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points - packet.writeD(0x00); // nCursedWeaponClassId + packet.writeC(_player.isTrueHero() ? 100 : 0); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); // Hair accessory + packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points + packet.writeD(0); // nCursedWeaponClassId // AFK animation. if ((_player.getClan() != null) && (CastleManager.getInstance().getCastleByOwner(_player.getClan()) != null)) @@ -278,17 +253,15 @@ public class CharInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); + packet.writeD(0); } // Rank. packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : RankManager.getInstance().getPlayerClassRank(_player) == 1 ? 4 : 0); - - packet.writeH(0x00); - packet.writeC(0x00); + packet.writeH(0); + packet.writeC(0); packet.writeD(_player.getClassId().getId()); - packet.writeC(0x00); - + packet.writeC(0); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 7187b73184..11f5f4df52 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -40,17 +40,16 @@ public class CharSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTED.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getTitle()); packet.writeD(_sessionId); packet.writeD(_player.getClanId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x01); // active ?? + packet.writeD(1); // active ?? packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -62,25 +61,20 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_player.getReputation()); packet.writeD(_player.getPkKills()); packet.writeD(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_player.getClassId().getId()); - packet.writeB(new byte[16]); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeB(new byte[28]); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index e872eb0ef0..e42c6a87ac 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -45,10 +45,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { private static final Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); - private final String _loginName; - private final int _sessionId; - private int _activeId; - private final List _characterPackages; private static final int[] PAPERDOLL_ORDER = new int[] { @@ -113,7 +109,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_ARTIFACT20, // 152 Inventory.PAPERDOLL_ARTIFACT21 // 152 }; - private static final int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, @@ -127,6 +122,11 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_HAIR2, }; + private final String _loginName; + private final int _sessionId; + private int _activeId; + private final List _characterPackages; + /** * Constructor for CharSelectionInfo. * @param loginName @@ -157,16 +157,13 @@ public class CharSelectionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.size(); packet.writeD(size); // Created character count - packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) - packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 0x01 : 0x00); // if 1 can't create new char - packet.writeC(0x01); // 0=can't play, 1=can play free until level 85, 2=100% free play - packet.writeD(0x02); // if 1, Korean client - packet.writeC(0x00); // Gift message for inactive accounts // 152 - + packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 1 : 0); // if 1 can't create new char + packet.writeC(1); // 0=can't play, 1=can play free until level 85, 2=100% free play + packet.writeD(2); // if 1, Korean client + packet.writeC(0); // Gift message for inactive accounts // 152 // Balthus Knights if (Config.BALTHUS_KNIGHTS_ENABLED) { @@ -175,23 +172,22 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (Config.PREMIUM_SYSTEM_ENABLED) { PremiumManager.getInstance().loadPremiumData(_loginName); - packet.writeC(PremiumManager.getInstance().getPremiumExpiration(_loginName) > 0 ? 0x01 : 0x00); + packet.writeC(PremiumManager.getInstance().getPremiumExpiration(_loginName) > 0 ? 1 : 0); } else { - packet.writeC(0x00); + packet.writeC(0); } } else { - packet.writeC(0x01); + packet.writeC(1); } } else { - packet.writeC(0x00); + packet.writeC(0); } - long lastAccess = 0; if (_activeId == -1) { @@ -204,7 +200,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - for (int i = 0; i < size; i++) { final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); @@ -212,91 +207,73 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name packet.writeD(_sessionId); // Account ID - packet.writeD(0x00); // Clan ID - packet.writeD(0x00); // Builder level - + packet.writeD(0); // Clan ID + packet.writeD(0); // Builder level packet.writeD(charInfoPackage.getSex()); // Sex packet.writeD(charInfoPackage.getRace()); // Race packet.writeD(charInfoPackage.getBaseClassId()); - packet.writeD(Config.SERVER_ID); - packet.writeD(charInfoPackage.getX()); packet.writeD(charInfoPackage.getY()); packet.writeD(charInfoPackage.getZ()); packet.writeF(charInfoPackage.getCurrentHp()); packet.writeF(charInfoPackage.getCurrentMp()); - packet.writeQ(charInfoPackage.getSp()); packet.writeQ(charInfoPackage.getExp()); packet.writeF((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel()))); packet.writeD(charInfoPackage.getLevel()); - packet.writeD(charInfoPackage.getReputation()); packet.writeD(charInfoPackage.getPkKills()); packet.writeD(charInfoPackage.getPvPKills()); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); // Ertheia - packet.writeD(0x00); // Ertheia - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); // Ertheia + packet.writeD(0); // Ertheia for (int slot : getPaperdollOrder()) { packet.writeD(charInfoPackage.getPaperdollItemId(slot)); } - for (int slot : getPaperdollOrderVisualId()) { packet.writeD(charInfoPackage.getPaperdollItemVisualId(slot)); } - packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_CHEST)); // Upper Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_LEGS)); // Lower Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_HEAD)); // Headgear enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_GLOVES)); // Gloves enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_FEET)); // Boots enchant level - packet.writeD(charInfoPackage.getHairStyle()); packet.writeD(charInfoPackage.getHairColor()); packet.writeD(charInfoPackage.getFace()); - packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); - packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption1Id() : 0); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption2Id() : 0); - // packet.writeD(charInfoPackage.getTransformId()); // Used to display Transformations - packet.writeD(0x00); // Currently on retail when you are on character select you don't see your transformation. - - packet.writeD(0x00); // Pet NpcId - packet.writeD(0x00); // Pet level - packet.writeD(0x00); // Pet Food - packet.writeD(0x00); // Pet Food Level - packet.writeF(0x00); // Current pet HP - packet.writeF(0x00); // Current pet MP - + packet.writeD(0); // Currently on retail when you are on character select you don't see your transformation. + packet.writeD(0); // Pet NpcId + packet.writeD(0); // Pet level + packet.writeD(0); // Pet Food + packet.writeD(0); // Pet Food Level + packet.writeF(0); // Current pet HP + packet.writeF(0); // Current pet MP packet.writeD(charInfoPackage.getVitalityPoints()); // Vitality packet.writeD((int) Config.RATE_VITALITY_EXP_MULTIPLIER * 100); // Vitality Percent packet.writeD(charInfoPackage.getVitalityItemsUsed()); // Remaining vitality item uses - packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0x00 : 0x01); // Char is active or not - packet.writeC(charInfoPackage.isNoble() ? 0x01 : 0x00); - packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 0x02 : 0x00); // Hero glow - packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 0x01 : 0x00); // Show hair accessory if enabled - - packet.writeD(0x00); // 235 - ban time left + packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0 : 1); // Char is active or not + packet.writeC(charInfoPackage.isNoble() ? 1 : 0); + packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 2 : 0); // Hero glow + packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 1 : 0); // Show hair accessory if enabled + packet.writeD(0); // 235 - ban time left packet.writeD((int) (charInfoPackage.getLastAccess() / 1000)); // 235 - last play time } return true; @@ -306,7 +283,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); - try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate")) { @@ -319,7 +295,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (charInfopackage != null) { characterList.add(charInfopackage); - final Player player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { @@ -333,7 +308,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return characterList; } @@ -375,7 +349,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { clan.removeClanMember(objectId, 0); } - GameClient.deleteCharByObjId(objectId); return null; } @@ -394,20 +367,16 @@ public class CharSelectionInfo implements IClientOutgoingPacket charInfopackage.setHairStyle(chardata.getInt("hairstyle")); charInfopackage.setHairColor(chardata.getInt("haircolor")); charInfopackage.setSex(chardata.getInt("sex")); - charInfopackage.setExp(chardata.getLong("exp")); charInfopackage.setSp(chardata.getLong("sp")); charInfopackage.setVitalityPoints(chardata.getInt("vitality_points")); charInfopackage.setClanId(chardata.getInt("clanid")); - charInfopackage.setRace(chardata.getInt("race")); - final int baseClassId = chardata.getInt("base_class"); final int activeClassId = chardata.getInt("classid"); charInfopackage.setX(chardata.getInt("x")); charInfopackage.setY(chardata.getInt("y")); charInfopackage.setZ(chardata.getInt("z")); - final int faction = chardata.getInt("faction"); if (faction == 1) { @@ -417,7 +386,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setEvil(); } - if (Config.MULTILANG_ENABLE) { String lang = chardata.getString("language"); @@ -427,22 +395,18 @@ public class CharSelectionInfo implements IClientOutgoingPacket } charInfopackage.setHtmlPrefix("data/lang/" + lang + "/"); } - // if is in subclass, load subclass exp, sp, level info if (baseClassId != activeClassId) { loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId); } - charInfopackage.setClassId(activeClassId); - // Get the augmentation id for equipped weapon int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); if (weaponObjId < 1) { weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); } - if (weaponObjId > 0) { try (Connection con = DatabaseFactory.getConnection(); @@ -468,7 +432,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } - // Check if the base class is set to zero and also doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly. if ((baseClassId == 0) && (activeClassId > 0)) { @@ -478,7 +441,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setBaseClassId(baseClassId); } - charInfopackage.setDeleteTimer(deletetime); charInfopackage.setLastAccess(chardata.getLong("lastAccess")); charInfopackage.setNoble(chardata.getInt("nobless") == 1); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java index 847e24db87..d59df7911a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java @@ -32,7 +32,6 @@ public class ChooseInventoryItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHOOSE_INVENTORY_ITEM.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java index 12a3940521..ac66c2fa0f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java @@ -32,7 +32,6 @@ public class ClientSetTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CLIENT_SET_TIME.writeId(packet); - packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // time in client minutes packet.writeD(6); // constant to match the server time( this determines the speed of the client clock) return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java index 195824578b..5fdb62f544 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java @@ -68,7 +68,6 @@ public class ConfirmDlg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CONFIRM_DLG.writeId(packet); - final SMParam[] params = _systemMessage.getParams(); packet.writeD(_systemMessage.getId()); packet.writeD(params.length); @@ -130,7 +129,6 @@ public class ConfirmDlg implements IClientOutgoingPacket } } } - packet.writeD(_time); packet.writeD(_requesterId); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index e11807bdba..63acd728ea 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -73,7 +73,6 @@ public class CreatureSay implements IClientOutgoingPacket _mask |= 0x08; } } - // Does not shows level if (sender.isGM()) { @@ -125,7 +124,6 @@ public class CreatureSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_sender == null ? 0 : _sender.getObjectId()); packet.writeD(_chatType.getClientId()); if (_senderName != null) @@ -156,7 +154,6 @@ public class CreatureSay implements IClientOutgoingPacket packet.writeS(s); } } - // Rank if ((_sender != null) && _sender.isPlayer()) { @@ -165,7 +162,6 @@ public class CreatureSay implements IClientOutgoingPacket { packet.writeC(0); // unknown clan byte } - final int rank = RankManager.getInstance().getPlayerGlobalRank(_sender.getActingPlayer()); if ((rank == 0) || (rank > 100)) { @@ -183,7 +179,6 @@ public class CreatureSay implements IClientOutgoingPacket { packet.writeC(3); } - if (clan != null) { packet.writeC(clan.getCastleId()); @@ -197,7 +192,6 @@ public class CreatureSay implements IClientOutgoingPacket { packet.writeC(0); } - return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index dfc40d995f..a307b06e4b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -38,9 +38,8 @@ public class DeleteObject implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DELETE_OBJECT.writeId(packet); - packet.writeD(_objectId); - packet.writeC(0x00); // c2 + packet.writeC(0); // c2 return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java index 982c8f3311..3b5917e55b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java @@ -50,7 +50,6 @@ public class Dice implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DICE.writeId(packet); - packet.writeD(_objectId); // object id of player packet.writeD(_itemId); // item id of dice (spade) 4625,4626,4627,4628 packet.writeD(_number); // number rolled diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 52daec99cc..609b485b51 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -57,7 +57,6 @@ public class Die implements IClientOutgoingPacket siegeClan = fort.getSiege().getAttackerClan(clan); isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan); } - // ClanHall check. if ((clan != null) && (clan.getHideoutId() > 0)) { @@ -92,12 +91,12 @@ public class Die implements IClientOutgoingPacket OutgoingPackets.DIE.writeId(packet); packet.writeD(_objectId); packet.writeQ(_flags); - packet.writeD(_isSweepable ? 0x01 : 0x00); - packet.writeD(0x00); // Feather item time. - packet.writeC(0x00); // Hide die animation. - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(_isSweepable ? 1 : 0); + packet.writeD(0); // Feather item time. + packet.writeC(0); // Hide die animation. + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java index 15404f9dee..5837faec19 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java @@ -33,7 +33,6 @@ public class DoorInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_INFO.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.getId()); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java index 54f8742a73..14d41afee7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java @@ -33,7 +33,6 @@ public class DoorStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_STATUS_UPDATE.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.isOpen() ? 0 : 1); packet.writeD(_door.getDamage()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index b12458e719..3035890956 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -40,20 +40,17 @@ public class DropItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DROP_ITEM.writeId(packet); - packet.writeD(_objectId); packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeC(_item.isStackable() ? 0x01 : 0x00); + packet.writeC(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - - packet.writeC(0x00); - // packet.writeD(0x01); if above C == true (1) then packet.readD() + packet.writeC(0); + // packet.writeD(1); if above C == true (1) then packet.readD() packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java index 631c43ba0c..99bd80d97e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java @@ -62,13 +62,12 @@ public class Earthquake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EARTHQUAKE.writeId(packet); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_intensity); packet.writeD(_duration); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 6063a54535..1a8b8ddfbb 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -59,25 +59,20 @@ public class EnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_crystal); packet.writeQ(_count); - // Guessing. // With 166 options became 3x write integers instead of shorts and enchant level moved bellow. - // Commenting until actually knowing. // for (int option : _enchantOptions) // { // packet.writeD(option); // } - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_enchantLevel); // Confirmed. - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java index a12f0286f3..22648f887e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java @@ -41,7 +41,6 @@ public class EtcStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ETC_STATUS_UPDATE.writeId(packet); - packet.writeC(_player.getCharges()); // 1-7 increase force, level packet.writeD(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%) packet.writeC(0); // Weapon Grade Penalty [1-4] diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java index 5dca90f960..9f8d576148 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java @@ -24,13 +24,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class Ex2ndPasswordAck implements IClientOutgoingPacket { + // TODO: Enum + public static final int SUCCESS = 0; + public static final int WRONG_PATTERN = 1; + private final int _status; private final int _response; - // TODO: Enum - public static final int SUCCESS = 0x00; - public static final int WRONG_PATTERN = 0x01; - public Ex2ndPasswordAck(int status, int response) { _status = status; @@ -41,10 +41,9 @@ public class Ex2ndPasswordAck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_ACK.writeId(packet); - packet.writeC(_status); - packet.writeD(_response == WRONG_PATTERN ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(_response == WRONG_PATTERN ? 1 : 0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java index 48bde5161d..c86b5185d0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordCheck implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_NEW = 0x00; - public static final int PASSWORD_PROMPT = 0x01; - public static final int PASSWORD_OK = 0x02; + public static final int PASSWORD_NEW = 0; + public static final int PASSWORD_PROMPT = 1; + public static final int PASSWORD_OK = 2; private final int _windowType; @@ -40,9 +40,8 @@ public class Ex2ndPasswordCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_CHECK.writeId(packet); - packet.writeD(_windowType); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java index 1abf50ab01..f6731bf18f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordVerify implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_OK = 0x00; - public static final int PASSWORD_WRONG = 0x01; - public static final int PASSWORD_BAN = 0x02; + public static final int PASSWORD_OK = 0; + public static final int PASSWORD_WRONG = 1; + public static final int PASSWORD_BAN = 2; private final int _wrongTentatives; private final int _mode; @@ -42,7 +42,6 @@ public class Ex2ndPasswordVerify implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_VERIFY.writeId(packet); - packet.writeD(_mode); packet.writeD(_wrongTentatives); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java index 8f3d5ec764..528988ab5f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java @@ -45,10 +45,8 @@ public class ExAbnormalStatusUpdateFromTarget implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ABNORMAL_STATUS_UPDATE_FROM_TARGET.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeH(_effects.size()); - for (BuffInfo info : _effects) { packet.writeD(info.getSkill().getDisplayId()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java index c4b9cd8356..f3abd6ec5c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java @@ -41,7 +41,6 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRABLE_SKILL_LIST_BY_CLASS.writeId(packet); - packet.writeH(_type.getId()); packet.writeH(_learnable.size()); for (SkillLearn skill : _learnable) @@ -54,7 +53,7 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket packet.writeC(skill.getRequiredItems().size()); if (_type == AcquireSkillType.SUBPLEDGE) { - packet.writeH(0x00); + packet.writeH(0); } } return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java index fd0e2fc97c..8555bb6e86 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java @@ -61,7 +61,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_SKILL_INFO.writeId(packet); - packet.writeD(_id); packet.writeD(_level); packet.writeQ(_spCost); @@ -73,7 +72,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket packet.writeD(holder.getId()); packet.writeQ(holder.getCount()); } - packet.writeD(_skillRem.size()); for (Skill skill : _skillRem) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java index 29793f4d6c..ff8c526ec4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java @@ -36,7 +36,6 @@ public class ExAdenaInvenCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ADENA_INVEN_COUNT.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeH(_player.getInventory().getSize()); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java index 2aa2d85bc5..5ef11e0f1e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java @@ -50,13 +50,11 @@ public class ExAirShipInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_INFO.writeId(packet); - packet.writeD(_ship.getObjectId()); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(_captain); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); @@ -73,14 +71,13 @@ public class ExAirShipInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - packet.writeD(_ship.getFuel()); packet.writeD(_ship.getMaxFuel()); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java index 4cfc76bfba..8b37f4fc0a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java @@ -42,7 +42,6 @@ public class ExAirShipStopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_airShipId); packet.writeD(_playerId); packet.writeD(_x); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java index 33c57712da..52958f931b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java @@ -37,12 +37,10 @@ public class ExAirShipTeleportList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_TELEPORT_LIST.writeId(packet); - packet.writeD(_dockId); if (_teleports != null) { packet.writeD(_teleports.length); - for (int i = 0; i < _teleports.length; i++) { packet.writeD(i - 1); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java index 392b228f0d..7918022c72 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java @@ -50,13 +50,12 @@ public class ExAlchemySkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_SKILL_LIST.writeId(packet); - packet.writeD(_skills.size()); for (Skill skill : _skills) { packet.writeD(skill.getId()); packet.writeD(skill.getLevel()); - packet.writeQ(0x00); // Always 0 on Naia, SP i guess? + packet.writeQ(0); // Always 0 on Naia, SP i guess? packet.writeC(skill.getId() == CommonSkill.ALCHEMY_CUBE.getId() ? 0 : 1); // This is type in flash, visible or not } return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java index 3bfadd2650..ed7f8d4255 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java @@ -47,12 +47,10 @@ public class ExAlterSkillRequest implements IClientOutgoingPacket { return true; } - OutgoingPackets.EX_ALTER_SKILL_REQUEST.writeId(packet); packet.writeD(_nextSkillId); packet.writeD(_currentSkillId); packet.writeD(_alterTime); - if (_alterTime > 0) { _player.setAlterSkillActive(true); @@ -62,7 +60,6 @@ public class ExAlterSkillRequest implements IClientOutgoingPacket _player.setAlterSkillActive(false); }, _alterTime * 1000); } - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java index 3d7ee12a81..1990e1e701 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java @@ -37,7 +37,6 @@ public class ExAskCoupleAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_COUPLE_ACTION.writeId(packet); - packet.writeD(_actionId); packet.writeD(_objectId); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java index 61cabedd98..45615daf5a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java @@ -39,9 +39,8 @@ public class ExAskJoinMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_MPCC.writeId(packet); - packet.writeS(_requestorName); // name of CCLeader - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java index 17fa9d028f..908022ff7e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java @@ -38,7 +38,6 @@ public class ExAskJoinPartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_PARTY_ROOM.writeId(packet); - packet.writeS(_charName); packet.writeS(_roomName); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java index 2a6b958dc9..1551840013 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java @@ -38,7 +38,6 @@ public class ExAskModifyPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_MODIFY_PARTY_LOOTING.writeId(packet); - packet.writeS(_requestor); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java index 958e7c3d06..fa62c8a207 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java @@ -45,7 +45,6 @@ public class ExAttributeEnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ATTRIBUTE_ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeC(_isWeapon); packet.writeH(_type); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java index 1a3a1ef3fe..3d65055b3c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java @@ -41,9 +41,8 @@ public class ExAutoSoulShot implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AUTO_SOUL_SHOT.writeId(packet); - packet.writeD(_itemId); - packet.writeD(_enable ? 0x01 : 0x00); + packet.writeD(_enable ? 1 : 0); packet.writeD(_type); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java index 8680c6bd7a..a8137347ec 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java @@ -37,8 +37,7 @@ public class ExBaseAttributeCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASE_ATTRIBUTE_CANCEL_RESULT.writeId(packet); - - packet.writeD(0x01); // result + packet.writeD(1); // result packet.writeD(_objId); packet.writeD(_attribute); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java index 755fbc66c8..a454d136c6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java @@ -75,7 +75,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 1149, 1150, 1151, 1152, 1153, 1154, 1155 }; - public static final int[] DEFAULT_ACTION_LIST = { 0, 1, 2, 3, @@ -147,7 +146,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 5012, 5013, 5014, 5015 }; //@formatter:on - public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST); private final int[] _actionIds; @@ -161,7 +159,6 @@ public class ExBasicActionList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASIC_ACTION_LIST.writeId(packet); - packet.writeD(_actionIds.length); for (int _actionId : _actionIds) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java index 4c4fac8c91..d32dca4d21 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java @@ -34,13 +34,14 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBeautyItemList implements IClientOutgoingPacket { - private int _colorCount; - private final BeautyData _beautyData; - private final Map> _colorData = new HashMap<>(); private static final int HAIR_TYPE = 0; private static final int FACE_TYPE = 1; private static final int COLOR_TYPE = 2; + private int _colorCount; + private final BeautyData _beautyData; + private final Map> _colorData = new HashMap<>(); + public ExBeautyItemList(Player player) { _beautyData = BeautyShopData.getInstance().getBeautyData(player.getRace(), player.getAppearance().getSexType()); @@ -60,7 +61,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BEAUTY_ITEM_LIST.writeId(packet); - packet.writeD(HAIR_TYPE); packet.writeD(_beautyData.getHairList().size()); for (BeautyItem hair : _beautyData.getHairList().values()) @@ -72,7 +72,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(hair.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(FACE_TYPE); packet.writeD(_beautyData.getFaceList().size()); for (BeautyItem face : _beautyData.getFaceList().values()) @@ -84,7 +83,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(face.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(COLOR_TYPE); packet.writeD(_colorCount); for (Entry> entry : _colorData.entrySet()) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java index 1825236886..6d4c45cb2b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java @@ -34,7 +34,6 @@ public class ExBirthdayPopup implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_BIRTH_DAY.writeId(packet); - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java index 7d2f17e697..43e525f05f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java @@ -26,6 +26,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBrBroadcastEventState implements IClientOutgoingPacket { + public static final int APRIL_FOOLS = 20090401; + public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) + public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) + public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) + public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) + private final int _eventId; private final int _eventState; private int _param0; @@ -36,12 +42,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket private String _param5; private String _param6; - public static final int APRIL_FOOLS = 20090401; - public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) - public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) - public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) - public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) - public ExBrBroadcastEventState(int eventId, int eventState) { _eventId = eventId; @@ -65,7 +65,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BROADCAST_EVENT_STATE.writeId(packet); - packet.writeD(_eventId); packet.writeD(_eventState); packet.writeD(_param0); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java index 1fd7ec663a..c0683c8797 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java @@ -44,7 +44,6 @@ public class ExBrBuffEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUFF_EVENT_STATE.writeId(packet); - packet.writeD(_type); packet.writeD(_value); packet.writeD(_state); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java index 943aae8a62..8e009d7b09 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java @@ -43,7 +43,6 @@ public class ExBrLoadEventTopRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_LOAD_EVENT_TOP_RANKERS.writeId(packet); - packet.writeD(_eventId); packet.writeD(_day); packet.writeD(_count); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java index 6a98c01654..9105e39efe 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java @@ -36,9 +36,8 @@ public class ExBrPremiumState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PREMIUM_STATE.writeId(packet); - packet.writeD(_player.getObjectId()); - packet.writeC(_player.hasPremiumStatus() ? 0x01 : 0x00); + packet.writeC(_player.hasPremiumStatus() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 381dd859ad..567cfc70f9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -59,10 +59,8 @@ public class ExBuySellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x01); // Type SELL + packet.writeD(1); // Type SELL packet.writeD(_inventorySlots); - if ((_sellList != null)) { packet.writeH(_sellList.size()); @@ -74,9 +72,8 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - if ((_refundList != null) && !_refundList.isEmpty()) { packet.writeH(_refundList.size()); @@ -90,10 +87,9 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - - packet.writeC(_done ? 0x01 : 0x00); + packet.writeC(_done ? 1 : 0); return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java index 2b43c0ce4b..e0ec81e0e7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java @@ -39,7 +39,6 @@ public class ExCastleState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CASTLE_STATE.writeId(packet); - packet.writeD(_castleId); packet.writeD(_castleSide.ordinal()); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java index b7f90d261b..a8196c7a83 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java @@ -52,7 +52,6 @@ public class ExChangeClientEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_CLIENT_EFFECT_INFO.writeId(packet); - packet.writeD(_type); packet.writeD(_key); packet.writeD(_value); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java index 472abc88df..eea59162ee 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java @@ -37,7 +37,6 @@ public class ExChangeNpcState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NPC_STATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java index 8cdcb4460d..45f2805517 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java @@ -49,7 +49,6 @@ public class ExChangePostState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_POST_STATE.writeId(packet); - packet.writeD(_receivedBoard ? 1 : 0); packet.writeD(_changedMsgIds.length); for (int postId : _changedMsgIds) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java index fc58ec9a2e..d765ab54e0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java @@ -35,7 +35,6 @@ public class ExChangeToAwakenedClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_TO_AWAKENED_CLASS.writeId(packet); - packet.writeD(_classId); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index 0fc5fb1c75..fec31d4775 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -47,7 +47,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket throw new IllegalArgumentException("Undefined Atribute item: " + stone); } _level = ElementalAttributeData.getInstance().getMaxElementLevel(_itemId); - // Register only items that can be put an attribute stone/crystal for (Item item : player.getInventory().getItems()) { @@ -62,7 +61,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_INVENTORY_ATTRIBUTE_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeQ(_count); packet.writeD(_atribute == AttributeType.FIRE ? 1 : 0); // Fire diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java index a272d85469..238882cd11 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java @@ -35,7 +35,6 @@ public class ExCloseMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java index d2ecd70952..877bca760a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java @@ -34,7 +34,6 @@ public class ExClosePartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_PARTY_ROOM.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java index 27c112776b..1d02c972b5 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java @@ -54,7 +54,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLOSSEUM_FENCE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_clientState); packet.writeD(_x); @@ -62,7 +61,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_width); packet.writeD(_length); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java index 766d3619ad..b72bef93e8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java @@ -37,9 +37,8 @@ public class ExConfirmAddingContact implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AGIT_AUCTION_CMD.writeId(packet); - packet.writeS(_charName); - packet.writeD(_added ? 0x01 : 0x00); + packet.writeD(_added ? 1 : 0); return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java index beded32254..c832d507ed 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameAddPlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x01); - + packet.writeD(1); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java index 5f36f730d0..847ea93e6a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java @@ -45,9 +45,7 @@ public class ExCubeGameChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java index 66abbf4b75..a2f2e61ded 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java @@ -43,12 +43,10 @@ public class ExCubeGameChangeTeam implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x05); - + packet.writeD(5); packet.writeD(_player.getObjectId()); - packet.writeD(_fromRedTeam ? 0x01 : 0x00); - packet.writeD(_fromRedTeam ? 0x00 : 0x01); + packet.writeD(_fromRedTeam ? 1 : 0); + packet.writeD(_fromRedTeam ? 0 : 1); return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java index 5273b2099a..136b439283 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java @@ -39,9 +39,7 @@ public class ExCubeGameChangeTimeToStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x03); - + packet.writeD(3); packet.writeD(_seconds); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java index f81a302941..9bdba49029 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java @@ -35,7 +35,6 @@ public class ExCubeGameCloseUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0xffffffff); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java index 259a0e9407..3177e7a488 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java @@ -40,11 +40,9 @@ public class ExCubeGameEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x01); - - packet.writeD(_isRedTeamWin ? 0x01 : 0x00); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(1); + packet.writeD(_isRedTeamWin ? 1 : 0); + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java index 4d89e621ce..8b96bb545f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java @@ -55,14 +55,11 @@ public class ExCubeGameExtendedChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeD(_playerPoints); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java index e5a00f1ab7..c084789f13 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameRemovePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java index 00be884d2f..35a3f289d1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java @@ -35,8 +35,7 @@ public class ExCubeGameRequestReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x04); + packet.writeD(4); return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java index 1bc89e0c32..8b755dd3cc 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java @@ -30,7 +30,6 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket // Players Lists private final List _bluePlayers; private final List _redPlayers; - // Common Values private final int _roomNumber; @@ -51,12 +50,9 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_roomNumber); packet.writeD(0xffffffff); - packet.writeD(_bluePlayers.size()); for (Player player : _bluePlayers) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java index 2f2c092c08..d000112787 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java @@ -31,7 +31,6 @@ public class ExCursedWeaponList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet); - final Set ids = CursedWeaponsManager.getInstance().getCursedWeaponsIds(); packet.writeD(ids.size()); ids.forEach(packet::writeD); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java index 2f60a1b80c..5bc7ff3238 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java @@ -39,7 +39,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet); - if (!_cursedWeaponInfo.isEmpty()) { packet.writeD(_cursedWeaponInfo.size()); @@ -47,7 +46,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { packet.writeD(w.id); packet.writeD(w.activated); - packet.writeD(w.pos.getX()); packet.writeD(w.pos.getY()); packet.writeD(w.pos.getZ()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java index a0ba15da9f..8bee464fb0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java @@ -41,7 +41,6 @@ public class ExDieInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIE_INFO.writeId(packet); - packet.writeH(_droppedItems.size()); for (Item item : _droppedItems) { @@ -49,17 +48,15 @@ public class ExDieInfo implements IClientOutgoingPacket packet.writeD(item.getEnchantLevel()); packet.writeD((int) item.getCount()); } - packet.writeD(_lastDamageTaken.size()); for (DamageTakenHolder damageHolder : _lastDamageTaken) { packet.writeS(damageHolder.getCreature().getName()); - packet.writeH(0x00); + packet.writeH(0); packet.writeD(damageHolder.getSkillId()); packet.writeF(damageHolder.getDamage()); - packet.writeD(0x00); + packet.writeD(0); } - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java index f475a02b28..0456fb9dae 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java @@ -34,7 +34,6 @@ public class ExDissmissMPCCRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DISSMISS_MPCC_ROOM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java index 258010f717..c731b7c7a9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java @@ -37,7 +37,6 @@ public class ExDuelAskStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_ASK_START.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDuel); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java index 043c82c0db..e9a31bee57 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java @@ -38,7 +38,6 @@ public class ExDuelEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_END.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java index 264409b3d6..e1fa1cea88 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java @@ -38,7 +38,6 @@ public class ExDuelReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_READY.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java index 488aafcb7d..ecdd528a16 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java @@ -38,7 +38,6 @@ public class ExDuelStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_START.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java index 7df040c5e7..5ed0c09675 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java @@ -36,7 +36,6 @@ public class ExDuelUpdateUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_UPDATE_USER_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeD(_player.getClassId().getId()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 7ab055a3d8..f58c0573a8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExEnchantSkillInfo implements IClientOutgoingPacket { private final Set _routes; - private final int _skillId; private final int _skillLevel; private final int _skillSubLevel; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 41368a8efb..e4ee350e64 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -50,7 +50,6 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_INFO_DETAIL.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java index 5cedcd6284..1d32f0d725 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java @@ -43,7 +43,6 @@ public class ExEnchantSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_LIST.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skills.size()); for (Skill skill : _skills) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java index 6ab5e869f2..853d74039f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java @@ -38,7 +38,6 @@ public class ExEnchantSkillResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_RESULT.writeId(packet); - packet.writeD(_enchanted ? 1 : 0); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java index 7b7d2d008d..410bf16510 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java @@ -42,7 +42,6 @@ public class ExEventMatchMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_EVENT_MATCH_MESSAGE.writeId(packet); - packet.writeC(_type); packet.writeS(_message); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java index 7264e90233..1946758bf5 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java @@ -37,11 +37,9 @@ public class ExGetBookMarkInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOOK_MARK_INFO.writeId(packet); - - packet.writeD(0x00); // Dummy + packet.writeD(0); // Dummy packet.writeD(_player.getBookMarkSlot()); packet.writeD(_player.getTeleportBookmarks().size()); - for (TeleportBookmark tpbm : _player.getTeleportBookmarks()) { packet.writeD(tpbm.getId()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java index 36e7bb81af..201e8eb49b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java @@ -42,15 +42,14 @@ public class ExGetBossRecord implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOSS_RECORD.writeId(packet); - packet.writeD(_ranking); packet.writeD(_totalPoints); if (_bossRecordInfo == null) { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } else { @@ -59,7 +58,7 @@ public class ExGetBossRecord implements IClientOutgoingPacket { packet.writeD(entry.getKey()); packet.writeD(entry.getValue()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? } } return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java index ea0a5f8b18..85ccad0758 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java @@ -41,7 +41,6 @@ public class ExGetOffAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_OFF_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_x); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java index f8e16a4191..9a02e49223 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java @@ -39,7 +39,6 @@ public class ExGetOnAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_ON_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java index 51197344a5..704b3212a1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExGetPremiumItemList implements IClientOutgoingPacket { private final Player _player; - private final Map _map; public ExGetPremiumItemList(Player player) @@ -43,7 +42,6 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_PREMIUM_ITEM_LIST.writeId(packet); - packet.writeD(_map.size()); for (Entry entry : _map.entrySet()) { @@ -51,7 +49,7 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket packet.writeQ(entry.getKey()); packet.writeD(item.getItemId()); packet.writeQ(item.getCount()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeS(item.getSender()); } return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index 5f4810be42..34ef181b22 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -40,19 +40,18 @@ public class ExHeroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HERO_LIST.writeId(packet); - packet.writeD(_heroList.size()); for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); packet.writeD(hero.getInt(Olympiad.CLASS_ID)); packet.writeS(hero.getString(Hero.CLAN_NAME, "")); - packet.writeD(0x00); // hero.getInt(Hero.CLAN_CREST, 0) + packet.writeD(0); // hero.getInt(Hero.CLAN_CREST, 0) packet.writeS(hero.getString(Hero.ALLY_NAME, "")); - packet.writeD(0x00); // hero.getInt(Hero.ALLY_CREST, 0) + packet.writeD(0); // hero.getInt(Hero.ALLY_CREST, 0) packet.writeD(hero.getInt(Hero.COUNT)); - packet.writeD(0x00); - packet.writeC(0x00); // 272 + packet.writeD(0); + packet.writeC(0); // 272 } return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index d5b5430142..0baca7cd86 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -48,8 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); - - packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade + packet.writeC(_hide ? 0 : 1); // Grand Crusade packet.writeD(_currentTemplateId); packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java index 81db66b88f..323c0cdf1e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java @@ -35,7 +35,6 @@ public class ExIsCharNameCreatable implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_IS_CHAR_NAME_CREATABLE.writeId(packet); - packet.writeD(_allowed); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java index 2cea176d69..4eea62de37 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java @@ -39,11 +39,11 @@ public class ExItemAnnounce implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_ANNOUNCE.writeId(packet); - packet.writeC(0x00); // item icon + packet.writeC(0); // item icon packet.writeString(_player.getName()); // name of player packet.writeD(_item.getId()); // item id packet.writeD(_item.getEnchantLevel()); // enchant level - packet.writeC(0x00); // name of item + packet.writeC(0); // name of item return true; } } \ No newline at end of file diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java index ecc751eab3..45def9e0be 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java @@ -38,7 +38,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { throw new NullPointerException(); } - if (currentAuction.getAuctionState() != ItemAuctionState.STARTED) { _timeRemaining = 0; @@ -47,7 +46,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { _timeRemaining = (int) (currentAuction.getFinishingTimeRemaining() / 1000); // in seconds } - _refresh = refresh; _currentAuction = currentAuction; _nextAuction = nextAuction; @@ -57,16 +55,12 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_AUCTION_INFO.writeId(packet); - - packet.writeC(_refresh ? 0x00 : 0x01); + packet.writeC(_refresh ? 0 : 1); packet.writeD(_currentAuction.getInstanceId()); - final ItemAuctionBid highestBid = _currentAuction.getHighestBid(); packet.writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid()); - packet.writeD(_timeRemaining); writeItem(packet, _currentAuction.getItemInfo()); - if (_nextAuction != null) { packet.writeQ(_nextAuction.getAuctionInitBid()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java index f66c77509f..e40ebdb90b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java @@ -44,7 +44,6 @@ public class ExItemAuctionStatus implements IClientOutgoingPacket _x = spawn.getX(); _y = spawn.getY(); _z = spawn.getZ(); - final ItemAuctionInstance manager = ItemAuctionManager.getInstance().getManagerInstance(AUCTION_MANAGER); if (manager != null) { @@ -64,7 +63,7 @@ public class ExItemAuctionStatus implements IClientOutgoingPacket packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); + packet.writeD(0); packet.writeH(_status); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java index 53ad8abd58..1c5e38cbab 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListMpccWaiting implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _rooms = new LinkedList<>(); @@ -53,7 +54,6 @@ public class ExListMpccWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_MPCC_WAITING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 78f2fec636..eafea24fa6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _players = new LinkedList<>(); @@ -60,7 +61,6 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(packet); - packet.writeD(_size); packet.writeD(_players.size()); for (Player player : _players) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java index 786c616875..c8723a9fc0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java @@ -46,7 +46,6 @@ public class ExMPCCPartyInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCPARTY_INFO_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_LeaderOID); packet.writeD(_memberCount); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java index 4bf07f0133..08259e4e6c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java @@ -37,7 +37,6 @@ public class ExMPCCPartymasterList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_PARTYMASTER_LIST.writeId(packet); - packet.writeD(_leadersName.size()); _leadersName.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java index abbdc8fe76..f021ef5f1f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java @@ -36,7 +36,6 @@ public class ExMPCCRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java index 154e156270..2eec590cb4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java @@ -41,7 +41,6 @@ public class ExMPCCRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java index 06e3027bfc..a0e9d0a4b0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java @@ -37,7 +37,6 @@ public class ExMPCCShowPartyMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCSHOW_PARTY_MEMBER_INFO.writeId(packet); - packet.writeD(_party.getMemberCount()); for (Player pc : _party.getMembers()) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java index e454a746f3..771b2f22cb 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java @@ -49,7 +49,6 @@ public class ExMagicAttackInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAGIC_ATTACK_INFO.writeId(packet); - packet.writeD(_caster); packet.writeD(_target); packet.writeD(_type); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java index 9cfbeb5aee..1aaa5b6520 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java @@ -35,7 +35,6 @@ public class ExMailArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAIL_ARRIVED.writeId(packet); - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java index 983ff22b92..48156c0600 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java @@ -44,7 +44,6 @@ public class ExManageMpccRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MANAGE_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java index f710c006e8..9d7d14211e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java @@ -45,7 +45,6 @@ public class ExMoveToLocationAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_objId); packet.writeD(_tx); packet.writeD(_ty); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java index 3e3bdc9fed..87e44b51cd 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java @@ -43,7 +43,6 @@ public class ExMoveToLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java index 7ab0d1c7da..3c1902892a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java @@ -40,11 +40,9 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet); - packet.writeS(_channel.getLeader().getName()); - packet.writeD(0x00); // Channel loot 0 or 1 + packet.writeD(0); // Channel loot 0 or 1 packet.writeD(_channel.getMemberCount()); - packet.writeD(_channel.getParties().size()); for (Party p : _channel.getParties()) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java index 1536bd5f9b..f2a32bb6e8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java @@ -43,7 +43,6 @@ public class ExNeedToChangeName implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEED_TO_CHANGE_NAME.writeId(packet); - packet.writeD(_type); packet.writeD(_subType); packet.writeS(_name); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java index be9bec8559..d18b4606b3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java @@ -35,7 +35,6 @@ public class ExNevitAdventEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CHANNELING_EFFECT.writeId(packet); - packet.writeD(_timeLeft); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java index 3a0367c178..09f6250f51 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java @@ -35,7 +35,6 @@ public class ExNevitAdventPointInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_AGATHION_ENERGY_INFO.writeId(packet); - packet.writeD(_points); // 72 = 1%, max 7200 = 100% return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java index 88fdaae499..ef220d86de 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java @@ -37,9 +37,8 @@ public class ExNevitAdventTimeChange implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - // state 0 - pause 1 - started - packet.writeC(_paused ? 0x00 : 0x01); + packet.writeC(_paused ? 0 : 1); // left time in ms max is 16000 its 4m and state is automatically changed to quit packet.writeD(_time); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java index fccdf510cc..4025bf78fa 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java @@ -34,7 +34,6 @@ public class ExNewSkillToLearnByLevelUp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEW_SKILL_TO_LEARN_BY_LEVEL_UP.writeId(packet); - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java index 324c18a517..f2ce8614dc 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java @@ -43,8 +43,7 @@ public class ExNoticePostArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTICE_POST_ARRIVED.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java index afe3719d9b..050c7ccea5 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java @@ -43,8 +43,7 @@ public class ExNoticePostSent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_WRITE_POST.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java index 5d98c20b09..e0bd08d39a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java @@ -30,7 +30,6 @@ public class ExNotifyPremiumItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_PREMIUM_ITEM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java index 6cb3724448..ba3c0cfeaa 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java @@ -34,7 +34,6 @@ public class ExOlympiadMatchEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MATCH_END.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java index 264d5aa484..7ffd5ed3bd 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java @@ -55,19 +55,15 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x00); // Type 0 = Match List, 1 = Match Result - + packet.writeD(0); // Type 0 = Match List, 1 = Match Result packet.writeD(_games.size()); - packet.writeD(0x00); - + packet.writeD(0); for (OlympiadGameTask curGame : _games) { final AbstractOlympiadGame game = curGame.getGame(); if (game != null) { packet.writeD(game.getStadiumId()); // Stadium Id (Arena 1 = 0) - if (game instanceof OlympiadGameNonClassed) { packet.writeD(1); @@ -80,8 +76,7 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket { packet.writeD(0); } - - packet.writeD(curGame.isRunning() ? 0x02 : 0x01); // (1 = Standby, 2 = Playing) + packet.writeD(curGame.isRunning() ? 2 : 1); // (1 = Standby, 2 = Playing) packet.writeS(game.getPlayerNames()[0]); // Player 1 Name packet.writeS(game.getPlayerNames()[1]); // Player 2 Name } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java index 712651603d..b387271fba 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java @@ -53,9 +53,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x01); // Type 0 = Match List, 1 = Match Result - + packet.writeD(1); // Type 0 = Match List, 1 = Match Result packet.writeD(_tie ? 1 : 0); // 0 - win, 1 - tie packet.writeS(_winnerList.get(0).getName()); packet.writeD(_winTeam); @@ -69,9 +67,8 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } - packet.writeD(_loseTeam); packet.writeD(_loserList.size()); for (OlympiadInfo info : _loserList) @@ -83,7 +80,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java index 34d81d1f53..712b9e06c6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java @@ -38,7 +38,6 @@ public class ExOlympiadMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MODE.writeId(packet); - packet.writeC(_mode); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java index ebea6c56f3..5b4f2c2523 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java @@ -53,7 +53,6 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_SPELLED_INFO.writeId(packet); - packet.writeD(_playerId); packet.writeD(_effects.size() + _effects2.size()); for (BuffInfo info : _effects) @@ -62,7 +61,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(info.getSkill().getDisplayId()); packet.writeH(info.getSkill().getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(info.getSkill().getAbnormalType().getClientId()); writeOptionalD(packet, info.getSkill().isAura() ? -1 : info.getTime()); } @@ -73,7 +72,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(skill.getDisplayId()); packet.writeH(skill.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(skill.getAbnormalType().getClientId()); packet.writeH(-1); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java index 18c34fe9de..ca473edfcf 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java @@ -76,7 +76,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_USER_INFO.writeId(packet); - if (_player != null) { packet.writeC(_player.getOlympiadSide()); @@ -91,7 +90,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket packet.writeS(_par.getName()); packet.writeD(_par.getBaseClass()); } - packet.writeD(_curHp); packet.writeD(_maxHp); packet.writeD(_curCp); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java index e84d0251bd..7ec64cc8c3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java @@ -35,7 +35,6 @@ public class ExOpenMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OPEN_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java index 90349cc1a2..5661dc9f57 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java @@ -56,7 +56,6 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PCCAFE_POINT_INFO.writeId(packet); - packet.writeD(_points); // num points packet.writeD(_mAddPoint); // points inc display packet.writeC(_mPeriodType); // period(0=don't show window,1=acquisition,2=use points) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java index f7e8b4a99a..248a2f7d98 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_ADD.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java index 832bee0012..1f452f4bae 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_DELETE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_summon.getSummonType()); packet.writeD(_summon.getOwner().getObjectId()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java index 0646a67001..703694fa2f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_UPDATE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 0e3edb3ea7..e4c6b79ae0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -47,7 +47,6 @@ public class ExPartyRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index dec8a55f3b..c1272bd98c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -43,10 +43,8 @@ public class ExPetInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class ExPetInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class ExPetInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,9 +154,8 @@ public class ExPetInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -227,28 +205,24 @@ public class ExPetInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PET_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0x00); + packet.writeQ(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -267,7 +241,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -283,19 +257,19 @@ public class ExPetInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -307,20 +281,20 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -344,12 +318,12 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -379,12 +353,10 @@ public class ExPetInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java index 082f4c7662..0f72c05a3a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java @@ -34,7 +34,6 @@ public class ExPlayScene implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLAY_SCENE.writeId(packet); - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java index e98d317e14..7e3803bdaa 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java @@ -36,7 +36,6 @@ public class ExPledgeCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_COUNT.writeId(packet); - packet.writeD(_count); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java index 838029e284..4084de3481 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java @@ -38,7 +38,6 @@ public class ExPledgeDraftListSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_DRAFT_LIST_SEARCH.writeId(packet); - packet.writeD(_pledgeRecruitList.size()); for (PledgeWaitingInfo prl : _pledgeRecruitList) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java index fb956e9996..44e34004ea 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java @@ -25,11 +25,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExPledgeEmblem implements IClientOutgoingPacket { + private static final int TOTAL_SIZE = 65664; + private final int _crestId; private final int _clanId; private final byte[] _data; private final int _chunkId; - private static final int TOTAL_SIZE = 65664; public ExPledgeEmblem(int crestId, byte[] chunkedData, int clanId, int chunkId) { @@ -43,7 +44,6 @@ public class ExPledgeEmblem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clanId); packet.writeD(_crestId); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java index ed19bf976b..b32f8c0645 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitApplyInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_APPLY_INFO.writeId(packet); - packet.writeD(_status.ordinal()); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java index fc98b7b6f7..af4af9c9c1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitBoardDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_DETAIL.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClanId()); packet.writeD(_pledgeRecruitInfo.getKarma()); packet.writeS(_pledgeRecruitInfo.getInformation()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index b4d48373a6..eda808e754 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -34,7 +34,6 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket private final int _clanOnCurrentPage; private final int _startIndex; private final int _endIndex; - static final int CLAN_PER_PAGE = 12; public ExPledgeRecruitBoardSearch(List clanList, int currentPage) @@ -51,11 +50,9 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_SEARCH.writeId(packet); - packet.writeD(_currentPage); packet.writeD(_totalNumberOfPage); packet.writeD(_clanOnCurrentPage); - for (int i = _startIndex; i < _endIndex; i++) { packet.writeD(_clanList.get(i).getClanId()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 4ae5ffe316..b1f139226d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -40,7 +40,6 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java index 77080a3820..5844f220ec 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java @@ -39,7 +39,6 @@ public class ExPledgeWaitingList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST.writeId(packet); - packet.writeD(pledgePlayerRecruitInfos.size()); for (PledgeApplicantInfo recruitInfo : pledgePlayerRecruitInfos.values()) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java index a9245c1309..6b88572057 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java @@ -30,7 +30,6 @@ public class ExPledgeWaitingListAlarm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_ALARM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java index 60997b3da0..28c3967119 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java @@ -40,7 +40,6 @@ public class ExPledgeWaitingListApplied implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_APPLIED.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClan().getId()); packet.writeS(_pledgeRecruitInfo.getClan().getName()); packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java index 66a06892c2..1f53d1bb38 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java @@ -36,7 +36,6 @@ public class ExPledgeWaitingUser implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_USER.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getPlayerId()); packet.writeS(_pledgeRecruitInfo.getMessage()); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java index 49bc9b0995..5f404779f5 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java @@ -43,7 +43,6 @@ public class ExPrivateStoreSetWholeMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_objectId); packet.writeS(_msg); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java index cb5e8fbce9..ff996b5d0c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutCommissionResultForVariationMake implements IClientOutgoingPac public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_COMMISSION_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_gemstoneObjId); packet.writeD(_itemId); packet.writeQ(_gemstoneCount); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java index 81721e921f..098472b7ae 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantScrollItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SCROLL_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java index 871f377db2..ffea182a49 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java index c47a4bcff4..8016e128f4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java index c8b46be499..95c0c0e4e1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_INTENSIVE_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_refinerItemObjId); packet.writeD(_lifestoneItemId); packet.writeD(_gemstoneItemId); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 2128b2b19f..2970ca00a2 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -41,13 +41,12 @@ public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_CANCEL.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); packet.writeD(_itemAug1); packet.writeD(_itemAug2); packet.writeQ(_price); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java index 80541e65cd..c25dd16b01 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java @@ -34,10 +34,9 @@ public class ExPutItemResultForVariationMake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java index fe5eb74eb0..bc8896164d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java @@ -56,13 +56,12 @@ public class ExQuestNpcLogList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_NPC_LOG_LIST.writeId(packet); - packet.writeD(_questId); packet.writeC(_npcLogList.size()); for (NpcLogListHolder holder : _npcLogList) { packet.writeD(holder.isNpcString() ? holder.getId() : holder.getId() + 1000000); - packet.writeC(holder.isNpcString() ? 0x01 : 0x00); + packet.writeC(holder.isNpcString() ? 1 : 0); packet.writeD(holder.getCount()); } return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java index 62d622caff..60616b256d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java @@ -35,7 +35,6 @@ public class ExRedSky implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RED_SKY.writeId(packet); - packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java index ce40b1a792..163faff855 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java @@ -36,7 +36,6 @@ public class ExRegenMax implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REGEN_MAX.writeId(packet); - packet.writeD(1); packet.writeD(_time); packet.writeD(_tickInterval); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java index d864795cd6..a17525576b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java @@ -34,7 +34,6 @@ public class ExRemoveEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REMOVE_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 57ed88ac29..4e479e75a6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -56,7 +56,6 @@ public class ExReplyReceivedPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_RECEIVED_POST.writeId(packet); - packet.writeD(_msg.getMailType().ordinal()); // GOD if (_msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED) { @@ -76,11 +75,10 @@ public class ExReplyReceivedPost extends AbstractItemPacket } packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown packet.writeS(_msg.getSenderName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -92,9 +90,8 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeQ(_msg.getReqAdena()); packet.writeD(_msg.hasAttachments() ? 1 : 0); packet.writeD(_msg.isReturned() ? 1 : 0); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 75f6596194..ed490eae91 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -54,14 +54,12 @@ public class ExReplySentPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_SENT_POST.writeId(packet); - - packet.writeD(0x00); // GOD + packet.writeD(0); // GOD packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); packet.writeS(_msg.getReceiverName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -73,11 +71,11 @@ public class ExReplySentPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeQ(_msg.getReqAdena()); - packet.writeD(_msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(_msg.isReturned() ? 0x01 : 00); + packet.writeD(_msg.hasAttachments() ? 1 : 0); + packet.writeD(_msg.isReturned() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index cc4f7ce1d8..e6a3f9bca2 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -35,7 +35,6 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java index 2634aa1cdd..60201b177f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java @@ -35,7 +35,6 @@ public class ExRequestHackShield implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REQUEST_HACK_SHIELD.writeId(packet); - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java index c51ff31d0b..75e3b3a945 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java @@ -29,13 +29,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyList implements IClientOutgoingPacket { + public static final int SHOW_FACESHAPE = 1; + public static final int SHOW_HAIRSTYLE = 0; + private final Player _player; private final int _type; private final Map _beautyItem; - public static final int SHOW_FACESHAPE = 1; - public static final int SHOW_HAIRSTYLE = 0; - public ExResponseBeautyList(Player player, int type) { _player = player; @@ -54,7 +54,6 @@ public class ExResponseBeautyList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java index ca2ed360ab..4b19201833 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java @@ -25,16 +25,15 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket { + public static final int FAILURE = 0; + public static final int SUCCESS = 1; + public static final int CHANGE = 0; + public static final int RESTORE = 1; + private final Player _player; private final int _type; private final int _result; - public static final int FAILURE = 0; - public static final int SUCCESS = 1; - - public static final int CHANGE = 0; - public static final int RESTORE = 1; - public ExResponseBeautyRegistReset(Player player, int type, int result) { _player = player; @@ -46,7 +45,6 @@ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_REGIST_RESET.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java index 0e313ef3b7..c0922cfb04 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java @@ -36,10 +36,8 @@ public class ExResponseResetList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_RESET_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); - packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java index 01fe1945ef..a230033d67 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java @@ -37,7 +37,6 @@ public class ExRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ROTATION.writeId(packet); - packet.writeD(_charId); packet.writeD(_heading); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index c58ccfc233..2646a71e77 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -36,7 +36,6 @@ public class ExRpItemLink extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RP_ITEM_LINK.writeId(packet); - writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java index 04556bbed2..f0c6eba8e9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java @@ -34,7 +34,6 @@ public class ExSearchOrc implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEARCH_ORC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index 1e06cc2a3f..7a4dced122 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -38,7 +38,6 @@ public class ExSendManorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_MANOR_LIST.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java index 1cf12b0ad1..095307c9c8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java @@ -125,7 +125,6 @@ public class ExSendUIEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_UIEVENT.writeId(packet); - packet.writeD(_objectId); packet.writeD(_type); // 0 = show, 1 = hide (there is 2 = pause and 3 = resume also but they don't work well you can only pause count down and you cannot resume it because resume hides the counter). packet.writeD(0); // unknown diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java index 4378479707..716a3e8623 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java @@ -385,16 +385,13 @@ public class ExServerPrimitive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SERVER_PRIMITIVE.writeId(packet); - packet.writeS(_name); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(65535); // has to do something with display range and angle packet.writeD(65535); // has to do something with display range and angle - packet.writeD(_points.size() + _lines.size()); - for (Point point : _points) { packet.writeC(1); // Its the type in this case Point @@ -408,7 +405,6 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(point.getY()); packet.writeD(point.getZ()); } - for (Line line : _lines) { packet.writeC(2); // Its the type in this case Line diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java index fb32e199b2..51fb91b643 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java @@ -46,7 +46,6 @@ public class ExSetCompassZoneCode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_COMPASS_ZONE_CODE.writeId(packet); - packet.writeD(_zoneType); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java index 1d0fbae3a4..34dee8bda0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java @@ -38,7 +38,6 @@ public class ExSetPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_PARTY_LOOTING.writeId(packet); - packet.writeD(_result); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java index 7b14ec8412..4e491af9d1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java @@ -34,7 +34,6 @@ public class ExShowAdventurerGuideBook implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_ADVENTURER_GUIDE_BOOK.writeId(packet); - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index 82554fdc5f..1f8df76083 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -39,7 +39,6 @@ public class ExShowAgitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AGIT_INFO.writeId(packet); - final Collection clanHalls = ClanHallData.getInstance().getClanHalls(); packet.writeD(clanHalls.size()); clanHalls.forEach(clanHall -> diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index dd11ee0150..51e6646ff5 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -44,7 +44,6 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BASE_ATTRIBUTE_CANCEL_WINDOW.writeId(packet); - packet.writeD(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java index 14e55d39f3..e22345c4fd 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java @@ -25,13 +25,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExShowBeautyMenu implements IClientOutgoingPacket { - private final Player _player; - private final int _type; - // TODO: Enum public static final int MODIFY_APPEARANCE = 0; public static final int RESTORE_APPEARANCE = 1; + private final Player _player; + private final int _type; + public ExShowBeautyMenu(Player player, int type) { _player = player; @@ -42,7 +42,6 @@ public class ExShowBeautyMenu implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BEAUTY_MENU.writeId(packet); - packet.writeD(_type); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 15d011befc..b0d2b90494 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -41,7 +41,6 @@ public class ExShowCastleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CASTLE_INFO.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) @@ -65,8 +64,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } packet.writeD(castle.getTaxPercent(TaxType.BUY)); packet.writeD((int) (castle.getSiege().getSiegeDate().getTimeInMillis() / 1000)); - - packet.writeC(castle.getSiege().isInProgress() ? 0x01 : 0x00); // Grand Crusade + packet.writeC(castle.getSiege().isInProgress() ? 1 : 0); // Grand Crusade packet.writeC(castle.getSide().ordinal()); // Grand Crusade } return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java index aeb4079f3a..f9a6ebe0e7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java @@ -38,7 +38,6 @@ public class ExShowContactList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_SHOW_POST_FRIEND.writeId(packet); - packet.writeD(_contacts.size()); _contacts.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index a079ea3129..94b989b583 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -37,7 +37,6 @@ public class ExShowCropInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _crops = (nextPeriod && !manor.isManorApproved()) ? null : manor.getCropProcure(manorId, nextPeriod); } @@ -46,10 +45,9 @@ public class ExShowCropInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Crop Sales" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Crop Sales" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); + packet.writeD(0); if (_crops != null) { packet.writeD(_crops.size()); @@ -64,17 +62,17 @@ public class ExShowCropInfo implements IClientOutgoingPacket if (seed == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(seed.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(seed.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(seed.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index a1e06eb2bf..1c65dde1a6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -62,10 +62,8 @@ public class ExShowCropSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getCropId()); // crop id diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index ee9fa9fd37..b625a1e4e7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -39,7 +39,6 @@ public class ExShowFortressInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_INFO.writeId(packet); - final Collection forts = FortManager.getInstance().getForts(); packet.writeD(forts.size()); for (Fort fort : forts) @@ -47,7 +46,7 @@ public class ExShowFortressInfo implements IClientOutgoingPacket final Clan clan = fort.getOwnerClan(); packet.writeD(fort.getResidenceId()); packet.writeS(clan != null ? clan.getName() : ""); - packet.writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00); + packet.writeD(fort.getSiege().isInProgress() ? 1 : 0); // Time of possession packet.writeD(fort.getOwnedTime()); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index f389b26ed5..678ab43e96 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -42,11 +42,9 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_MAP_INFO.writeId(packet); - packet.writeD(_fortress.getResidenceId()); packet.writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status packet.writeD(_fortress.getFortSize()); // barracks count - final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId()); if ((commanders != null) && !commanders.isEmpty() && _fortress.getSiege().isInProgress()) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 27da99cf41..da186103ae 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -51,7 +51,6 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_SIEGE_INFO.writeId(packet); - packet.writeD(_fortId); // Fortress Id packet.writeD(_size); // Total Barracks Count if (_csize > 0) @@ -64,22 +63,22 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { case 0: { - packet.writeD(0x03); + packet.writeD(3); break; } case 1: { - packet.writeD(0x02); + packet.writeD(2); break; } case 2: { - packet.writeD(0x01); + packet.writeD(1); break; } case 3: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -92,27 +91,27 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket // TODO: once control room supported, update packet.writeD(0x0x) to support 5th room case 0: { - packet.writeD(0x05); + packet.writeD(5); break; } case 1: { - packet.writeD(0x04); + packet.writeD(4); break; } case 2: { - packet.writeD(0x03); + packet.writeD(3); break; } case 3: { - packet.writeD(0x02); + packet.writeD(2); break; } case 4: { - packet.writeD(0x01); + packet.writeD(1); break; } } @@ -124,7 +123,7 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { for (int i = 0; i < _size; i++) { - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java index 8bb38fd28c..bc1e679418 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java @@ -41,8 +41,7 @@ public class ExShowManorDefaultInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_MANOR_DEFAULT_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" and "Crop Sales" buttons + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" and "Crop Sales" buttons packet.writeD(_crops.size()); for (Seed crop : _crops) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 1d3312d668..d03ce2a5fd 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -52,10 +52,8 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet); - packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java index cf38d18c1c..f41999329f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java @@ -34,7 +34,6 @@ public class ExShowQuestInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_INFO.writeId(packet); - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java index 70f31e318f..0fa64c401d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java @@ -37,7 +37,6 @@ public class ExShowQuestMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_MARK.writeId(packet); - packet.writeD(_questId); packet.writeD(_questState); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index ab85228caf..1a6ee00a10 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ExShowReceivedPostList implements IClientOutgoingPacket { - private final List _inbox; - private static final int MESSAGE_FEE = 100; private static final int MESSAGE_FEE_PER_SLOT = 1000; + private final List _inbox; + public ExShowReceivedPostList(int objectId) { _inbox = MailManager.getInstance().getInbox(objectId); @@ -45,7 +45,6 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { @@ -64,18 +63,18 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getSenderName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); + packet.writeD(msg.isUnread() ? 1 : 0); packet.writeD(((msg.getMailType() == MailType.COMMISSION_ITEM_SOLD) || (msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED)) ? 0 : 1); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(msg.isReturned() ? 0x01 : 0x00); - packet.writeD(0x00); // SysString in some case it seems + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(msg.isReturned() ? 1 : 0); + packet.writeD(0); // SysString in some case it seems } } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(MESSAGE_FEE); packet.writeD(MESSAGE_FEE_PER_SLOT); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java index 9679468789..deebb99c8f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java @@ -33,6 +33,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; */ public class ExShowScreenMessage implements IClientOutgoingPacket { + // Positions + public static final byte TOP_LEFT = 1; + public static final byte TOP_CENTER = 2; + public static final byte TOP_RIGHT = 3; + public static final byte MIDDLE_LEFT = 4; + public static final byte MIDDLE_CENTER = 5; + public static final byte MIDDLE_RIGHT = 6; + public static final byte BOTTOM_CENTER = 7; + public static final byte BOTTOM_RIGHT = 8; + private final int _type; private final int _sysMessageId; private final int _unk1; @@ -48,15 +58,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket private List _parameters; // Localisation related. private String _lang; - // Positions - public static final byte TOP_LEFT = 0x01; - public static final byte TOP_CENTER = 0x02; - public static final byte TOP_RIGHT = 0x03; - public static final byte MIDDLE_LEFT = 0x04; - public static final byte MIDDLE_CENTER = 0x05; - public static final byte MIDDLE_RIGHT = 0x06; - public static final byte BOTTOM_CENTER = 0x07; - public static final byte BOTTOM_RIGHT = 0x08; public void setLang(String lang) { @@ -265,7 +266,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SCREEN_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -284,9 +284,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(sml.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -308,9 +308,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -318,7 +318,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket } } } - packet.writeD(_type); packet.writeD(_sysMessageId); packet.writeD(_position); @@ -326,9 +325,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java index 29ab5d355f..6123b08991 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java @@ -37,7 +37,6 @@ public class ExShowSeedInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _seeds = (nextPeriod && !manor.isManorApproved()) ? null : manor.getSeedProduction(manorId, nextPeriod); } @@ -46,16 +45,14 @@ public class ExShowSeedInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown if (_seeds == null) { packet.writeD(0); return true; } - packet.writeD(_seeds.size()); for (SeedProduction seed : _seeds) { @@ -67,17 +64,17 @@ public class ExShowSeedInfo implements IClientOutgoingPacket if (s == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(s.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(s.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(s.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java index e628099700..eb6e686e10 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java @@ -32,13 +32,10 @@ public class ExShowSeedMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_MAP_INFO.writeId(packet); - packet.writeD(2); // seed count - // Seed of Destruction packet.writeD(1); // id 1? Grand Crusade packet.writeD(2770 + GraciaSeedsManager.getInstance().getSoDState()); // sys msg id - // Seed of Infinity packet.writeD(2); // id 2? Grand Crusade // Manager not implemented yet diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index c9bf485ee2..05c0401a7c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -62,10 +62,8 @@ public class ExShowSeedSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getSeedId()); // seed id diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 1994402da2..269bec5b97 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -47,7 +47,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _cropsItems.put(cropId, item); } } - for (CropProcure crop : CastleManorManager.getInstance().getCropProcure(_manorId, false)) { if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) @@ -61,7 +60,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_cropsItems.size()); // size for (Item item : _cropsItems.values()) @@ -70,9 +68,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket packet.writeD(item.getObjectId()); // Object id packet.writeD(item.getId()); // crop id packet.writeD(seed.getLevel()); // seed level - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(1)); // reward 1 id - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(2)); // reward 2 id if (_castleCrops.containsKey(item.getId())) { @@ -85,9 +83,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket else { packet.writeD(0xFFFFFFFF); // manor - packet.writeQ(0x00); // buy residual - packet.writeQ(0x00); // buy price - packet.writeC(0x00); // reward + packet.writeQ(0); // buy residual + packet.writeQ(0); // buy price + packet.writeC(0); // reward } packet.writeQ(item.getCount()); // my crops } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index db4bccc928..b61d5b2301 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -40,7 +40,6 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { @@ -50,17 +49,17 @@ public class ExShowSentPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getReceiverName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); - packet.writeD(0x01); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(msg.isUnread() ? 1 : 0); + packet.writeD(1); + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(0); } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java index 0e4e9fd2ef..0dca57f2f8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java @@ -48,7 +48,6 @@ public class ExShowTerritory implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TERRITORY.writeId(packet); - packet.writeD(_vertices.size()); packet.writeD(_minZ); packet.writeD(_maxZ); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java index 4e284f82c5..86e1009bbf 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java @@ -46,7 +46,6 @@ public class ExShowTrace implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TRACE.writeId(packet); - packet.writeH(0); // type broken in H5 packet.writeD(0); // time broken in H5 packet.writeH(_locations.size()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java index 3245767ed7..836a5c9624 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java @@ -44,7 +44,6 @@ public class ExShowUsm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_USM.writeId(packet); - packet.writeD(_videoId); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java index 4acdffa842..1f1a14c31b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java @@ -34,7 +34,6 @@ public class ExShowVariationCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_CANCEL_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java index 3a2298019e..9870424e26 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java @@ -35,7 +35,6 @@ public class ExShowVariationMakeWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_MAKE_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java index 169827bab3..86211c8d97 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java @@ -44,10 +44,9 @@ public class ExSpawnEmitter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SPAWN_EMITTER.writeId(packet); - packet.writeD(_npcObjectId); packet.writeD(_playerObjectId); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java index 620800c1c4..534549b4fe 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java @@ -36,7 +36,6 @@ public class ExStartScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_START_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java index 0bd990cf34..babac59129 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java index 0e2689d598..d3e67afe99 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipObjId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java index 44b064113f..f5b3e1340f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java @@ -36,7 +36,6 @@ public class ExStopScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index 8029930c9a..367ac79be4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -66,7 +66,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket } OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet); - packet.writeD(_inventory); packet.writeD(_warehouse); // packet.writeD(_freight); // Removed with 152. diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java index 3293a5b557..57563ca2f9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java @@ -39,7 +39,6 @@ public class ExSubPledgeSkillAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUB_PLEDGET_SKILL_ADD.writeId(packet); - packet.writeD(_type); packet.writeD(_skillId); packet.writeD(_skillLevel); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java index d61dfa20ab..816d6f16a6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java @@ -97,7 +97,6 @@ public class ExSubjobInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUBJOB_INFO.writeId(packet); - packet.writeC(_type); packet.writeD(_currClassId); packet.writeD(_currRace); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java index 85616016c7..b7a152629d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java @@ -38,7 +38,6 @@ public class ExTacticalSign implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TACTICAL_SIGN.writeId(packet); - packet.writeD(_target.getObjectId()); packet.writeD(_tokenId); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java index 8a1f520529..397e185fdd 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java @@ -39,7 +39,6 @@ public class ExTeleportToLocationActivate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_TO_LOCATION_ACTIVATE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java index f860c2a40f..aab66c2e48 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java @@ -44,7 +44,6 @@ public class ExTryEnchantArtifactResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TRY_ENCHANT_ARTIFACT_RESULT.writeId(packet); - packet.writeD(_state); packet.writeD(_enchant); packet.writeD(0); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java index a214c53a0f..7bcddd964d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java @@ -27,6 +27,7 @@ public class ExUISetting implements IClientOutgoingPacket { public static final String UI_KEY_MAPPING_VAR = "UI_KEY_MAPPING"; public static final String SPLIT_VAR = " "; + private final byte[] _uiKeyMapping; public ExUISetting(Player player) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java index 187770cfc8..eff4285a8b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java @@ -37,7 +37,6 @@ public class ExUnReadMailCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_UN_READ_MAIL_COUNT.writeId(packet); - packet.writeD(_mailUnreadCount); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java index f992b3c937..e59c651371 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java @@ -41,7 +41,6 @@ public class ExUseSharedGroupItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USE_SHARED_GROUP_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeD(_grpId); packet.writeD(_remainingTime); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java index 66fa7d87db..97ceb8aa15 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java @@ -40,7 +40,6 @@ public class ExUserBoostStat implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_BOOST_STAT.writeId(packet); - int count = 0; int bonus = 0; switch (_type) @@ -68,7 +67,6 @@ public class ExUserBoostStat implements IClientOutgoingPacket count = 1; bonus = 100; } - if (bonus > 0) { count += (int) _player.getStat().getValue(Stat.VITALITY_SKILLS, 0); @@ -89,11 +87,9 @@ public class ExUserBoostStat implements IClientOutgoingPacket break; } } - packet.writeC(_type.getId()); packet.writeC(count); packet.writeH(bonus); - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java index 474fcc5208..f49d451587 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class ExUserInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getTransformationId()); - final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); final boolean isInvisible = _player.isInvisible(); packet.writeD(abnormalVisualEffects.size() + (isInvisible ? 1 : 0)); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java index b841449ab3..1069a64e3e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java @@ -36,12 +36,9 @@ public class ExUserInfoCubic implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_CUBIC.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(_player.getCubics().size()); - _player.getCubics().keySet().forEach(packet::writeH); - packet.writeD(_player.getAgathionId()); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java index 3e4afb995b..6ef31d6117 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java @@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExUserInfoEquipSlot extends AbstractMaskPacket { private final Player _player; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -66,11 +65,9 @@ public class ExUserInfoEquipSlot extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_EQUIP_SLOT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(InventorySlot.values().length); // 152 packet.writeB(_masks); - final PlayerInventory inventory = _player.getInventory(); for (InventorySlot slot : InventorySlot.values()) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java index 3eb1cf9578..d655e48843 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java @@ -36,7 +36,6 @@ public class ExUserInfoInvenWeight implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_INVEN_WEIGHT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java index 91e0e92338..16aa81e9c0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java @@ -44,7 +44,6 @@ public class ExValidateLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java index 727267c9d5..50cb4025e4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java @@ -35,7 +35,6 @@ public class ExVariationCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_CANCEL_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java index 5cdc1b8d0e..4fde190ae2 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java @@ -32,14 +32,13 @@ public class ExVariationResult implements IClientOutgoingPacket { _option1 = option1; _option2 = option2; - _success = success ? 0x01 : 0x00; + _success = success ? 1 : 0; } @Override public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_RESULT.writeId(packet); - packet.writeD(_option1); packet.writeD(_option2); packet.writeD(_success); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java index db0acfd5ff..60fb57c0b3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java @@ -41,10 +41,9 @@ public class ExVitalityEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_EFFECT_INFO.writeId(packet); - packet.writeD(_points); packet.writeD(_vitalityBonus); // Vitality Bonus - packet.writeH(0x00); // Vitality additional bonus in % + packet.writeH(0); // Vitality additional bonus in % packet.writeH(_vitalityItemsRemaining); // How much vitality items remaining for use packet.writeH(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java index 3cd9d26602..9a401c2321 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java @@ -35,7 +35,6 @@ public class ExVitalityPointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_POINT_INFO.writeId(packet); - packet.writeD(_vitalityPoints); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java index 71baff96ea..c4c5539ca4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java @@ -45,7 +45,6 @@ public class ExVoteSystemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VOTE_SYSTEM_INFO.writeId(packet); - packet.writeD(_recomLeft); packet.writeD(_recomHave); packet.writeD(_bonusTime); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java index 21411f5abc..452b0dc43a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java @@ -37,7 +37,6 @@ public class ExWorldChatCnt implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_WORLD_CHAT_CNT.writeId(packet); - packet.writeD(_points); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java index 5f935fe0dc..dc9c2288f8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java @@ -79,19 +79,17 @@ public class FakePlayerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // vehicleId + packet.writeD(0); // vehicleId packet.writeD(_objId); packet.writeS(_npc.getName()); - packet.writeH(_npc.getRace().ordinal()); - packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 0x01 : 0x00); + packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 1 : 0); packet.writeD(_fpcHolder.getClassId()); - - packet.writeD(0x00); // Inventory.PAPERDOLL_UNDER + packet.writeD(0); // Inventory.PAPERDOLL_UNDER packet.writeD(_fpcHolder.getEquipHead()); packet.writeD(_fpcHolder.getEquipRHand()); packet.writeD(_fpcHolder.getEquipLHand()); @@ -103,28 +101,22 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_fpcHolder.getEquipRHand()); // dual hand packet.writeD(_fpcHolder.getEquipHair()); packet.writeD(_fpcHolder.getEquipHair2()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderAugument()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } - packet.writeC(_fpcHolder.getArmorEnchantLevel()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderVisualId()) { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeC(_npc.getScriptValue()); // getPvpFlag() packet.writeD(_npc.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -135,16 +127,12 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_npc.getCollisionRadius()); packet.writeF(_npc.getCollisionHeight()); - packet.writeD(_fpcHolder.getHair()); packet.writeD(_fpcHolder.getHairColor()); packet.writeD(_fpcHolder.getFace()); - packet.writeS(_npc.getTemplate().getTitle()); - if (_clan != null) { packet.writeD(_clan.getId()); @@ -154,71 +142,51 @@ public class FakePlayerInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - - packet.writeC(0x01); // isSitting() ? 0x00 : 0x01 (at some initial tests it worked) - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); - packet.writeC(_npc.isInCombat() ? 0x01 : 0x00); - - packet.writeC(_npc.isAlikeDead() ? 0x01 : 0x00); - - packet.writeC(_npc.isInvisible() ? 0x01 : 0x00); - - packet.writeC(0x00); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount - packet.writeC(0x00); // getPrivateStoreType().getId() - - packet.writeH(0x00); // getCubics().size() + packet.writeC(1); // isSitting() ? 0 : 1 (at some initial tests it worked) + packet.writeC(_npc.isRunning() ? 1 : 0); + packet.writeC(_npc.isInCombat() ? 1 : 0); + packet.writeC(_npc.isAlikeDead() ? 1 : 0); + packet.writeC(_npc.isInvisible() ? 1 : 0); + packet.writeC(0); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount + packet.writeC(0); // getPrivateStoreType().getId() + packet.writeH(0); // getCubics().size() // getCubics().keySet().forEach(packet::writeH); - packet.writeC(0x00); - + packet.writeC(0); packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : 0); packet.writeH(_fpcHolder.getRecommends()); - packet.writeD(0x00); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 - + packet.writeD(0); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 packet.writeD(_fpcHolder.getClassId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(_fpcHolder.getWeaponEnchantLevel()); // isMounted() ? 0 : _enchantLevel - packet.writeC(_npc.getTeam().getId()); - - packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0x00); + packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0); packet.writeC(_fpcHolder.getNobleLevel()); - packet.writeC(_fpcHolder.isHero() ? 0x01 : 0x00); - - packet.writeC(_fpcHolder.isFishing() ? 0x01 : 0x00); - + packet.writeC(_fpcHolder.isHero() ? 1 : 0); + packet.writeC(_fpcHolder.isFishing() ? 1 : 0); packet.writeD(_fpcHolder.getBaitLocationX()); packet.writeD(_fpcHolder.getBaitLocationY()); packet.writeD(_fpcHolder.getBaitLocationZ()); - packet.writeD(_fpcHolder.getNameColor()); - packet.writeD(_heading); - packet.writeC(_fpcHolder.getPledgeStatus()); - packet.writeH(0x00); // getPledgeType() - + packet.writeH(0); // getPledgeType() packet.writeD(_fpcHolder.getTitleColor()); - - packet.writeC(0x00); // isCursedWeaponEquipped - - packet.writeD(0x00); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 - packet.writeD(0x00); // getTransformationDisplayId() + packet.writeC(0); // isCursedWeaponEquipped + packet.writeD(0); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 + packet.writeD(0); // getTransformationDisplayId() packet.writeD(_fpcHolder.getAgathionId()); - - packet.writeC(0x00); - - packet.writeD(0x00); // getCurrentCp() + packet.writeC(0); + packet.writeD(0); // getCurrentCp() packet.writeD(_npc.getMaxHp()); packet.writeD((int) Math.round(_npc.getCurrentHp())); packet.writeD(_npc.getMaxMp()); packet.writeD((int) Math.round(_npc.getCurrentMp())); - - packet.writeC(0x00); + packet.writeC(0); final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) @@ -229,9 +197,9 @@ public class FakePlayerInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(0x00); // cocPlayer.getPosition() - packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 0x01 : 0x00); - packet.writeC(0x00); // Used Ability Points + packet.writeC(0); // cocPlayer.getPosition() + packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 1 : 0); + packet.writeC(0); // Used Ability Points return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java index ae088538da..03223c8a3e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java @@ -62,7 +62,6 @@ public class FlyToLocation implements IClientOutgoingPacket _destY = destY; _destZ = destZ; _type = type; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -82,7 +81,6 @@ public class FlyToLocation implements IClientOutgoingPacket _flySpeed = flySpeed; _flyDelay = flyDelay; _animationSpeed = animationSpeed; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -103,7 +101,6 @@ public class FlyToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FLY_TO_LOCATION.writeId(packet); - packet.writeD(_chaObjId); packet.writeD(_destX); packet.writeD(_destY); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java index 1e52b0ef72..471d70f791 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java @@ -35,8 +35,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x01); + packet.writeC(1); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 81a384642c..fb7572fc5d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -50,7 +50,6 @@ public class GMHennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GMHENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON @@ -64,19 +63,19 @@ public class GMHennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(0x01); + packet.writeD(1); } if (_player.getHenna(4) != null) { packet.writeD(_player.getHenna(4).getDyeId()); - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 1 : 0); } else { - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid } return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java index 38ca4c7be0..59bf0d9d93 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java @@ -38,7 +38,6 @@ public class GMHide implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_HIDE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index a828a26584..117f9cf67d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -50,7 +50,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -79,28 +78,24 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); packet.writeD(_player.getPkKills()); - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollObjectId(slot)); } - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); } - for (int slot = 0; slot < 11; slot++) { final VariationInstance augment = _player.getInventory().getPaperdollAugmentation(slot); packet.writeD(augment != null ? augment.getOption1Id() : 0); // Confirmed packet.writeD(augment != null ? augment.getOption2Id() : 0); // Confirmed } - packet.writeC(_player.getInventory().getTalismanSlots()); // CT2.3 packet.writeC(_player.getInventory().canEquipCloak() ? 1 : 0); // CT2.3 - packet.writeD(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeH(0); packet.writeD(_player.getPAtk()); packet.writeD(_player.getPAtkSpd()); packet.writeD(_player.getPDef()); @@ -108,18 +103,14 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAccuracy()); packet.writeD(_player.getCriticalHit()); packet.writeD(_player.getMAtk()); - packet.writeD(_player.getMAtkSpd()); packet.writeD(_player.getPAtkSpd()); - packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicEvasionRate()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name packet.writeD(_player.getReputation()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -135,8 +126,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeD(_player.isGM() ? 0x01 : 0x00); // builder level - + packet.writeD(_player.isGM() ? 1 : 0); // builder level packet.writeS(_player.getTitle()); packet.writeD(_player.getClanId()); // pledge id packet.writeD(_player.getClanCrestId()); // pledge crest id @@ -146,26 +136,19 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeC(_player.getCreateItemLevel() > 0 ? 1 : 0); packet.writeD(_player.getPkKills()); packet.writeD(_player.getPvpKills()); - packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); - - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeC(321); - packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window - packet.writeC(_player.getNobleLevel()); - packet.writeC(_player.isHero() ? 0x01 : 0x00); - + packet.writeC(_player.isHero() ? 1 : 0); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); - final AttributeType attackAttribute = _player.getAttackElement(); packet.writeH(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); @@ -175,8 +158,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket } packet.writeD(_player.getFame()); packet.writeD(_player.getVitalityPoints()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index 1d88596096..552b6e6168 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -37,14 +37,12 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_player.getName()); packet.writeD(_clan.getId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); @@ -52,15 +50,14 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 packet.writeD(_clan.getAllyCrestId()); // c2 packet.writeD(_clan.isAtWar() ? 1 : 0); // c3 - packet.writeD(0x00); // T3 Unknown - + packet.writeD(0); // T3 Unknown packet.writeD(_clan.getMembers().size()); for (ClanMember member : _clan.getMembers()) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java index 93af10e254..3c155ff816 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -38,10 +38,8 @@ public class GMViewSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_SKILL_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_skills.size()); - final boolean isDisabled = (_player.getClan() != null) && (_player.getClan().getReputationScore() < 0); for (Skill skill : _skills) { @@ -49,7 +47,7 @@ public class GMViewSkillInfo implements IClientOutgoingPacket packet.writeH(skill.getDisplayLevel()); packet.writeH(skill.getSubLevel()); packet.writeD(skill.getDisplayId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(isDisabled && skill.isClanSkill() ? 1 : 0); packet.writeC(skill.isEnchantable() ? 1 : 0); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index f49138fafe..c909d5e6e1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -51,7 +51,6 @@ public class GMViewWarehouseWithdrawList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_WAREHOUSE_WITHDRAW_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java index d8c273f914..449271993b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java @@ -35,7 +35,6 @@ public class GameGuardQuery implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GAME_GUARD_QUERY.writeId(packet); - packet.writeD(0x27533DD9); packet.writeD(0x2E72A51D); packet.writeD(0x2017038B); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index b0c011b696..037b2e6b6b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -35,10 +35,8 @@ public class GetItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ITEM.writeId(packet); - packet.writeD(_playerId); packet.writeD(_item.getObjectId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java index f8c6126c87..5f4d7bf3ca 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java @@ -50,7 +50,6 @@ public class GetOffVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_OFF_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_x); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java index ffa8d5f310..77d1e6ba28 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java @@ -45,7 +45,6 @@ public class GetOnVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ON_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java index e5dcb9ded6..b1f5b588f9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java @@ -44,14 +44,13 @@ public class GmViewQuestInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_QUEST_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeH(_questList.size()); // quest count - for (Quest quest : _questList) { final QuestState qs = _player.getQuestState(quest.getName()); packet.writeD(quest.getId()); packet.writeD(qs == null ? 0 : qs.getCond()); } - packet.writeH(0x00); // some size + packet.writeH(0); // some size // for size; ddQQ return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 395487097c..4309e2d74f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -51,7 +51,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeQ(_player.getAdena()); // activeChar current amount of Adena packet.writeD(3); // available equip slot packet.writeD(_hennaEquipList.size()); - for (Henna henna : _hennaEquipList) { // Player must have at least one dye in inventory @@ -62,8 +61,8 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); // item Id of the dye packet.writeQ(henna.getWearCount()); // amount of dyes required packet.writeQ(henna.getWearFee()); // amount of Adena required - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not - packet.writeD(0x00); // TODO: Find me! + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // meet the requirement or not + packet.writeD(0); // TODO: Find me! } } return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 30dc837721..b84d2283e8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -51,7 +51,6 @@ public class HennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON @@ -65,9 +64,8 @@ public class HennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); } - final Henna premium = _player.getHenna(4); if (premium != null) { @@ -77,16 +75,15 @@ public class HennaInfo implements IClientOutgoingPacket final long currentTime = Chronos.currentTimeMillis(); duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000; } - packet.writeD(premium.getDyeId()); packet.writeD(duration); // Premium Slot Dye Time Left - packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 1 : 0); } else { - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid } return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index cf3d83263f..5b77709720 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -40,12 +40,11 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_ITEM_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getWearCount()); // total amount of dye require packet.writeQ(_henna.getWearFee()); // total amount of Adena require to draw symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to draw or not 0 is false and 1 is true + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to draw or not 0 is false and 1 is true packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() + _player.getHennaValue(BaseStat.INT)); // equip INT @@ -63,7 +62,7 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket packet.writeH(_player.getLUC() + _player.getHennaValue(BaseStat.LUC)); // equip LUC packet.writeD(_player.getCHA()); // current CHA packet.writeH(_player.getCHA() + _player.getHennaValue(BaseStat.CHA)); // equip CHA - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index cb1379ac29..fc93d02a73 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -40,12 +40,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getCancelCount()); // total amount of dye require packet.writeQ(_henna.getCancelFee()); // total amount of Adena require to remove symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to remove or not + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to remove or not packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() - _player.getHennaValue(BaseStat.INT)); // equip INT @@ -63,7 +62,7 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket packet.writeH(_player.getLUC() - _player.getHennaValue(BaseStat.LUC)); // equip LUC packet.writeD(_player.getCHA()); // current CHA packet.writeH(_player.getCHA() - _player.getHennaValue(BaseStat.CHA)); // equip CHA - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 844fad86c7..452d354ac4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -39,7 +39,7 @@ public class HennaRemoveList implements IClientOutgoingPacket OutgoingPackets.HENNA_UNEQUIP_LIST.writeId(packet); packet.writeQ(_player.getAdena()); final boolean premiumSlotEnabled = _player.getHenna(4) != null; - packet.writeD(premiumSlotEnabled ? 0x04 : 0x03); // seems to be max size + packet.writeD(premiumSlotEnabled ? 4 : 3); // seems to be max size packet.writeD((premiumSlotEnabled ? 4 : 3) - _player.getHennaEmptySlots()); // slots used for (Henna henna : _player.getHennaList()) { @@ -49,8 +49,8 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); packet.writeQ(henna.getCancelCount()); packet.writeQ(henna.getCancelFee()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index b5c8628b50..f2a9cf1822 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -89,14 +89,12 @@ public interface IClientOutgoingPacket extends IOutgoingPacket Inventory.PAPERDOLL_ARTIFACT20, Inventory.PAPERDOLL_ARTIFACT21, }; - int[] PAPERDOLL_ORDER_AUGMENT = new int[] { Inventory.PAPERDOLL_RHAND, Inventory.PAPERDOLL_LHAND, Inventory.PAPERDOLL_RHAND }; - int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 0c54e810f0..3378827f34 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -46,7 +46,6 @@ public class InventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index c4598a72e6..cef69ecb6f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -59,8 +59,8 @@ public class ItemList extends AbstractItemPacket } else { - packet.writeC(0x01); // _showWindow ? 0x01 : 0x00 - packet.writeD(0x00); + packet.writeC(1); // _showWindow ? 1 : 0 + packet.writeD(0); packet.writeD(_items.size()); } writeInventoryBlock(packet, _player.getInventory()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java index b32b4df4a3..c3b9918230 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java @@ -32,9 +32,8 @@ public class JoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PARTY.writeId(packet); - packet.writeD(_response); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java index 65e06efeb7..f347f7efcd 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java @@ -32,7 +32,6 @@ public class JoinPledge implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PLEDGE.writeId(packet); - packet.writeD(_pledgeId); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index 96f6d7c34d..996622b9e9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -35,17 +35,16 @@ public class KeyPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VERSION_CHECK.writeId(packet); - packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok for (int i = 0; i < 8; i++) { packet.writeC(_key[i]); // key } - packet.writeD(0x01); + packet.writeD(1); packet.writeD(Config.SERVER_ID); // server id - packet.writeC(0x01); - packet.writeD(0x00); // obfuscation key - packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 0x01 : 0x00); // isClassic + packet.writeC(1); + packet.writeD(0); // obfuscation key + packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 1 : 0); // isClassic return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java index 484c10f0c4..62424fd03a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java @@ -40,7 +40,6 @@ public class L2FriendSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_SAY.writeId(packet); - packet.writeD(0); // ?? packet.writeS(_receiver); packet.writeS(_sender); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java index b875edb772..790d599b5b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java @@ -32,11 +32,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ListPartyWaiting implements IClientOutgoingPacket { + private static final int NUM_PER_PAGE = 64; + private final List _rooms = new LinkedList<>(); private final int _size; - private static final int NUM_PER_PAGE = 64; - public ListPartyWaiting(PartyMatchingRoomLevelType type, int location, int page, int requestorLevel) { final List rooms = MatchingRoomManager.getInstance().getPartyMathchingRooms(location, type, requestorLevel); @@ -57,7 +57,6 @@ public class ListPartyWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_PARTY_WATING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java index 4f8f9adc64..bb0ac61dbd 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java @@ -54,7 +54,6 @@ public class LoginFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LOGIN_FAIL.writeId(packet); - packet.writeD(_success); packet.writeD(_reason); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java index 18a522c315..6743e3e66f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java @@ -32,7 +32,6 @@ public class MagicSkillCanceld implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_CANCELED.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java index d56de10079..7ab29cc1a8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java @@ -66,7 +66,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // MagicSkillUse castingType packet.writeD(_objectId); packet.writeD(_skillId); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java index 3df8463279..a86626cfa6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java @@ -84,7 +84,6 @@ public class MagicSkillUse implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_USE.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // Casting bar type: 0 - default, 1 - default up, 2 - blue, 3 - green, 4 - red. packet.writeD(_creature.getObjectId()); packet.writeD(_target.getObjectId()); @@ -111,7 +110,7 @@ public class MagicSkillUse implements IClientOutgoingPacket packet.writeD(_target.getX()); packet.writeD(_target.getY()); packet.writeD(_target.getZ()); - packet.writeD(_actionId >= 0 ? 0x01 : 0x00); // 1 when ID from RequestActionUse is used + packet.writeD(_actionId >= 0 ? 1 : 0); // 1 when ID from RequestActionUse is used packet.writeD(_actionId >= 0 ? _actionId : 0); // ID from RequestActionUse. Used to set cooldown on summon skills. return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java index 6b710c692e..12e2488f24 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java @@ -37,11 +37,9 @@ public class ManagePledgePower implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet); - packet.writeD(_rank); packet.writeD(_action); packet.writeD(_clan.getRankPrivs(_rank).getBitmask()); - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 95f4b6f201..4e2ab3f00b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -42,11 +42,9 @@ public class MonRaceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MON_RACE_INFO.writeId(packet); - packet.writeD(_unknown1); packet.writeD(_unknown2); - packet.writeD(0x08); - + packet.writeD(8); for (int i = 0; i < 8; i++) { packet.writeD(_monsters[i].getObjectId()); // npcObjectID @@ -68,7 +66,7 @@ public class MonRaceInfo implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java index 0093b3edc9..e6386921ff 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java @@ -45,13 +45,10 @@ public class MoveToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_xDst); packet.writeD(_yDst); packet.writeD(_zDst); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java index b1fb3ea003..59103c6c4c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java @@ -48,7 +48,6 @@ public class MoveToLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java index 30ff3c96af..aa261f924f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java @@ -50,11 +50,9 @@ public class MoveToPawn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_PAWN.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetId); packet.writeD(_distance); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index 00d7618d34..f94917d93d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -58,18 +58,16 @@ public class MultiSellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.MULTI_SELL_LIST.writeId(packet); - - packet.writeC(0x00); // Helios + packet.writeC(0); // Helios packet.writeD(_list.getId()); // list id - packet.writeC(0x00); // GOD Unknown + packet.writeC(0); // GOD Unknown packet.writeD(1 + (_index / PAGE_SIZE)); // page started from 1 - packet.writeD(_finished ? 0x01 : 0x00); // finished + packet.writeD(_finished ? 1 : 0); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - packet.writeC(0x00); // Grand Crusade - packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window - packet.writeD(0x20); // Helios - Always 32 - + packet.writeC(0); // Grand Crusade + packet.writeC(_list.isChanceMultisell() ? 1 : 0); // new multisell window + packet.writeD(32); // Helios - Always 32 while (_size-- > 0) { ItemInfo itemEnchantment = _list.getItemEnchantment(_index); @@ -86,20 +84,16 @@ public class MultiSellList extends AbstractItemPacket } } } - packet.writeD(_index); // Entry ID. Start from 1. packet.writeC(entry.isStackable() ? 1 : 0); - // Those values will be passed down to MultiSellChoose packet. packet.writeH(itemEnchantment != null ? itemEnchantment.getEnchantLevel() : 0); // enchant level writeItemAugment(packet, itemEnchantment); writeItemElemental(packet, itemEnchantment); writeItemEnsoulOptions(packet, itemEnchantment); - packet.writeC(0x00); // 286 - + packet.writeC(0); // 286 packet.writeH(entry.getProducts().size()); packet.writeH(entry.getIngredients().size()); - for (ItemChanceHolder product : entry.getProducts()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(product.getId()); @@ -122,9 +116,8 @@ public class MultiSellList extends AbstractItemPacket writeItemAugment(packet, displayItemEnchantment); writeItemElemental(packet, displayItemEnchantment); writeItemEnsoulOptions(packet, displayItemEnchantment); - packet.writeC(0x00); // 286 + packet.writeC(0); // 286 } - for (ItemChanceHolder ingredient : entry.getIngredients()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(ingredient.getId()); @@ -144,7 +137,7 @@ public class MultiSellList extends AbstractItemPacket writeItemAugment(packet, displayItemEnchantment); writeItemElemental(packet, displayItemEnchantment); writeItemEnsoulOptions(packet, displayItemEnchantment); - packet.writeC(0x00); // 286 + packet.writeC(0); // 286 } } return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java index 6e85f5348c..cd46aac3aa 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java @@ -45,11 +45,10 @@ public class MyTargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MY_TARGET_SELECTED.writeId(packet); - - packet.writeD(0x01); // Grand Crusade + packet.writeD(1); // Grand Crusade packet.writeD(_objectId); packet.writeH(_color); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java index 1901ad1297..166c5c1e00 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java @@ -36,7 +36,6 @@ public class NewCharacterSuccess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NEW_CHARACTER_SUCCESS.writeId(packet); - packet.writeD(_chars.size()); for (PlayerTemplate chr : _chars) { @@ -44,31 +43,24 @@ public class NewCharacterSuccess implements IClientOutgoingPacket { continue; } - // TODO: Unhardcode these packet.writeD(chr.getRace().ordinal()); packet.writeD(chr.getClassId().getId()); - packet.writeD(99); packet.writeD(chr.getBaseSTR()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseDEX()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseCON()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseINT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseWIT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseMEN()); packet.writeD(1); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java index be1605f679..6061ea26ef 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java @@ -38,7 +38,6 @@ public class NicknameChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NICK_NAME_CHANGED.writeId(packet); - packet.writeD(_objectId); packet.writeS(_title); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index f9cd107e2c..3e4837b4a4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -54,24 +54,20 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public NpcHtmlMessage(int npcObjId, int itemId) { super(npcObjId); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } public NpcHtmlMessage(int npcObjId, int itemId, String html) { super(npcObjId, html); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } @@ -79,11 +75,10 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java index 2b296c3d8e..ce56e727f2 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java @@ -47,10 +47,8 @@ public class NpcInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -58,7 +56,6 @@ public class NpcInfo extends AbstractMaskPacket private int _clanId = 0; private int _statusMask = 0; private final Set _abnormalVisualEffects; - private String[] _localisation; public void setLang(String lang) @@ -101,112 +98,90 @@ public class NpcInfo extends AbstractMaskPacket { addComponentType(NpcInfoType.HEADING); } - if ((npc.getStat().getPAtkSpd() > 0) || (npc.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (npc.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((npc.getLeftHandItem() > 0) || (npc.getRightHandItem() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (npc.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (npc.getDisplayEffect() > 0) { addComponentType(NpcInfoType.DISPLAY_EFFECT); } - if (npc.isInsideZone(ZoneId.WATER) || npc.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (npc.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (npc.getCloneObjId() > 0) { addComponentType(NpcInfoType.CLONE); } - if (npc.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (npc.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (npc.getCurrentHp() <= npc.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (npc.getCurrentMp() <= npc.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (npc.getTemplate().isUsingServerSideName()) { addComponentType(NpcInfoType.NAME); } - if (npc.getTemplate().isUsingServerSideTitle() || (npc.isMonster() && (Config.SHOW_NPC_LEVEL || Config.SHOW_NPC_AGGRESSION)) || npc.isChampion() || npc.isTrap()) { addComponentType(NpcInfoType.TITLE); } - if (npc.getNameString() != null) { addComponentType(NpcInfoType.NAME_NPCSTRINGID); } - if (npc.getTitleString() != null) { addComponentType(NpcInfoType.TITLE_NPCSTRINGID); } - if (_npc.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (!_abnormalVisualEffects.isEmpty() || npc.isInvisible()) { addComponentType(NpcInfoType.ABNORMALS); } - if (npc.getEnchantEffect() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (npc.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (npc.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (npc.getClanId() > 0) { final Clan clan = ClanTable.getInstance().getClan(npc.getClanId()); @@ -220,14 +195,11 @@ public class NpcInfo extends AbstractMaskPacket addComponentType(NpcInfoType.CLAN); } } - addComponentType(NpcInfoType.COLOR_EFFECT); - if (npc.getPvpFlag() > 0) { addComponentType(NpcInfoType.PVP_FLAG); } - // TODO: Confirm me if (npc.isInCombat()) { @@ -245,8 +217,7 @@ public class NpcInfo extends AbstractMaskPacket { _statusMask |= 0x08; } - - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -296,27 +267,23 @@ public class NpcInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO.writeId(packet); - packet.writeD(_npc.getObjectId()); - packet.writeC(_npc.isShowSummonAnimation() ? 0x02 : 0x00); // // 0=teleported 1=default 2=summoned + packet.writeC(_npc.isShowSummonAnimation() ? 2 : 0); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 0x01 : 0x00); + packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0x00); + packet.writeQ(0); } if (containsMask(NpcInfoType.TITLE)) { String title = _npc.getTitle(); - // Localisation related. if ((_localisation != null) && !_localisation[1].equals("")) { @@ -329,10 +296,8 @@ public class NpcInfo extends AbstractMaskPacket title = title.replace(NpcData.getInstance().getTemplate(_npc.getId()).getTitle(), _localisation[1]); } } - packet.writeS(title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -351,7 +316,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -366,20 +331,20 @@ public class NpcInfo extends AbstractMaskPacket if (containsMask(NpcInfoType.EQUIPPED)) { packet.writeD(_npc.getRightHandItem()); - packet.writeD(0x00); // Armor id? + packet.writeD(0); // Armor id? packet.writeD(_npc.getLeftHandItem()); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_npc.isDead() ? 0x00 : 0x01); + packet.writeC(_npc.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); + packet.writeC(_npc.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 0x01 : _npc.isFlying() ? 0x02 : 0x00); + packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -391,7 +356,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_npc.isFlying() ? 0x01 : 0x00); + packet.writeD(_npc.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { @@ -427,12 +392,12 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(0x00); // 2 - do some animation on spawn + packet.writeC(0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -464,12 +429,10 @@ public class NpcInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java index c95a8e5274..923e9cebad 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class NpcInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_npc.getObjectId()); packet.writeD(_npc.getTransformationDisplayId()); - final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size()); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java index a294edc57a..2a0ba41eeb 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java @@ -38,7 +38,6 @@ public class NpcQuestHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NPC_QUEST_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_questId); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java index d3328ade97..fc6d0d4a3a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java @@ -106,7 +106,6 @@ public class NpcSay implements IClientOutgoingPacket { _parameters = new ArrayList<>(); } - for (String item : params) { if ((item != null) && (item.length() > 0)) @@ -127,11 +126,9 @@ public class NpcSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_SAY.writeId(packet); - packet.writeD(_objectId); packet.writeD(_textType.getClientId()); packet.writeD(_npcId); - // Localisation related. if (_lang != null) { @@ -147,7 +144,6 @@ public class NpcSay implements IClientOutgoingPacket } } } - packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java index 356e3f48a9..ac61f9d247 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java @@ -33,11 +33,10 @@ public class ObservationMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_START.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me packet.writeD(0xc0); // TODO: Find me return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java index 5c0a0766b3..896ccea02b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java @@ -33,7 +33,6 @@ public class ObservationReturn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_END.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java index c2f7ab404f..173772c870 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java @@ -37,7 +37,6 @@ public class OnEventTrigger implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EVENT_TRIGGER.writeId(packet); - packet.writeD(_emitterId); packet.writeC(_enabled); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index fbb5c84dfe..37d4fea9cf 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -45,7 +45,6 @@ public class PackageSendableList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java index a53f589386..e24d63f717 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java @@ -39,7 +39,6 @@ public class PackageToList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_TO_LIST.writeId(packet); - packet.writeD(_players.size()); for (Entry entry : _players.entrySet()) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 655c7abcd1..44b23b37f4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -55,7 +55,6 @@ public class PartyMemberPosition implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); - packet.writeD(locations.size()); for (Entry entry : locations.entrySet()) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java index 9e275ec246..c9d3595037 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java @@ -36,7 +36,6 @@ public class PartyRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java index 2233054c14..76c4555d3b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java @@ -36,12 +36,10 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ADD.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); // c3 packet.writeD(_party.getDistributionType().getId()); // c3 packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); - packet.writeD((int) _member.getCurrentCp()); // c4 packet.writeD(_member.getMaxCp()); // c4 packet.writeD((int) _member.getCurrentHp()); @@ -51,9 +49,9 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket packet.writeD(_member.getVitalityPoints()); packet.writeC(_member.getLevel()); packet.writeH(_member.getClassId().getId()); - packet.writeC(0x00); + packet.writeC(0); packet.writeH(_member.getRace().ordinal()); - packet.writeD(0x00); // 228 + packet.writeD(0); // 228 return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java index e806018375..3a47801de1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java @@ -37,21 +37,17 @@ public class PartySmallWindowAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ALL.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); packet.writeC(_party.getDistributionType().getId()); packet.writeC(_party.getMemberCount() - 1); - for (Player member : _party.getMembers()) { if ((member != null) && (member != _exclude)) { packet.writeD(member.getObjectId()); packet.writeS(member.getName()); - packet.writeD((int) member.getCurrentCp()); // c4 packet.writeD(member.getMaxCp()); // c4 - packet.writeD((int) member.getCurrentHp()); packet.writeD(member.getMaxHp()); packet.writeD((int) member.getCurrentMp()); @@ -59,10 +55,9 @@ public class PartySmallWindowAll implements IClientOutgoingPacket packet.writeD(member.getVitalityPoints()); packet.writeC(member.getLevel()); packet.writeH(member.getClassId().getId()); - packet.writeC(0x01); // Unk + packet.writeC(1); // Unk packet.writeH(member.getRace().ordinal()); - packet.writeD(0x00); // 228 - + packet.writeD(0); // 228 final Summon pet = member.getPet(); packet.writeD(member.getServitors().size() + (pet != null ? 1 : 0)); // Summon size, one only atm if (pet != null) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java index 94a8a5a2ce..09ce132af4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java @@ -33,7 +33,6 @@ public class PartySmallWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_DELETE.writeId(packet); - packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java index c53c6c7779..e9ea2efbbe 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java @@ -42,7 +42,6 @@ public class PartySmallWindowUpdate extends AbstractMaskPacket _summon.getStat().getExp()) { packet.writeQ(_summon.getStat().getExp()); // 0% absolute value @@ -160,11 +148,8 @@ public class PetInfo implements IClientOutgoingPacket { packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value } - packet.writeQ(_summon.getExpForNextLevel()); // 100% absoulte value - - packet.writeC(0x00); // 286 - + packet.writeC(0); // 286 packet.writeD(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight packet.writeD(_summon.getMaxLoad()); // max weight it can carry packet.writeD(_summon.getPAtk()); // patk @@ -180,25 +165,20 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD((int) _summon.getStat().getMoveSpeed()); // speed packet.writeD(_summon.getPAtkSpd()); // atkspeed packet.writeD(_summon.getMAtkSpd()); // casting speed - packet.writeC(0); // TODO: Check me, might be ride status packet.writeC(_summon.getTeam().getId()); // Confirmed packet.writeC(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed packet.writeC(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed - - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. - + packet.writeD(0); // TODO: Find me + packet.writeD(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. packet.writeC(_summon.getOwner().getSummonPoints()); // Used Summon Points packet.writeC(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points - final Set aves = _summon.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeH(aves.size()); // Confirmed for (AbnormalVisualEffect ave : aves) { packet.writeH(ave.getClientId()); // Confirmed } - packet.writeC(_statusMask); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 5b43daa74b..1f60ec39d1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -46,7 +46,6 @@ public class PetInventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.PET_INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index e4cf35779f..16dc83b7ed 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -35,7 +35,6 @@ public class PetItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java index fdb00ddbb1..913f65d470 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java @@ -38,7 +38,6 @@ public class PetStatusShow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_SHOW.writeId(packet); - packet.writeD(_summonType); packet.writeD(_summonObjectId); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 25c2c74292..823a8c405a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -52,7 +52,6 @@ public class PetStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_UPDATE.writeId(packet); - packet.writeD(_summon.getSummonType()); packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getX()); @@ -69,7 +68,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket packet.writeQ(_summon.getStat().getExp()); packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value packet.writeQ(_summon.getExpForNextLevel()); // 100% absolute value - packet.writeD(0x01); // TODO: Find me! + packet.writeD(1); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java index 4bc3570779..0898b01f67 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java @@ -63,7 +63,6 @@ public class PlaySound implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLAY_SOUND.writeId(packet); - packet.writeD(_unknown1); // unknown 0 for quest and ship; packet.writeS(_soundFile); packet.writeD(_unknown3); // unknown 0 for quest; 1 for ship; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java index fbe57d4aaf..5108fe7e1b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java @@ -44,7 +44,6 @@ public class PledgeCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java index aa11b1213e..6805f64d7c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java @@ -34,7 +34,6 @@ public class PledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_INFO.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getId()); packet.writeS(_clan.getName()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java index 7ae6a0d284..b28dbf33c3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java @@ -36,7 +36,6 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_MEMBER_INFO.writeId(packet); - packet.writeD(_member.getPledgeType()); packet.writeS(_member.getName()); packet.writeS(_member.getTitle()); // title diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java index eefd482979..6aa5067c8f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java @@ -36,7 +36,6 @@ public class PledgeReceivePowerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_POWER_INFO.writeId(packet); - packet.writeD(_member.getPowerGrade()); // power grade packet.writeS(_member.getName()); packet.writeD(_member.getClan().getRankPrivs(_member.getPowerGrade()).getBitmask()); // privileges diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 79d478aff9..f9387ea1d8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -40,8 +40,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_SUB_PLEDGE_CREATED.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); packet.writeD(_subPledge.getId()); packet.writeS(_subPledge.getName()); packet.writeS(getLeaderName()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java index 4d0efeb82a..7649947064 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java @@ -43,7 +43,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(packet); - packet.writeD(_tab); // page packet.writeD(_clanList.size()); for (ClanWar clanWar : _clanList) @@ -53,7 +52,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket { continue; } - packet.writeS(clan.getName()); packet.writeD(clanWar.getState().ordinal()); // type: 0 = Declaration, 1 = Blood Declaration, 2 = In War, 3 = Victory, 4 = Defeat, 5 = Tie, 6 = Error packet.writeD(clanWar.getRemainingTime()); // Time if friends to start remaining diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java index 2cbbdbf046..80d10fcb66 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java @@ -34,26 +34,25 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_INFO_UPDATE.writeId(packet); - // sending empty data so client will ask all the info in response ;) packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getLevel()); // clan level packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); // castle state ? + packet.writeD(0); // castle state ? packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); // clan reputation score - packet.writeD(0x00); // ? - packet.writeD(0x00); // ? + packet.writeD(0); // ? + packet.writeD(0); // ? packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); // c5 packet.writeD(_clan.getAllyCrestId()); // c5 packet.writeD(_clan.isAtWar() ? 1 : 0); // c5 - packet.writeD(0x00); // TODO: Find me! - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java index ae26e50dbb..2fa9f26d4a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java @@ -51,12 +51,11 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ADD.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); - packet.writeD(0x00); - packet.writeD(0x01); + packet.writeD(0); + packet.writeD(1); packet.writeD(_isOnline); // 1 = online 0 = offline packet.writeD(_pledgeType); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index 971d88c53d..8880e7853d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -57,30 +57,27 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(packet); - - packet.writeD(0x00); // _isSubPledge + packet.writeD(0); // _isSubPledge packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_name); packet.writeS(_leaderName); - packet.writeD(_clan.getCrestId()); // crest id .. is used again packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); // 0 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(0); // 0 packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.isAtWar() ? 1 : 0); // new c3 - packet.writeD(0x00); // Territory castle ID - + packet.writeD(0); // Territory castle ID packet.writeD(_members.size()); for (ClanMember m : _members) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java index 0fd387e419..154bcc610d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java @@ -32,7 +32,6 @@ public class PledgeShowMemberListDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_DELETE.writeId(packet); - packet.writeS(_player); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java index 9789e1e951..beefd2b6bd 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java @@ -50,7 +50,6 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index 4e89797e45..09f70ea024 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -62,14 +62,14 @@ public class PledgeSkillList implements IClientOutgoingPacket { packet.writeD(sk.getDisplayId()); packet.writeH(sk.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } for (SubPledgeSkill sk : _subSkills) { packet.writeD(sk._subType); // Clan Sub-unit types packet.writeD(sk._skillId); packet.writeH(sk._skillLevel); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java index f3b8d4c26c..a94601294f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java @@ -37,7 +37,6 @@ public class PledgeSkillListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST_ADD.writeId(packet); - packet.writeD(_id); packet.writeD(_level); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java index 9e1b4843ac..5f32f2bf54 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java @@ -33,15 +33,14 @@ public class PledgeStatusChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_STATUS_CHANGED.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getLeaderId()); packet.writeD(_clan.getId()); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getAllyId()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.getCrestLargeId()); - packet.writeD(0x00); // pledge type ? + packet.writeD(0); // pledge type ? return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java index 5b56d0b28d..41d0f9f7d8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java @@ -44,12 +44,10 @@ public class PrivateStoreListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_LIST.writeId(packet); - packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); // Viewer's item count? + packet.writeD(0); // Viewer's item count? packet.writeD(_items.size()); - int slotNumber = 0; for (TradeItem item : _items) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 67b6ba8d94..d72050283e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -43,11 +43,10 @@ public class PrivateStoreListSell extends AbstractItemPacket else { OutgoingPackets.PRIVATE_STORE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index d05590cbde..df056c2e43 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -60,13 +60,13 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket { packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); + packet.writeD(0); for (Item item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item2 : _buyList) { writeItem(packet, item2); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index d8768104a4..6bbabb282b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -63,13 +63,13 @@ public class PrivateStoreManageListSell extends AbstractItemPacket packet.writeD(_objId); packet.writeD(_packageSale ? 1 : 0); packet.writeQ(_playerAdena); - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item2 : _sellList) { writeItem(packet, item2); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java index 8a5b9eef92..0d7bcbea16 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgBuy implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java index b00bd2add2..8fdb5701b8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgSell implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PvpBookList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PvpBookList.java index ac5e01a6a3..5d84e6471a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PvpBookList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PvpBookList.java @@ -32,7 +32,6 @@ public class PvpBookList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PVPBOOK_LIST.writeId(packet); - final int size = 1; packet.writeD(4); // show killer's location count packet.writeD(5); // teleport count diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java index c3958367e8..5ddaa46ba0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java @@ -40,7 +40,6 @@ public class RadarControl implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RADAR_CONTROL.writeId(packet); - packet.writeD(_showRadar); packet.writeD(_type); // maybe type packet.writeD(_x); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java index c7e4525bf2..bcfd911f58 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java @@ -40,10 +40,8 @@ public class RecipeBookItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_BOOK_ITEM_LIST.writeId(packet); - - packet.writeD(_isDwarvenCraft ? 0x00 : 0x01); // 0 = Dwarven - 1 = Common + packet.writeD(_isDwarvenCraft ? 0 : 1); // 0 = Dwarven - 1 = Common packet.writeD(_maxMp); - if (_recipes == null) { packet.writeD(0); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index d9c2621c84..a4e4641944 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -78,7 +78,6 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(_offeringMaximumAdena); // Adena worth of items for maximum offering. return true; } - PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java index a24ba356ef..ab67f9bff3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java @@ -50,7 +50,6 @@ public class RecipeShopItemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_ITEM_INFO.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD(_recipeId); packet.writeD((int) _manufacturer.getCurrentMp()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java index aac30faf53..ec67224b1e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java @@ -57,11 +57,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MANAGE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD((int) _seller.getAdena()); - packet.writeD(_isDwarven ? 0x00 : 0x01); - + packet.writeD(_isDwarven ? 0 : 1); if ((_recipes == null) || _recipes.isEmpty()) { packet.writeD(0); @@ -69,7 +67,6 @@ public class RecipeShopManageList implements IClientOutgoingPacket else { packet.writeD(_recipes.size()); // number of items in recipe book - int i = 1; for (RecipeHolder recipe : _recipes) { @@ -77,10 +74,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket packet.writeD(i++); } } - if ((_manufacture == null) || _manufacture.isEmpty()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -88,7 +84,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket for (Entry item : _manufacture) { packet.writeD(item.getKey()); - packet.writeD(0x00); // CanCraft? + packet.writeD(0); // CanCraft? packet.writeQ(item.getValue()); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java index c025b5e4ed..2b9bc5b6e7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java @@ -33,7 +33,6 @@ public class RecipeShopMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MSG.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeS(_player.getStoreName()); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java index 07ba331de9..8f504ce103 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java @@ -37,14 +37,13 @@ public class RecipeShopSellList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_SELL_LIST.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD((int) _manufacturer.getCurrentMp()); // Creator's MP packet.writeD(_manufacturer.getMaxMp()); // Creator's MP packet.writeQ(_buyer.getAdena()); // Buyer Adena if (!_manufacturer.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -52,7 +51,7 @@ public class RecipeShopSellList implements IClientOutgoingPacket for (Entry item : _manufacturer.getManufactureItems().entrySet()) { packet.writeD(item.getKey()); - packet.writeD(0x00); // CanCreate? + packet.writeD(0); // CanCreate? packet.writeQ(item.getValue()); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 1f19ffc899..393947e0bd 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -88,7 +88,6 @@ public class RelationChanged implements IClientOutgoingPacket { return; } - final Relation r = new Relation(); r._objId = activeChar.getObjectId(); r._relation = relation; @@ -102,7 +101,6 @@ public class RelationChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RELATION_CHANGED.writeId(packet); - packet.writeC(_mask); if (_multi == null) { @@ -122,7 +120,6 @@ public class RelationChanged implements IClientOutgoingPacket private void writeRelation(PacketWriter packet, Relation relation) { packet.writeD(relation._objId); - if ((_mask & SEND_DEFAULT) != SEND_DEFAULT) { packet.writeQ(relation._relation); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java index b4e9dc25c5..4477cfb705 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java @@ -35,7 +35,6 @@ public class RequestEnchant implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java index 4ef15fb74c..7a0a6cbe58 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java @@ -33,7 +33,6 @@ public class Revive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.REVIVE.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java index 9c409601e3..b9ddf7733f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java @@ -42,7 +42,6 @@ public class Ride implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RIDE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_mounted); packet.writeD(_rideType); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 813ce03f4d..13ef62f55f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -49,11 +49,9 @@ public class SellListProcure implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SELL_LIST_PROCURE.writeId(packet); - packet.writeQ(_money); // money - packet.writeD(0x00); // lease ? + packet.writeD(0); // lease ? packet.writeH(_sellList.size()); // list size - for (Entry entry : _sellList.entrySet()) { final Item item = entry.getKey(); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java index baa37a8507..75b5b07854 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java @@ -39,12 +39,10 @@ public class SendMacroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MACRO_LIST.writeId(packet); - packet.writeC(_updateType.getId()); - packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0x00); // modified, created or deleted macro's id + packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0); // modified, created or deleted macro's id packet.writeC(_count); // count of Macros packet.writeC(_macro != null ? 1 : 0); // unknown - if ((_macro != null) && (_updateType != MacroUpdateType.DELETE)) { packet.writeD(_macro.getId()); // Macro ID @@ -52,9 +50,7 @@ public class SendMacroList implements IClientOutgoingPacket packet.writeS(_macro.getDescr()); // Desc packet.writeS(_macro.getAcronym()); // acronym packet.writeD(_macro.getIcon()); // icon - packet.writeC(_macro.getCommands().size()); // count - int i = 1; for (MacroCmd cmd : _macro.getCommands()) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java index 47fada25be..21622b5f19 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java @@ -32,7 +32,6 @@ public class SendTradeRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_REQUEST.writeId(packet); - packet.writeD(_senderId); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java index 69aa749406..1513a0e3d1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java @@ -55,7 +55,6 @@ public class ServerObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SERVER_OBJECT_INFO.writeId(packet); - packet.writeD(_activeChar.getObjectId()); packet.writeD(_displayId + 1000000); packet.writeS(_name); // name @@ -70,8 +69,8 @@ public class ServerObjectInfo implements IClientOutgoingPacket packet.writeF(_collisionHeight); packet.writeD((int) (_isAttackable ? _activeChar.getCurrentHp() : 0)); packet.writeD(_isAttackable ? _activeChar.getMaxHp() : 0); - packet.writeD(0x01); // object type - packet.writeD(0x00); // special effects + packet.writeD(1); // object type + packet.writeD(0); // special effects return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java index 88b370ad8b..0164e5c4a2 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java @@ -34,7 +34,6 @@ public class SetSummonRemainTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SET_SUMMON_REMAIN_TIME.writeId(packet); - packet.writeD(_maxTime); packet.writeD(_remainingTime); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java index db28b72acf..016f5a0c9a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java @@ -38,7 +38,6 @@ public class ShopPreviewInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_INFO.writeId(packet); - packet.writeD(Inventory.PAPERDOLL_TOTALSLOTS); // Slots packet.writeD(getFromList(Inventory.PAPERDOLL_UNDER)); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index 358ee2361b..3e7efda220 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -49,11 +49,9 @@ public class ShopPreviewList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_LIST.writeId(packet); - packet.writeD(5056); packet.writeQ(_money); // current money packet.writeD(_listId); - int newlength = 0; for (Product product : _list) { @@ -63,23 +61,20 @@ public class ShopPreviewList implements IClientOutgoingPacket } } packet.writeH(newlength); - for (Product product : _list) { if (product.getItem().isEquipable()) { packet.writeD(product.getItemId()); packet.writeH(product.getItem().getType2()); // item type2 - if (product.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { packet.writeQ(product.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } else { - packet.writeQ(0x00); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand + packet.writeQ(0); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } - packet.writeQ(Config.WEAR_PRICE); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 298301ed0d..b13080ff28 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -40,7 +40,6 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_BUFF_STATUS_UPDATE.writeId(packet); - packet.writeD(_skillId); packet.writeH(_skillLevel); packet.writeH(_skillSubLevel); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index 33d36611b8..be5e1fadab 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -33,7 +33,6 @@ public class ShortCutInit implements IClientOutgoingPacket { return; } - _shortCuts = player.getAllShortCuts(); } @@ -41,26 +40,23 @@ public class ShortCutInit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); packet.writeD(sc.getSlot() + (sc.getPage() * 12)); - - packet.writeC(0x00); // 228 - + packet.writeC(0); // 228 switch (sc.getType()) { case ITEM: { packet.writeD(sc.getId()); - packet.writeD(0x01); // Enabled or not + packet.writeD(1); // Enabled or not packet.writeD(sc.getSharedReuseGroup()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeQ(0x00); // Augment id - packet.writeD(0x00); // Visual id + packet.writeD(0); + packet.writeD(0); + packet.writeQ(0); // Augment id + packet.writeD(0); // Visual id break; } case SKILL: @@ -69,8 +65,8 @@ public class ShortCutInit implements IClientOutgoingPacket packet.writeH(sc.getLevel()); packet.writeH(sc.getSubLevel()); packet.writeD(sc.getSharedReuseGroup()); - packet.writeC(0x00); // C5 - packet.writeD(0x01); // C6 + packet.writeC(0); // C5 + packet.writeD(1); // C6 break; } case ACTION: @@ -79,7 +75,7 @@ public class ShortCutInit implements IClientOutgoingPacket case BOOKMARK: { packet.writeD(sc.getId()); - packet.writeD(0x01); // C6 + packet.writeD(1); // C6 } } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java index 7f584f966f..f85ada83c7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java @@ -37,12 +37,9 @@ public class ShortCutRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_REGISTER.writeId(packet); - packet.writeD(_shortcut.getType().ordinal()); packet.writeD(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client - - packet.writeC(0x00); // 228 - + packet.writeC(0); // 228 switch (_shortcut.getType()) { case ITEM: @@ -50,10 +47,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeD(_shortcut.getId()); packet.writeD(_shortcut.getCharacterType()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeD(0x00); // unknown - packet.writeD(0x00); // unknown - packet.writeD(0x00); // item augment id - packet.writeD(0x00); // TODO: Find me, item visual id ? + packet.writeD(0); // unknown + packet.writeD(0); // unknown + packet.writeD(0); // item augment id + packet.writeD(0); // TODO: Find me, item visual id ? break; } case SKILL: @@ -62,10 +59,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeH(_shortcut.getLevel()); packet.writeH(_shortcut.getSubLevel()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeC(0x00); // C5 + packet.writeC(0); // C5 packet.writeD(_shortcut.getCharacterType()); - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me + packet.writeD(0); // TODO: Find me break; } case ACTION: diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java index d6f71b5f70..cfae3b3fad 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java @@ -54,7 +54,6 @@ public class ShowBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - packet.writeC(_showBoard); // c4 1 to show community 00 to hide packet.writeS("bypass _bbshome"); // top packet.writeS("bypass _bbsgetfav"); // favorite diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java index 4b62a7001b..4d62e99d7a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java @@ -32,7 +32,6 @@ public class ShowCalculator implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_CALC.writeId(packet); - packet.writeD(_calculatorId); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java index 55f58d5375..4574762467 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java @@ -32,9 +32,8 @@ public class ShowMiniMap implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_MINIMAP.writeId(packet); - packet.writeD(_mapId); - packet.writeC(0x00); // Seven Signs state + packet.writeC(0); // Seven Signs state return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java index 303eab4e8a..97100d09d2 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java @@ -34,7 +34,6 @@ public class ShowPCCafeCouponShowUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_PCCAFE_COUPON_SHOW_UI.writeId(packet); - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java index d86958e586..0a0f3ae861 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java @@ -35,7 +35,6 @@ public class ShowXMasSeal implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_XMAS_SEAL.writeId(packet); - packet.writeD(_item); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java index 66eccc7fbf..1baa030c4d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java @@ -28,9 +28,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = ca
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Attackers Clans?
* d = Number of Attackers Clans
* { //repeats
@@ -58,11 +58,10 @@ public class SiegeAttackerList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _castle.getSiege().getAttackerClans().size(); if (size > 0) { @@ -76,12 +75,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -90,8 +88,8 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index 5d5c831f14..8afd1f38ce 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -29,9 +29,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = 0xcb
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Defending Clans?
* d = Number of Defending Clans
* { //repeats
@@ -60,16 +60,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // Unknown - packet.writeD(0x01); // Unknown - packet.writeD(0x00); // Unknown - + packet.writeD(0); // Unknown + packet.writeD(1); // Unknown + packet.writeD(0); // Unknown final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0); packet.writeD(size); packet.writeD(size); - // Add owners final Clan ownerClan = _castle.getOwner(); if (ownerClan != null) @@ -78,14 +75,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket packet.writeS(ownerClan.getName()); packet.writeS(ownerClan.getLeaderName()); packet.writeD(ownerClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.OWNER.ordinal()); packet.writeD(ownerClan.getAllyId()); packet.writeS(ownerClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(ownerClan.getAllyCrestId()); } - // List of confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans()) { @@ -94,19 +90,17 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(defendingClan.getAllyCrestId()); } - // List of not confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans()) { @@ -115,12 +109,11 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER_PENDING.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 0a3fe46cb7..dfeefdaecf 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -59,13 +59,11 @@ public class SiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_INFO.writeId(packet); - if (_castle != null) { packet.writeD(_castle.getResidenceId()); - final int ownerId = _castle.getOwnerId(); - packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 0x01 : 0x00); + packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0); packet.writeD(ownerId); if (ownerId > 0) { @@ -89,7 +87,6 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { @@ -97,7 +94,7 @@ public class SiegeInfo implements IClientOutgoingPacket cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis()); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(Config.SIEGE_HOUR_LIST.size()); for (int hour : Config.SIEGE_HOUR_LIST) { @@ -108,7 +105,7 @@ public class SiegeInfo implements IClientOutgoingPacket else { packet.writeD((int) (_castle.getSiegeDate().getTimeInMillis() / 1000)); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index d11b3817c0..3c4c475339 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -51,12 +51,11 @@ public class SkillCoolTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SKILL_COOL_TIME.writeId(packet); - packet.writeD(_skillReuseTimeStamps.size()); for (TimeStamp ts : _skillReuseTimeStamps) { packet.writeD(ts.getSkillId()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD((int) ts.getReuse() / 1000); packet.writeD((int) Math.max(ts.getStamp() - _currentTime, 0) / 1000); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index de54232b51..ed4615c403 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -41,10 +41,9 @@ public class Snoop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SNOOP.writeId(packet); - packet.writeD(_convoId); packet.writeS(_name); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_type.getClientId()); packet.writeS(_speaker); packet.writeS(_msg); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java index 37827bdf6c..52f15519a5 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java @@ -37,10 +37,9 @@ public class SocialAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SOCIAL_ACTION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_actionId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index fd7e43a153..19066f5f85 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -33,16 +33,15 @@ public class SpawnItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPAWN_ITEM.writeId(packet); - packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeD(_item.isStackable() ? 0x01 : 0x00); + packet.writeD(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java index ccae75b850..04f3ad716c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java @@ -110,7 +110,6 @@ public class SpecialCamera implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPECIAL_CAMERA.writeId(packet); - packet.writeD(_id); packet.writeD(_force); packet.writeD(_angle1); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java index cdd3821740..281756e793 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java @@ -34,7 +34,6 @@ public class StartPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_PLEDGE_WAR.writeId(packet); - packet.writeS(_playerName); packet.writeS(_pledgeName); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java index 48b4238eea..27fb4f606b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java @@ -38,7 +38,6 @@ public class StartRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_side); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java index b4f421df36..067bdeb082 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java @@ -72,7 +72,6 @@ public class StaticObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATIC_OBJECT.writeId(packet); - packet.writeD(_staticObjectId); packet.writeD(_objectId); packet.writeD(_type); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index 928b54aa48..40836e4af8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -46,7 +46,6 @@ public class StatusUpdate implements IClientOutgoingPacket public void addUpdate(StatusUpdateType type, int level) { _updates.put(type, level); - if (_isPlayable) { switch (type) @@ -75,10 +74,9 @@ public class StatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATUS_UPDATE.writeId(packet); - packet.writeD(_objectId); // casterId - packet.writeD(_isVisible ? _casterObjectId : 0x00); - packet.writeC(_isVisible ? 0x01 : 0x00); + packet.writeD(_isVisible ? _casterObjectId : 0); + packet.writeC(_isVisible ? 1 : 0); packet.writeC(_updates.size()); for (Entry entry : _updates.entrySet()) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java index 9919307366..cf2b71df5a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java @@ -53,7 +53,6 @@ public class StopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java index 50fdc3fe4c..78fdb5d70c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java @@ -43,7 +43,6 @@ public class StopMoveInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java index 9c828c3962..b254cad8b1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java @@ -34,7 +34,6 @@ public class StopPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java index b0392de226..ca69cd5346 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java @@ -36,7 +36,6 @@ public class StopRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FINISH_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_speed); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index 4b332d0467..377301825d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -43,10 +43,8 @@ public class SummonInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class SummonInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class SummonInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,11 +154,9 @@ public class SummonInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - // Show red aura? - // if (_statusMask != 0) + // if (_statusMask != 0x00) // { // addComponentType(NpcInfoType.VISUAL_STATE); // } @@ -229,28 +206,24 @@ public class SummonInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.SUMMON_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0x00); + packet.writeQ(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -269,7 +242,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -285,19 +258,19 @@ public class SummonInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -309,20 +282,20 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -346,12 +319,12 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -381,12 +354,10 @@ public class SummonInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java index 864462f76f..6f88551204 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java @@ -34,7 +34,6 @@ public class SurrenderPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SURRENDER_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 746b2da3f7..b509d599db 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -161,7 +161,6 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } - _params[_paramIndex++] = param; } @@ -267,7 +266,6 @@ public class SystemMessage implements IClientOutgoingPacket { return addString(item.getName()); } - append(new SMParam(TYPE_ITEM_NAME, id)); return this; } @@ -389,7 +387,6 @@ public class SystemMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SYSTEM_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -402,13 +399,12 @@ public class SystemMessage implements IClientOutgoingPacket params[i] = _params[i].getValue(); } packet.writeH(SystemMessageId.S1_2.getId()); - packet.writeC(0x01); + packet.writeC(1); packet.writeC(TYPE_TEXT); packet.writeS(sml.getLocalisation(params)); return true; } } - packet.writeH(getId()); packet.writeC(_params.length); for (SMParam param : _params) @@ -418,9 +414,7 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } - packet.writeC(param.getType()); - switch (param.getType()) { case TYPE_ELEMENT_NAME: diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java index a91da07e77..d357efbb0e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java @@ -47,13 +47,12 @@ public class TargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_SELECTED.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java index 3dadd249f6..3d7208c06f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java @@ -42,12 +42,11 @@ public class TargetUnselected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_UNSELECTED.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index 943b5078b6..13f9b9565a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -41,14 +41,13 @@ public class TeleportToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TELEPORT_TO_LOCATION.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // Fade 0, Instant 1. + packet.writeD(0); // Fade 0, Instant 1. packet.writeD(_heading); - packet.writeD(0x00); // Unknown. + packet.writeD(0); // Unknown. return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java index cb82f2da59..8d09576d9d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java @@ -32,7 +32,6 @@ public class TradeDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_DONE.writeId(packet); - packet.writeD(_num); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java index 716ed2a099..6a94d2463f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java @@ -41,9 +41,9 @@ public class TradeOtherAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java index 3d0ef0b501..7907f3d498 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java @@ -41,9 +41,9 @@ public class TradeOwnAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c59568bf1d..3822108c5a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -58,7 +58,6 @@ public class TradeStart extends AbstractItemPacket { _mask |= 0x08; } - // Does not shows level if (_partner.isGM()) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java index f8e2a191de..e5ec2376cc 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java @@ -44,10 +44,10 @@ public class TradeUpdate extends AbstractItemPacket { OutgoingPackets.TRADE_UPDATE.writeId(packet); packet.writeC(_sendType); - packet.writeD(0x01); + packet.writeD(1); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2); writeItem(packet, _item, _count); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java index c7102ca385..728020c0b1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java @@ -32,7 +32,6 @@ public class TutorialEnableClientEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_ENABLE_CLIENT_EVENT.writeId(packet); - packet.writeD(_eventId); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java index 92ac75afcf..7cc33a0f80 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java @@ -48,7 +48,6 @@ public class TutorialShowHtml extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_HTML.writeId(packet); - packet.writeD(_type); packet.writeS(getHtml()); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java index 75a57be38b..2ee62835db 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java @@ -37,7 +37,6 @@ public class TutorialShowQuestionMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_QUESTION_MARK.writeId(packet); - packet.writeC(_markType); packet.writeD(_markId); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index d47aa72532..7d19fd9246 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -38,7 +38,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class UserInfo extends AbstractMaskPacket { private Player _player; - private int _relation; private int _runSpd; private int _walkSpd; @@ -52,7 +51,6 @@ public class UserInfo extends AbstractMaskPacket private int _enchantLevel; private int _armorEnchant; private String _title; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -60,7 +58,6 @@ public class UserInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 5; public UserInfo(Player player) @@ -84,6 +81,7 @@ public class UserInfo extends AbstractMaskPacket _enchantLevel = player.getInventory().getWeaponEnchant(); _armorEnchant = player.getInventory().getArmorMinEnchant(); _title = player.getTitle(); + if (player.isGM() && player.isInvisible()) { _title = "[Invisible]"; @@ -139,30 +137,26 @@ public class UserInfo extends AbstractMaskPacket } OutgoingPackets.USER_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_initSize); packet.writeH(28); // 286 - 28 packet.writeB(_masks); - if (containsMask(UserInfoType.RELATION)) { packet.writeD(_relation); } - if (containsMask(UserInfoType.BASIC_INFO)) { packet.writeH(23 + (_player.getAppearance().getVisibleName().length() * 2)); packet.writeString(_player.getName()); - packet.writeC(_player.isGM() ? 0x01 : 0x00); + packet.writeC(_player.isGM() ? 1 : 0); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeD(_player.getLevel()); // 270 packet.writeD(_player.getClassId().getId()); // 286 } - if (containsMask(UserInfoType.BASE_STATS)) { packet.writeH(18); @@ -175,7 +169,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getLUC()); packet.writeH(_player.getCHA()); } - if (containsMask(UserInfoType.MAX_HPCPMP)) { packet.writeH(14); @@ -183,7 +176,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMaxMp()); packet.writeD(_player.getMaxCp()); } - if (containsMask(UserInfoType.CURRENT_HPMPCP_EXP_SP)) { packet.writeH(38); @@ -194,23 +186,20 @@ public class UserInfo extends AbstractMaskPacket packet.writeQ(_player.getExp()); packet.writeF((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel()))); } - if (containsMask(UserInfoType.ENCHANTLEVEL)) { packet.writeH(4); packet.writeC(_enchantLevel); packet.writeC(_armorEnchant); } - if (containsMask(UserInfoType.APPAREANCE)) { packet.writeH(15); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); } - if (containsMask(UserInfoType.STATUS)) { packet.writeH(6); @@ -219,7 +208,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.getCrystallizeGrade() != ItemGrade.NONE ? 1 : 0); packet.writeC(_player.getAbilityPoints() - _player.getAbilityPointsUsed()); } - if (containsMask(UserInfoType.STATS)) { packet.writeH(64); // 270 @@ -237,10 +225,9 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(0x00); // 270 - packet.writeD(0x00); // 270 + packet.writeD(0); // 270 + packet.writeD(0); // 270 } - if (containsMask(UserInfoType.ELEMENTALS)) { packet.writeH(14); @@ -251,7 +238,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getDefenseElementValue(AttributeType.HOLY)); packet.writeH(_player.getDefenseElementValue(AttributeType.DARK)); } - if (containsMask(UserInfoType.POSITION)) { packet.writeH(18); @@ -260,7 +246,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getZ()); packet.writeD(_player.isInVehicle() ? _player.getVehicle().getObjectId() : 0); } - if (containsMask(UserInfoType.SPEED)) { packet.writeH(18); @@ -273,21 +258,18 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_flyRunSpd); packet.writeH(_flyWalkSpd); } - if (containsMask(UserInfoType.MULTIPLIER)) { packet.writeH(18); packet.writeF(_moveMultiplier); packet.writeF(_player.getAttackSpeedMultiplier()); } - if (containsMask(UserInfoType.COL_RADIUS_HEIGHT)) { packet.writeH(18); packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); } - if (containsMask(UserInfoType.ATK_ELEMENTAL)) { packet.writeH(5); @@ -295,7 +277,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); } - if (containsMask(UserInfoType.CLAN)) { packet.writeH(32 + (_title.length() * 2)); @@ -305,12 +286,11 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getClanCrestLargeId()); packet.writeD(_player.getClanCrestId()); packet.writeD(_player.getClanPrivileges().getBitmask()); - packet.writeC(_player.isClanLeader() ? 0x01 : 0x00); + packet.writeC(_player.isClanLeader() ? 1 : 0); packet.writeD(_player.getAllyId()); packet.writeD(_player.getAllyCrestId()); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); } - if (containsMask(UserInfoType.SOCIAL)) { packet.writeH(30); // 228 @@ -330,130 +310,115 @@ public class UserInfo extends AbstractMaskPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeD(0x00); // 228 + packet.writeD(0); // 228 } - if (containsMask(UserInfoType.VITA_FAME)) { packet.writeH(19); // 196 packet.writeD(_player.getVitalityPoints()); - packet.writeC(0x00); // Vita Bonus + packet.writeC(0); // Vita Bonus packet.writeD(_player.getFame()); packet.writeD(_player.getRaidbossPoints()); - packet.writeC(0x00); // 196 + packet.writeC(0); // 196 packet.writeH(_player.getSymbolSealPoints()); // Henna Seal Engraving Gauge - packet.writeC(0x00); // 196 + packet.writeC(0); // 196 } - if (containsMask(UserInfoType.SLOTS)) { packet.writeH(12); // 152 packet.writeC(_player.getInventory().getTalismanSlots()); packet.writeC(_player.getInventory().getBroochJewelSlots()); packet.writeC(_player.getTeam().getId()); - packet.writeD(0x00); - + packet.writeD(0); if (_player.getInventory().getAgathionSlots() > 0) { - packet.writeC(0x01); // Charm slots + packet.writeC(1); // Charm slots packet.writeC(_player.getInventory().getAgathionSlots() - 1); packet.writeC(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152 } else { - packet.writeC(0x00); // Charm slots - packet.writeC(0x00); + packet.writeC(0); // Charm slots + packet.writeC(0); packet.writeC(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152 } } - if (containsMask(UserInfoType.MOVEMENTS)) { packet.writeH(4); packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); - packet.writeC(_player.isRunning() ? 0x01 : 0x00); + packet.writeC(_player.isRunning() ? 1 : 0); } - if (containsMask(UserInfoType.COLOR)) { packet.writeH(10); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); } - if (containsMask(UserInfoType.INVENTORY_LIMIT)) { packet.writeH(13); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); packet.writeH(_player.getInventoryLimit()); - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 } - if (containsMask(UserInfoType.TRUE_HERO)) { packet.writeH(9); - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeC(_player.isTrueHero() ? 100 : 0x00); + packet.writeD(0); + packet.writeH(0); + packet.writeC(_player.isTrueHero() ? 100 : 0); } - if (containsMask(UserInfoType.ATT_SPIRITS)) // 152 { packet.writeH(26); packet.writeD(-1); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - if (containsMask(UserInfoType.RANKING)) // 196 { packet.writeH(6); packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : RankManager.getInstance().getPlayerClassRank(_player) == 1 ? 4 : 0); } - if (containsMask(UserInfoType.STAT_POINTS)) // 235 { packet.writeH(16); - packet.writeH(0x00); // Usable points? - packet.writeH(0x00); // STR points - packet.writeH(0x00); // DEX points - packet.writeH(0x00); // CON points - packet.writeH(0x00); // INT points - packet.writeH(0x00); // WIT points - packet.writeH(0x00); // MEN points + packet.writeH(0); // Usable points? + packet.writeH(0); // STR points + packet.writeH(0); // DEX points + packet.writeH(0); // CON points + packet.writeH(0); // INT points + packet.writeH(0); // WIT points + packet.writeH(0); // MEN points } - if (containsMask(UserInfoType.STAT_ABILITIES)) // 235 { packet.writeH(18); - packet.writeH(0x00); // STR additional - packet.writeH(0x00); // DEX additional - packet.writeH(0x00); // CON additional - packet.writeH(0x00); // INT additional - packet.writeH(0x00); // WIT additional - packet.writeH(0x00); // MEN additional - packet.writeH(0x00); // ? - packet.writeH(0x00); // ? + packet.writeH(0); // STR additional + packet.writeH(0); // DEX additional + packet.writeH(0); // CON additional + packet.writeH(0); // INT additional + packet.writeH(0); // WIT additional + packet.writeH(0); // MEN additional + packet.writeH(0); // ? + packet.writeH(0); // ? } - if (containsMask(UserInfoType.ELIXIR_USED)) // 286 { packet.writeH(1); - packet.writeD(0x00); + packet.writeD(0); } - // Send exp bonus change. if (containsMask(UserInfoType.VITA_FAME)) { @@ -461,7 +426,6 @@ public class UserInfo extends AbstractMaskPacket _player.sendPacket(new ExUserBoostStat(_player, BonusExpType.BUFFS)); _player.sendPacket(new ExUserBoostStat(_player, BonusExpType.PASSIVE)); } - return true; } @@ -478,7 +442,6 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x10; // Party leader } } - if (clan != null) { relation |= 0x20; // Clan member @@ -487,12 +450,10 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x40; // Clan leader } } - if (player.isInSiege()) { relation |= 0x80; // In siege } - return relation; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java index 283bcf1614..90c416726a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java @@ -36,7 +36,6 @@ public class ValidateLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java index 4d8f9683d0..83f72bf981 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java @@ -40,7 +40,6 @@ public class ValidateLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java index b684e70bdc..71367cd26d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java @@ -36,7 +36,6 @@ public class VehicleCheckLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_CHECK_LOCATION.writeId(packet); - packet.writeD(_boat.getObjectId()); packet.writeD(_boat.getX()); packet.writeD(_boat.getY()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java index a4a5780f30..5b565c08b7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java @@ -46,7 +46,6 @@ public class VehicleDeparture implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_DEPARTURE.writeId(packet); - packet.writeD(_objId); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java index ec611028bf..4a995a6352 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java @@ -44,7 +44,6 @@ public class VehicleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java index 207a6fd899..bf629dcbbc 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java @@ -42,7 +42,6 @@ public class VehicleStarted implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_START.writeId(packet); - packet.writeD(_objectId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 35ca986d35..5eb9eb7ab9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -30,6 +30,7 @@ public class WareHouseDepositList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; public static final int FREIGHT = 1; + private final int _sendType; private final long _playerAdena; private final List _items = new ArrayList<>(); @@ -49,7 +50,6 @@ public class WareHouseDepositList extends AbstractItemPacket _sendType = sendType; _whType = type; _playerAdena = player.getAdena(); - final boolean isPrivate = _whType == PRIVATE; for (Item temp : player.getInventory().getAvailableItems(true, isPrivate, false)) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 7af1cd273c..5ece99310a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -32,6 +32,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private final int _sendType; private Player _player; private long _playerAdena; @@ -60,7 +61,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } - _items = _player.getActiveWarehouse().getItems(); for (Item item : _items) { @@ -78,15 +78,15 @@ public class WareHouseWithdrawalList extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeH(0x00); + packet.writeH(0); packet.writeD(_invSize); packet.writeD(_items.size()); for (Item item : _items) { writeItem(packet, item); packet.writeD(item.getObjectId()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } else diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java index 7442882a70..bd10e174c6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java @@ -59,7 +59,6 @@ public class ExAcquireAPSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_AP_SKILL_LIST.writeId(packet); - packet.writeD(_enable ? 1 : 0); packet.writeQ(Config.ABILITY_POINTS_RESET_SP); // Changed to from Adena to SP on Grand Crusade // packet.writeQ(_price); Removed on Grand Crusade diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java index f9af89e4db..ff296bf632 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java @@ -35,7 +35,6 @@ public class ExCloseAPListWnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_AP_LIST_WND.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java index d72baf2a44..69c47ce99f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java @@ -35,7 +35,6 @@ public class ExShowAPListWnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AP_LIST_WND.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java index 5f2dd05f3b..aea1476fb2 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java @@ -35,8 +35,7 @@ public class ExDivideAdenaCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_CANCEL.writeId(packet); - - packet.writeC(0x00); // TODO: Find me + packet.writeC(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java index 6af912cebf..de4e955aba 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java @@ -46,9 +46,8 @@ public class ExDivideAdenaDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_DONE.writeId(packet); - - packet.writeC(_isPartyLeader ? 0x01 : 0x00); - packet.writeC(_isCCLeader ? 0x01 : 0x00); + packet.writeC(_isPartyLeader ? 1 : 0); + packet.writeC(_isCCLeader ? 1 : 0); packet.writeD(_memberCount); packet.writeQ(_distributedAdenaCount); packet.writeQ(_adenaCount); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java index ab8a7471d6..32f99abfdc 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java @@ -38,8 +38,7 @@ public class ExAlchemyConversion implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_CONVERSION.writeId(packet); - - packet.writeC((_successCount == 0) && (_failureCount == 0) ? 0x01 : 0x00); + packet.writeC((_successCount == 0) && (_failureCount == 0) ? 1 : 0); packet.writeD(_successCount); packet.writeD(_failureCount); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java index be4a2a57e6..cb3cf4b3e0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java @@ -47,7 +47,6 @@ public class ExTryMixCube implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TRY_MIX_CUBE.writeId(packet); - packet.writeC(_type.ordinal()); packet.writeD(_items.size()); for (AlchemyResult holder : _items) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index 549def456e..84b5fead76 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -43,7 +43,6 @@ public class ExChooseShapeShiftingItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_SHAPE_SHIFTING_ITEM.writeId(packet); - packet.writeD(_targetType != null ? _targetType.ordinal() : 0); packet.writeD(_type != null ? _type.ordinal() : 0); packet.writeD(_itemId); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java index 33fb439aa5..ba55887a1a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java @@ -45,7 +45,6 @@ public class ExCuriousHouseMemberUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_UPDATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_maxHp); packet.writeD(_maxCp); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java index 8ad3659725..be2d29d864 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPacket { - public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0x00); - public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(0x01); + public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0); + public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(1); private final int _result; @@ -39,7 +39,6 @@ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPa public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_EXTRACTION_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java index ec82cc14f3..e84d7a7255 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; public static final ExPutShapeShiftingTargetItemResult FAILED = new ExPutShapeShiftingTargetItemResult(RESULT_FAILED, 0); @@ -43,7 +43,6 @@ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_resultId); packet.writeQ(_price); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java index f4d3118cc4..038eae0042 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExShapeShiftingResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; - public static final int RESULT_CLOSE = 0x02; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; + public static final int RESULT_CLOSE = 2; public static final ExShapeShiftingResult FAILED = new ExShapeShiftingResult(RESULT_FAILED, 0, 0); public static final ExShapeShiftingResult CLOSE = new ExShapeShiftingResult(RESULT_CLOSE, 0, 0); @@ -47,7 +47,6 @@ public class ExShapeShiftingResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHAPE_SHIFTING_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_targetItemId); packet.writeD(_extractItemId); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java index eaf0d209fd..4b48b09002 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java @@ -38,7 +38,7 @@ public class ExConfirmVipAttendanceCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CONFIRM_VIP_ATTENDANCE_CHECK.writeId(packet); - packet.writeC(_available ? 0x01 : 0x00); // can receive reward today? 1 else 0 + packet.writeC(_available ? 1 : 0); // can receive reward today? 1 else 0 packet.writeC(_index); // active reward index packet.writeD(0); packet.writeD(0); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java index 9d61fe68d6..dd94df023f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java @@ -45,10 +45,10 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket OutgoingPackets.EX_VIP_ATTENDANCE_ITEM_LIST.writeId(packet); packet.writeC(_available ? _index + 1 : _index); // index to receive? packet.writeC(_index); // last received index? - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeC(0x01); - packet.writeC(_available ? 0x01 : 0x00); // player can receive reward today? + packet.writeD(0); + packet.writeD(0); + packet.writeC(1); + packet.writeC(_available ? 1 : 0); // player can receive reward today? packet.writeC(250); packet.writeC(AttendanceRewardData.getInstance().getRewardsCount()); // reward size int rewardCounter = 0; @@ -57,11 +57,11 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket rewardCounter++; packet.writeD(reward.getId()); packet.writeQ(reward.getCount()); - packet.writeC(0x01); // is unknown? - packet.writeC((rewardCounter % 7) == 0 ? 0x01 : 0x00); // is last in row? + packet.writeC(1); // is unknown? + packet.writeC((rewardCounter % 7) == 0 ? 1 : 0); // is last in row? } - packet.writeC(0x00); - packet.writeD(0x00); + packet.writeC(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java index 0282966053..9963a080c6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java @@ -41,7 +41,7 @@ public class ExActivateAutoShortcut implements IClientOutgoingPacket { OutgoingPackets.EX_ACTIVATE_AUTO_SHORTCUT.writeId(packet); packet.writeH(_position); - packet.writeC(_active ? 0x01 : 0x00); + packet.writeC(_active ? 1 : 0); return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java index 7f1d6d60d1..73f93335ef 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java @@ -43,7 +43,6 @@ public class ExCuriousHouseMemberList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_LIST.writeId(packet); - packet.writeD(_id); packet.writeD(_maxPlayers); packet.writeD(_players.size()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java index b71caa5f14..5d9b34db61 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java @@ -37,7 +37,6 @@ public class ExCuriousHouseRemainTime implements IClientOutgoingPacket { OutgoingPackets.EX_CURIOUS_HOUSE_REMAIN_TIME.writeId(packet); packet.writeD(_time); - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java index 4c3ae253ea..c79b68becc 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java @@ -39,7 +39,6 @@ public class ExResponseCommissionBuyInfo extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_INFO.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java index ddfa8b6db1..c1d29735b8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java @@ -40,7 +40,6 @@ public class ExResponseCommissionBuyItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_ITEM.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java index aa4bbbde24..01e4782408 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java @@ -39,7 +39,6 @@ public class ExResponseCommissionDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_DELETE.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java index e7e3c39816..b915574175 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java @@ -55,7 +55,6 @@ public class ExResponseCommissionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_INFO.writeId(packet); - packet.writeD(_result); packet.writeD(_itemId); packet.writeQ(_presetPricePerUnit); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java index 4963393b42..a012b3ab30 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java @@ -64,7 +64,6 @@ public class ExResponseCommissionList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_LIST.writeId(packet); - packet.writeD(_replyType.getClientId()); switch (_replyType) { @@ -73,13 +72,11 @@ public class ExResponseCommissionList extends AbstractItemPacket { packet.writeD((int) Instant.now().getEpochSecond()); packet.writeD(_chunkId); - int chunkSize = _items.size() - _listIndexStart; if (chunkSize > MAX_CHUNK_SIZE) { chunkSize = MAX_CHUNK_SIZE; } - packet.writeD(chunkSize); for (int i = _listIndexStart; i < (_listIndexStart + chunkSize); i++) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java index b1b0a97d7a..183547af06 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java @@ -39,7 +39,6 @@ public class ExResponseCommissionRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_REGISTER.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java index 74d8a95587..b68386e4ed 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java @@ -35,8 +35,7 @@ public class ExShowCommission implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_COMMISSION.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java index 0c267ecf34..11b1ff1e0a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExEnchantFail implements IClientOutgoingPacket { public static final ExEnchantFail STATIC_PACKET = new ExEnchantFail(0, 0); + private final int _itemOne; private final int _itemTwo; @@ -39,7 +40,6 @@ public class ExEnchantFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_FAIL.writeId(packet); - packet.writeD(_itemOne); packet.writeD(_itemTwo); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java index 71ba811ed5..87d29a8e7c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java @@ -36,7 +36,6 @@ public class ExEnchantSucess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SUCESS.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java index eb4eb8b26c..ec67d50fb6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java @@ -39,7 +39,6 @@ public class ExGetCrystalizingEstimation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - packet.writeD(_items.size()); for (ItemChanceHolder holder : _items) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java index 23b770e406..ebe77fa654 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java @@ -29,7 +29,7 @@ public class ExShowUpgradeSystem extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_UPGRADE_SYSTEM.writeId(packet); - packet.writeH(0x01); + packet.writeH(1); return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java index 586d77c13f..2fb9bb65a1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java @@ -40,11 +40,9 @@ public class ExFactionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FACTION_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_openDialog ? 1 : 0); packet.writeD(Faction.values().length); - for (Faction faction : Faction.values()) { packet.writeC(faction.getId()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java index fa605b548a..a99ad7f4e3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java @@ -52,7 +52,7 @@ public class ExFishingStart implements IClientOutgoingPacket packet.writeD(_baitLocation.getX()); packet.writeD(_baitLocation.getY()); packet.writeD(_baitLocation.getZ()); - packet.writeC(0x01); // 0 = newbie, 1 = normal, 2 = night + packet.writeC(1); // 0 = newbie, 1 = normal, 2 = night return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java index 046ad04cb6..74501fe7ff 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java @@ -49,7 +49,6 @@ public class ExUserInfoFishing implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_FISHING.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_isFishing ? 1 : 0); if (_baitLocation == null) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index dc0e3e05bc..336a384bcc 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -47,9 +47,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FRIEND_DETAIL_INFO.writeId(packet); - packet.writeD(_objectId); - if (_friend == null) { packet.writeS(_name); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java index 0d4bb47ff0..a90b7b6083 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java @@ -33,8 +33,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x00); + packet.writeC(0); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java index 9add9c9caa..d24139644c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java @@ -49,7 +49,6 @@ public class FriendAddRequestResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_charId); packet.writeS(_charName); @@ -57,7 +56,7 @@ public class FriendAddRequestResult implements IClientOutgoingPacket packet.writeD(_charObjectId); packet.writeD(_charLevel); packet.writeD(_charClassId); - packet.writeH(0x00); // Always 0 on retail + packet.writeH(0); // Always 0 on retail return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java index a135944662..13a7d01967 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java @@ -86,12 +86,10 @@ public class FriendList implements IClientOutgoingPacket } continue; } - if (player1.isOnline()) { online = true; } - classid = player1.getClassId().getId(); level = player1.getLevel(); _info.add(new FriendInfo(objId, name, online, classid, level)); @@ -102,14 +100,13 @@ public class FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._classid); packet.writeD(info._level); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java index 07c23f9fd2..1bb4142e34 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java @@ -38,7 +38,6 @@ public class FriendRemove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_REMOVE.writeId(packet); - packet.writeD(_responce); packet.writeS(_charName); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java index e8dbddcd63..a3990c0879 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java @@ -52,7 +52,6 @@ public class FriendStatus implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_STATUS.writeId(packet); - packet.writeD(_type); packet.writeS(_name); switch (_type) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java index 8752104e06..78da5850b8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java @@ -50,7 +50,6 @@ public class L2Friend implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND.writeId(packet); - packet.writeD(_action ? 1 : 3); // 1-add 3-remove packet.writeD(_objid); packet.writeS(_name); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java index b69a253635..e50693cb11 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java @@ -81,17 +81,16 @@ public class L2FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._level); packet.writeD(info._classId); - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExActivateHomunculusResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExActivateHomunculusResult.java index 1f0161916f..600cd7e3c6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExActivateHomunculusResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExActivateHomunculusResult.java @@ -37,7 +37,6 @@ public class ExActivateHomunculusResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACTIVATE_HOMUNCULUS_RESULT.writeId(packet); - packet.writeD(1); // success if (_activate) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExEnchantHomunculusSkillResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExEnchantHomunculusSkillResult.java index 96d9d9c491..1001fd2f94 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExEnchantHomunculusSkillResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExEnchantHomunculusSkillResult.java @@ -43,11 +43,9 @@ public class ExEnchantHomunculusSkillResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_HOMUNCULUS_SKILL_RESULT.writeId(packet); - final int playerNumber = Rnd.get(1, 6); final int homunculusNumber = Rnd.get(1, 6); final int systemNumber = Rnd.get(1, 6); - final Homunculus homunculus = _player.getHomunculusList().get(_slot); int boundLevel = 1; if ((playerNumber == homunculusNumber) && (playerNumber == systemNumber)) @@ -58,7 +56,6 @@ public class ExEnchantHomunculusSkillResult implements IClientOutgoingPacket { boundLevel = 2; } - switch (_skillNumber) { case 1: @@ -89,7 +86,6 @@ public class ExEnchantHomunculusSkillResult implements IClientOutgoingPacket } _player.getHomunculusList().update(homunculus); _player.getHomunculusList().refreshStats(true); - packet.writeD(boundLevel); // skill bound level result packet.writeD(homunculus.getId()); // homunculus id? random value on JP packet.writeD(_slot); // slot @@ -97,7 +93,6 @@ public class ExEnchantHomunculusSkillResult implements IClientOutgoingPacket packet.writeD(playerNumber); // player number packet.writeD(homunculusNumber); // homunculus number packet.writeD(systemNumber); // system number - return true; } } \ No newline at end of file diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusHPSPVP.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusHPSPVP.java index fc014757c1..142c6180d5 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusHPSPVP.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusHPSPVP.java @@ -41,11 +41,9 @@ public class ExHomunculusHPSPVP implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HOMUNCULUS_HPSPVP.writeId(packet); - packet.writeD(_hp); packet.writeQ(_sp); packet.writeD(_vp); - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusInsertResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusInsertResult.java index 55e879fde7..678c865f06 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusInsertResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusInsertResult.java @@ -37,7 +37,6 @@ public class ExHomunculusInsertResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HOMUNCULUS_INSERT_RESULT.writeId(packet); - packet.writeD(1); // 1 - success if (_type == 0) { @@ -51,7 +50,6 @@ public class ExHomunculusInsertResult implements IClientOutgoingPacket { packet.writeD(SystemMessageId.THE_HOMUNCULUS_TAKES_YOUR_TEARS_VP.getId()); } - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java index 400dda6bd7..f52a9c1d38 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java @@ -31,10 +31,8 @@ public class ExHomunculusSummonResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HOMUNCULUS_SUMMON_RESULT.writeId(packet); - packet.writeD(1); // 1 - success packet.writeD(SystemMessageId.A_NEW_HOMUNCULUS_IS_CREATED.getId()); - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusBirthInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusBirthInfo.java index c42a0cd6ca..cdc24a4c11 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusBirthInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusBirthInfo.java @@ -44,7 +44,6 @@ public class ExShowHomunculusBirthInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_HOMUNCULUS_BIRTH_INFO.writeId(packet); - int creationStage = 0; if (_homunculusCreateTime > 0) { @@ -63,7 +62,6 @@ public class ExShowHomunculusBirthInfo implements IClientOutgoingPacket packet.writeD(_vpPoints); // vp points packet.writeD(_homunculusCreateTime); // finish time packet.writeD(0); // JP = 0. ? - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusList.java index 2af4d1b996..74372f0878 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusList.java @@ -39,7 +39,6 @@ public class ExShowHomunculusList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_HOMUNCULUS_LIST.writeId(packet); - if (_player.getHomunculusList().size() > 0) { packet.writeD(_player.getHomunculusList().size()); // homunculus count @@ -51,7 +50,6 @@ public class ExShowHomunculusList implements IClientOutgoingPacket { continue; } - packet.writeD(counter); // slot packet.writeD(homunculus.getId()); // homunculus id packet.writeD(homunculus.getType()); @@ -81,7 +79,6 @@ public class ExShowHomunculusList implements IClientOutgoingPacket { packet.writeD(0); } - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java index 0d4fa5cb5d..d0b92dbd1d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java @@ -40,7 +40,7 @@ public class TimedHuntingZoneEnter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); - packet.writeC(0x01); // bEnterSuccess + packet.writeC(1); // bEnterSuccess packet.writeD(_zoneId); packet.writeD((int) ((Chronos.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) packet.writeD(_player.getTimedHuntingZoneRemainingTime(_zoneId) / 1000); // nRemainTime (zone left time) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java index 2c93f25c76..c80dbcfa6a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java @@ -35,7 +35,7 @@ public class TimedHuntingZoneExit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); - packet.writeC(0x00); // bEnterSuccess + packet.writeC(0); // bEnterSuccess return true; } } \ No newline at end of file diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java index 677c09091f..706c179a9c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java @@ -37,7 +37,6 @@ public class ExMentorAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_ADD.writeId(packet); - packet.writeS(_mentor.getName()); packet.writeD(_mentor.getActiveClass()); packet.writeD(_mentor.getLevel()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java index 4722a9cab3..18c1cdeedf 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java @@ -64,9 +64,8 @@ public class ExMentorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_LIST.writeId(packet); - packet.writeD(_type); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mentees.size()); for (Mentee mentee : _mentees) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java index d739dd94b7..2283920b98 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ListMenteeWaiting implements IClientOutgoingPacket { private static final int PLAYERS_PER_PAGE = 64; + private final List _possibleCandiates = new ArrayList<>(); private final int _page; @@ -51,18 +52,15 @@ public class ListMenteeWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_MENTEE_WAITING.writeId(packet); - - packet.writeD(0x01); // always 1 in retail + packet.writeD(1); // always 1 in retail if (_possibleCandiates.isEmpty()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } - packet.writeD(_possibleCandiates.size()); packet.writeD(_possibleCandiates.size() % PLAYERS_PER_PAGE); - for (Player player : _possibleCandiates) { if ((1 <= (PLAYERS_PER_PAGE * _page)) && (1 > (PLAYERS_PER_PAGE * (_page - 1)))) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pk/ExPkPenaltyList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pk/ExPkPenaltyList.java index f292e1e19f..cc0522fecb 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pk/ExPkPenaltyList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pk/ExPkPenaltyList.java @@ -37,7 +37,6 @@ public class ExPkPenaltyList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PK_PENALTY_LIST.writeId(packet); - final Set players = World.getInstance().getPkPlayers(); packet.writeD(World.getInstance().getLastPkTime()); packet.writeD(players.size()); @@ -48,7 +47,6 @@ public class ExPkPenaltyList implements IClientOutgoingPacket packet.writeD(player.getLevel()); packet.writeD(player.getClassId().getId()); } - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pk/ExPkPenaltyListOnlyLoc.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pk/ExPkPenaltyListOnlyLoc.java index 66b8ef6664..82934b1535 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pk/ExPkPenaltyListOnlyLoc.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pk/ExPkPenaltyListOnlyLoc.java @@ -37,7 +37,6 @@ public class ExPkPenaltyListOnlyLoc implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PK_PENALTY_LIST_ONLY_LOC.writeId(packet); - final Set players = World.getInstance().getPkPlayers(); packet.writeD(World.getInstance().getLastPkTime()); packet.writeD(players.size()); @@ -48,7 +47,6 @@ public class ExPkPenaltyListOnlyLoc implements IClientOutgoingPacket packet.writeD(player.getY()); packet.writeD(player.getZ()); } - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java index e33e29a487..fc80b0a6c0 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java @@ -41,7 +41,6 @@ public class ExPledgeContributionInfo implements IClientOutgoingPacket { return false; } - OutgoingPackets.EX_PLEDGE_CONTRIBUTION_INFO.writeId(packet); packet.writeD(_player.getClanContribution()); packet.writeD(_player.getClanContribution()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java index e65c0ced20..64b1bfd2e6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java @@ -44,10 +44,8 @@ public class ExPledgeContributionRank implements IClientOutgoingPacket { return false; } - OutgoingPackets.EX_PLEDGE_CONTRIBUTION_RANK.writeId(packet); packet.writeC(_cycle); - packet.writeD(_clan.getMembersCount()); int order = 1; for (ClanMember member : _clan.getMembers()) @@ -70,7 +68,6 @@ public class ExPledgeContributionRank implements IClientOutgoingPacket packet.writeD(member.getClanContributionTotal()); } } - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java index c235245d89..e66b814d06 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java @@ -42,9 +42,7 @@ public class ExPledgeItemList extends AbstractItemPacket { return false; } - OutgoingPackets.EX_PLEDGE_ITEM_LIST.writeId(packet); - packet.writeH(ClanShopData.getInstance().getProducts().size()); // Product count. for (ClanShopProductHolder product : ClanShopData.getInstance().getProducts()) { @@ -61,7 +59,6 @@ public class ExPledgeItemList extends AbstractItemPacket packet.writeH(0); // Current stock packet.writeH(0); // Total stock } - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java index e4df4b523e..21c5ba1724 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java @@ -44,9 +44,7 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket { return false; } - OutgoingPackets.EX_PLEDGE_MASTERY_INFO.writeId(packet); - packet.writeD(clan.getUsedDevelopmentPoints()); // Consumed development points packet.writeD(clan.getTotalDevelopmentPoints()); // Total development points packet.writeD(16); // Mastery count @@ -56,8 +54,7 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket { final int id = mastery.getId(); packet.writeD(id); // Mastery - packet.writeD(0x00); // ? - + packet.writeD(0); // ? boolean available = true; if (clan.getLevel() < mastery.getClanLevel()) { @@ -76,11 +73,9 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket available = clan.hasMastery(previous); } } - - packet.writeC(clan.hasMastery(id) ? 0x02 : available ? 0x01 : 0x00); // Availability. + packet.writeC(clan.hasMastery(id) ? 2 : available ? 1 : 0); // Availability. } } - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java index d31a014aea..568aa70f70 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java @@ -46,15 +46,12 @@ public class ExPledgeMissionInfo implements IClientOutgoingPacket { return true; } - OutgoingPackets.EX_PLEDGE_MISSION_INFO.writeId(packet); - packet.writeD(_rewards.size()); for (DailyMissionDataHolder reward : _rewards) { int progress = reward.getProgress(_player); int status = reward.getStatus(_player); - // TODO: Figure out this. if (reward.isLevelUpMission()) { @@ -76,12 +73,10 @@ public class ExPledgeMissionInfo implements IClientOutgoingPacket { status = 2; } - packet.writeD(reward.getId()); packet.writeD(progress); packet.writeC(status); } - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java index ce1d6327e7..604181c6ed 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java @@ -41,10 +41,8 @@ public class ExPledgeMissionRewardCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_MISSION_REWARD_COUNT.writeId(packet); - packet.writeD(Math.min(_availableMissionsCount, _doneMissionsCount)); // Received missions rewards. packet.writeD(_availableMissionsCount); // Available missions rewards. 18 - for noble, 20 - for honnorable noble. - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java index e59ebcfaab..22cf060348 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java @@ -43,7 +43,6 @@ public class ExPledgeShowInfoUpdate extends AbstractItemPacket { return false; } - OutgoingPackets.EX_PLEDGE_SHOW_INFO_UPDATE.writeId(packet); packet.writeD(clan.getId()); // Clan ID packet.writeD(ClanLevelData.getLevelRequirement(clan.getLevel())); // Next level cost diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index fb735b8925..e75426e598 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -69,7 +69,6 @@ public class ExBRBuyProduct implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUY_PRODUCT.writeId(packet); - packet.writeD(_reply); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java index 742b3eba9d..91a186b81d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java @@ -39,10 +39,9 @@ public class ExBRGamePoint implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_GAME_POINT.writeId(packet); - packet.writeD(_charId); packet.writeQ(_charPoints); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java index 50f21df46a..e36f2ff502 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java @@ -45,7 +45,6 @@ public class ExBRProductInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_INFO.writeId(packet); - packet.writeD(_item.getBrId()); packet.writeD(_item.getPrice()); packet.writeD(_item.getItems().size()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java index dc851ffd43..0f042ba043 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java @@ -45,9 +45,8 @@ public class ExBRProductList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); // Adena - packet.writeQ(0x00); // Hero coins + packet.writeQ(0); // Hero coins packet.writeC(_type); // Type 0 - Home, 1 - History, 2 - Favorites packet.writeD(_primeList.size()); for (PrimeShopGroup brItem : _primeList) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java index 320140ace6..bf67164bfe 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java @@ -39,7 +39,6 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RAID_BOSS_SPAWN_INFO.writeId(packet); - packet.writeD(_statuses.size()); // count for (Entry entry : _statuses.entrySet()) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java index d1896f32a7..5c835c1dea 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java @@ -47,7 +47,6 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_HERO_AND_LEGEND_INFO.writeId(packet); - if (!Hero.getInstance().getHeroes().isEmpty()) { try (Connection con = DatabaseFactory.getConnection(); @@ -63,7 +62,6 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket { packet.writeC(1); // ?? shows 78 on JP packet.writeC(1); // ?? shows 0 on JP - packet.writeString(rset.getString("char_name")); final int clanId = rset.getInt("clanid"); if (clanId > 0) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java index b7395dee4e..3e7261542a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java @@ -55,7 +55,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MY_RANKING_INFO.writeId(packet); - final Date date = new Date(); final Calendar calendar = new GregorianCalendar(); calendar.setTime(date); @@ -99,7 +98,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket { PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } - int previousPlace = 0; int previousWins = 0; int previousLoses = 0; @@ -128,7 +126,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket { PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } - int heroCount = 0; int legendCount = 0; if (Hero.getInstance().getCompleteHeroes().containsKey(_player.getObjectId())) @@ -137,7 +134,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket heroCount = hero.getInt("count", 0); legendCount = hero.getInt("legend_count", 0); } - packet.writeD(year); // Year packet.writeD(month); // Month packet.writeD(Math.min(Olympiad.getInstance().getCurrentCycle() - 1, 0)); // cycle ? diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java index bad88659b0..db5efac89a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java @@ -64,20 +64,17 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_RANKING_INFO.writeId(packet); - packet.writeC(_tabId); // Tab id packet.writeC(_rankingType); // ranking type packet.writeC(_unk); // unk, shows 1 all time packet.writeD(_classId); // class id (default 148) or caller class id for personal rank packet.writeD(_serverId); // 0 - all servers, server id - for caller server packet.writeD(933); // unk, 933 all time - if (!_playerList.isEmpty()) { final RankingOlympiadCategory category = RankingOlympiadCategory.values()[_tabId]; writeFilteredRankingData(packet, category, category.getScopeByGroup(_rankingType), ClassId.getClassId(_classId)); } - return true; } @@ -100,10 +97,8 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket private void writeScopeData(PacketWriter packet, RankingOlympiadScope scope, List> list, List> snapshot) { - Entry playerData = list.stream().filter(it -> it.getValue().getInt("charId", 0) == _player.getObjectId()).findFirst().orElse(null); final int indexOf = list.indexOf(playerData); - final List> limited; switch (scope) { @@ -132,9 +127,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket limited = Collections.emptyList(); } } - packet.writeD(limited.size()); - int rank = 1; for (Entry data : limited.stream().sorted(Entry.comparingByKey()).collect(Collectors.toList())) { @@ -143,7 +136,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket packet.writeString(player.getString("name")); // name packet.writeString(player.getString("clanName")); // clan name packet.writeD(scope == RankingOlympiadScope.SELF ? data.getKey() : curRank); // rank - if (!snapshot.isEmpty()) { int snapshotRank = 1; @@ -160,7 +152,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket { packet.writeD(scope == RankingOlympiadScope.SELF ? data.getKey() : curRank); } - packet.writeD(Config.SERVER_ID); // server id packet.writeD(player.getInt("level")); // level packet.writeD(player.getInt("classId")); // class id diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingList.java index ad8f5d0034..164286d6f1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingList.java @@ -114,10 +114,8 @@ public class ExPvpRankingList implements IClientOutgoingPacket private void writeScopeData(PacketWriter packet, RankingScope scope, List> list, List> snapshot) { - Entry playerData = list.stream().filter(it -> it.getValue().getInt("charId", 0) == _player.getObjectId()).findFirst().orElse(null); final int indexOf = list.indexOf(playerData); - final List> limited; switch (scope) { @@ -146,9 +144,7 @@ public class ExPvpRankingList implements IClientOutgoingPacket limited = Collections.emptyList(); } } - packet.writeD(limited.size()); - int rank = 1; for (Entry data : limited.stream().sorted(Entry.comparingByKey()).collect(Collectors.toList())) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java index 3b3728f090..f2e96db6b1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java @@ -48,7 +48,6 @@ public class ExRankingCharInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RANKING_CHAR_INFO.writeId(packet); - if (!_playerList.isEmpty()) { for (Integer id : _playerList.keySet()) @@ -59,7 +58,6 @@ public class ExRankingCharInfo implements IClientOutgoingPacket packet.writeD(id); // server rank packet.writeD(player.getInt("raceRank")); // race rank packet.writeD(player.getInt("classRank")); // class rank - for (Integer id2 : _snapshotList.keySet()) { final StatSet snapshot = _snapshotList.get(id2); @@ -68,7 +66,7 @@ public class ExRankingCharInfo implements IClientOutgoingPacket packet.writeD(id2); // server rank snapshot packet.writeD(snapshot.getInt("raceRank")); // race rank snapshot packet.writeD(snapshot.getInt("classRank")); // class rank snapshot - packet.writeD(0); + packet.writeD(0); packet.writeD(0); packet.writeD(0); return true; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java index f89d104f27..54de929cd5 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java @@ -55,12 +55,10 @@ public class ExRankingCharRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RANKING_CHAR_RANKERS.writeId(packet); - packet.writeC(_group); packet.writeC(_scope); packet.writeD(_race); packet.writeD(_player.getClassId().getId()); - if (!_playerList.isEmpty()) { switch (_group) @@ -71,7 +69,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket { final int count = _playerList.size() > 150 ? 150 : _playerList.size(); packet.writeD(count); - for (Integer id : _playerList.keySet()) { final StatSet player = _playerList.get(id); @@ -130,7 +127,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket packet.writeD(plr.getInt("classId")); packet.writeD(plr.getInt("race")); packet.writeD(id2); // server rank - if (!_snapshotList.isEmpty()) { for (Integer id3 : _snapshotList.keySet()) @@ -168,7 +164,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } } packet.writeD(count > 100 ? 100 : count); - int i = 1; for (Integer id : _playerList.keySet()) { @@ -218,7 +213,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket else { boolean found = false; - final Map raceList = new ConcurrentHashMap<>(); int i = 1; for (Integer id : _playerList.keySet()) @@ -230,7 +224,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket i++; } } - for (Integer id : raceList.keySet()) { final StatSet player = raceList.get(id); @@ -284,9 +277,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket i++; } } - packet.writeD(clanList.size()); - for (Integer id : clanList.keySet()) { final StatSet player = clanList.get(id); @@ -342,9 +333,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } } friendList.add(_player.getObjectId()); - packet.writeD(count); - for (int id : _playerList.keySet()) { final StatSet player = _playerList.get(id); @@ -381,7 +370,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket else { packet.writeD(1); - packet.writeString(_player.getName()); if (_player.getClan() != null) { @@ -431,7 +419,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } } packet.writeD(count > 100 ? 100 : count); - int i = 1; for (Integer id : _playerList.keySet()) { @@ -481,7 +468,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket else { boolean found = false; - final Map raceList = new ConcurrentHashMap<>(); int i = 1; for (Integer id : _playerList.keySet()) @@ -493,7 +479,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket i++; } } - for (Integer id : raceList.keySet()) { final StatSet player = raceList.get(id); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java index 2463589c81..c09b3e899d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java @@ -47,18 +47,15 @@ public class ExFlyMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_mapId); - packet.writeD(_locations.size()); for (SayuneEntry loc : _locations) { packet.writeD(loc.getId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(loc.getX()); packet.writeD(loc.getY()); packet.writeD(loc.getZ()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java index 03fc6b580d..70b3fb25d2 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java @@ -47,16 +47,13 @@ public class ExFlyMoveBroadcast implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE_BROADCAST.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); packet.writeD(_mapId); - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD(_currentLoc.getX()); packet.writeD(_currentLoc.getY()); packet.writeD(_currentLoc.getZ()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java index cfe11a27e0..49e5d86910 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java @@ -35,7 +35,6 @@ public class ExNotifyFlyMoveStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_FLY_MOVE_START.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java index d5640a47ef..0efa37ae8c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java @@ -51,7 +51,6 @@ public class ExMoveToLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_SUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_targetX); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java index 0cbe2c3e02..a0314c39aa 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java @@ -46,7 +46,6 @@ public class ExShuttleGetOff implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_OFF.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_x); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java index 5211bef5ba..061bcafed9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java @@ -43,7 +43,6 @@ public class ExShuttleGetOn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_ON.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java index 97d54a9019..c8aee1fde7 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java @@ -43,7 +43,6 @@ public class ExShuttleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHUTTLE_INFO.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD(_shuttle.getX()); packet.writeD(_shuttle.getY()); @@ -60,8 +59,8 @@ public class ExShuttleInfo implements IClientOutgoingPacket packet.writeD(loc.getY()); packet.writeD(loc.getZ()); } - packet.writeD(stop.isDoorOpen() ? 0x01 : 0x00); - packet.writeD(stop.hasDoorChanged() ? 0x01 : 0x00); + packet.writeD(stop.isDoorOpen() ? 1 : 0); + packet.writeD(stop.hasDoorChanged() ? 1 : 0); } return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java index 6ba38f29a1..28b33b998e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java @@ -43,7 +43,6 @@ public class ExShuttleMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_MOVE.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD((int) _shuttle.getStat().getMoveSpeed()); packet.writeD((int) _shuttle.getStat().getRotationSpeed()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java index bf2b6ea6eb..6c31189d6a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java @@ -44,7 +44,6 @@ public class ExStopMoveInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_SHUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java index f7f6849732..8492f42a6e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java @@ -44,7 +44,6 @@ public class ExValidateLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_SHUTTLE.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExTeleportFavoritesList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExTeleportFavoritesList.java index 0f68a71088..6bd6a492d2 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExTeleportFavoritesList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExTeleportFavoritesList.java @@ -42,14 +42,12 @@ public class ExTeleportFavoritesList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_FAVORITES_LIST.writeId(packet); - - packet.writeC(_enable ? 0x01 : 0x00); + packet.writeC(_enable ? 1 : 0); packet.writeD(_teleports.size()); for (int id : _teleports) { packet.writeD(id); } - return true; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java index 1d59c6d002..e7654ed911 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java @@ -60,7 +60,7 @@ public class AccountKicked implements IOutgoingPacket { OutgoingPackets.ACCOUNT_KICKED.writeId(packet); packet.writeD(_reason.getCode()); - return true; } } + diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 2e3a1f6163..1fe813e393 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: response + * Format: d d: response */ public class GGAuth implements IOutgoingPacket { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/network/serverpackets/Init.java index 4b3f71f30e..d725f45ca2 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/network/serverpackets/Init.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/network/serverpackets/Init.java @@ -52,7 +52,6 @@ public class Init implements IOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.INIT.writeId(packet); - packet.writeD(_sessionId); // session id packet.writeD(0x0000c621); // protocol revision diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index 8c534554a8..f4dcd22b00 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: the failure reason + * Format: d d: the failure reason */ public class LoginFail implements IOutgoingPacket { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index c700328f3d..f8b05abb47 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -529,7 +529,7 @@ public class Lindvior extends AbstractNpcAI for (Location loc : CONTROL_GENERATOR_SPAWNS) { guard = (FriendlyNpc) addSpawn(NPC_GENERATOR, loc, true); - guard.setDisplayEffect(0x01); + guard.setDisplayEffect(1); guard.setScriptValue(i++); _generatorSpawn.add(guard); } @@ -685,7 +685,7 @@ public class Lindvior extends AbstractNpcAI if (!hasFlag(_activeMask, 1 << index)) { _activeMask |= 1 << index; - npc.setDisplayEffect(0x02); + npc.setDisplayEffect(2); sendEventTrigger(true, GENERATOR_TRIGERS[index]); _zoneLair.getPlayersInside().stream().forEach(p -> p.broadcastPacket(new Earthquake(p.getX(), p.getY(), p.getZ(), 20, 10))); if (hasFlag(_activeMask, 0xf)) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/BaseRecievePacket.java index c682cb741d..a6ed15ce32 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/BaseRecievePacket.java @@ -73,7 +73,7 @@ public abstract class BaseRecievePacket try { result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE); - result = result.substring(0, result.indexOf(0x00)); + result = result.substring(0, result.indexOf(0)); _off += (result.length() * 2) + 2; } catch (Exception e) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/BaseSendablePacket.java index a9d918de4c..8fa8491cbf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/commons/network/BaseSendablePacket.java @@ -117,16 +117,16 @@ public abstract class BaseSendablePacket public byte[] getBytes() { // if (this instanceof Init) - // writeD(0x00); // reserve for XOR initial key + // writeD(0); // reserve for XOR initial key - writeD(0x00); // reserve for checksum + writeD(0); // reserve for checksum final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++) { - writeC(0x00); + writeC(0); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/AttackType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/AttackType.java index 6064b10ed7..e9983f15e3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/AttackType.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/AttackType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum AttackType { - MISSED(0x01), - BLOCKED(0x02), - CRITICAL(0x04), - SHOT_USED(0x08); + MISSED(1), + BLOCKED(2), + CRITICAL(4), + SHOT_USED(8); private final int _mask; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/GroupType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/GroupType.java index 954aaace8b..916a14fd05 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/GroupType.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/GroupType.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum GroupType implements IUpdateTypeComponent { - NONE(0x01), - PARTY(0x02), - COMMAND_CHANNEL(0x04); + NONE(1), + PARTY(2), + COMMAND_CHANNEL(4); private int _mask; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/ItemListType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/ItemListType.java index 2d38c8f5b1..c80234439f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/ItemListType.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/ItemListType.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum ItemListType implements IUpdateTypeComponent { - AUGMENT_BONUS(0x01), - ELEMENTAL_ATTRIBUTE(0x02), - ENCHANT_EFFECT(0x04), - VISUAL_ID(0x08), - SOUL_CRYSTAL(0x10); + AUGMENT_BONUS(1), + ELEMENTAL_ATTRIBUTE(2), + ENCHANT_EFFECT(4), + VISUAL_ID(8), + SOUL_CRYSTAL(16); private final int _mask; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java index b3d08596c6..29403b783d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum MacroUpdateType { - ADD(0x01), - LIST(0x01), - MODIFY(0x02), - DELETE(0x00); + ADD(1), + LIST(1), + MODIFY(2), + DELETE(0); private final int _id; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java index 86c6159869..7776721c0f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java @@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum PartySmallWindowUpdateType implements IUpdateTypeComponent { - CURRENT_CP(0x01), - MAX_CP(0x02), - CURRENT_HP(0x04), - MAX_HP(0x08), - CURRENT_MP(0x10), - MAX_MP(0x20), - LEVEL(0x40), - CLASS_ID(0x80), - PARTY_SUBSTITUTE(0x100), - VITALITY_POINTS(0x200); + CURRENT_CP(1), + MAX_CP(2), + CURRENT_HP(4), + MAX_HP(8), + CURRENT_MP(16), + MAX_MP(32), + LEVEL(64), + CLASS_ID(128), + PARTY_SUBSTITUTE(256), + VITALITY_POINTS(512); private final int _mask; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 00bb331778..667ce7f17c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.Broadcast; import org.l2jmobius.gameserver.util.Util; /** - * Fromat:(ch) dddddc + * Format:(ch) dddddc * @author -Wooden- */ public class RequestExMagicSkillUseGround implements IClientIncomingPacket diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java index ec60042793..6054868de7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java @@ -39,7 +39,6 @@ public class AbnormalStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ABNORMAL_STATUS_UPDATE.writeId(packet); - packet.writeH(_effects.size()); for (BuffInfo info : _effects) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 1b8ddb2042..bec794bef3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -44,7 +44,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; } @@ -60,7 +59,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; setHtml(html); } @@ -77,13 +75,11 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } - if (!html.contains(""; return; } - _html = html; } @@ -96,7 +92,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } - setHtml(content); return true; } @@ -138,12 +133,10 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { player.clearHtmlActions(getScope()); } - if (_disabledValidation) { return; } - if (player != null) { Util.buildHtmlActionCache(player, getScope(), _npcObjId, _html); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index f143a8aec9..f10f114f31 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -71,7 +71,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket= 0) || (item.getAttributeDefence(AttributeType.FIRE) > 0) || (item.getAttributeDefence(AttributeType.WATER) > 0) || (item.getAttributeDefence(AttributeType.WIND) > 0) || (item.getAttributeDefence(AttributeType.EARTH) > 0) || (item.getAttributeDefence(AttributeType.HOLY) > 0) || (item.getAttributeDefence(AttributeType.DARK) > 0)) { mask |= ItemListType.ELEMENTAL_ATTRIBUTE.getMask(); } - if (item.getEnchantOptions() != null) { for (int id : item.getEnchantOptions()) @@ -186,22 +180,18 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket 0) { mask |= ItemListType.VISUAL_ID.getMask(); } - if (((item.getSoulCrystalOptions() != null) && !item.getSoulCrystalOptions().isEmpty()) || ((item.getSoulCrystalSpecialOptions() != null) && !item.getSoulCrystalSpecialOptions().isEmpty())) { mask |= ItemListType.SOUL_CRYSTAL.getMask(); } - // if (item.isBlessed()) // { // mask |= ItemListType.BLESSED.getMask(); // } - return mask; } @@ -269,7 +259,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); packet.writeC(removeSkills.size()); for (Skill removed : removeSkills) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java index 8fa6259f64..6451dffd02 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ActionFailed implements IClientOutgoingPacket { public static final ActionFailed STATIC_PACKET = new ActionFailed(); - private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); + private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); static { for (SkillCastingType castingType : SkillCastingType.values()) @@ -57,7 +57,6 @@ public class ActionFailed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ACTION_FAIL.writeId(packet); - packet.writeD(_castingType); // MagicSkillUse castingType return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java index 6e868368c9..30ce58da60 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java @@ -44,9 +44,8 @@ public class AgitDecoInfo implements IClientOutgoingPacket { continue; } - packet.writeC(_residense.hasFunction(type) ? 0x01 : 0x00); + packet.writeC(_residense.hasFunction(type) ? 1 : 0); } - // Unknown packet.writeD(0); // TODO: Find me! packet.writeD(0); // TODO: Find me! diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java index 6cb71fc985..4683fb30f0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java @@ -44,7 +44,6 @@ public class AllianceInfo implements IClientOutgoingPacket _name = leader.getAllyName(); _leaderC = leader.getName(); _leaderP = leader.getLeaderName(); - final Collection allies = ClanTable.getInstance().getClanAllies(allianceId); _allies = new ClanInfo[allies.size()]; int idx = 0; @@ -57,7 +56,6 @@ public class AllianceInfo implements IClientOutgoingPacket total += ci.getTotal(); online += ci.getOnline(); } - _total = total; _online = online; } @@ -66,18 +64,16 @@ public class AllianceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_INFO.writeId(packet); - packet.writeS(_name); packet.writeD(_total); packet.writeD(_online); packet.writeS(_leaderC); packet.writeS(_leaderP); - packet.writeD(_allies.length); for (ClanInfo aci : _allies) { packet.writeS(aci.getClan().getName()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(aci.getClan().getLevel()); packet.writeS(aci.getClan().getLeaderName()); packet.writeD(aci.getTotal()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java index f9d08f6600..186fd12e81 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java @@ -44,7 +44,6 @@ public class AllyCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java index 6218f1717f..1ae4653f91 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java @@ -38,7 +38,6 @@ public class AskJoinAlly implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_ALLIANCE.writeId(packet); - packet.writeD(_requestorObjId); packet.writeS(null); // Ally Name ? packet.writeS(null); // TODO: Find me! diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java index a66bb3cd33..b9cfbe81b9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java @@ -39,7 +39,6 @@ public class AskJoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_PARTY.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 05c420ff59..227ab571be 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -45,7 +45,6 @@ public class Attack implements IClientOutgoingPacket _attackerObjId = attacker.getObjectId(); _attackerLoc = new Location(attacker); _targetLoc = new Location(target); - final Player player = attacker.getActingPlayer(); if (player == null) { @@ -111,7 +110,6 @@ public class Attack implements IClientOutgoingPacket final Iterator it = _hits.iterator(); final Hit firstHit = it.next(); OutgoingPackets.ATTACK.writeId(packet); - packet.writeD(_attackerObjId); packet.writeD(firstHit.getTargetId()); packet.writeD(_soulshotVisualSubstitute); // Ertheia @@ -121,13 +119,11 @@ public class Attack implements IClientOutgoingPacket packet.writeD(_attackerLoc.getX()); packet.writeD(_attackerLoc.getY()); packet.writeD(_attackerLoc.getZ()); - packet.writeH(_hits.size() - 1); while (it.hasNext()) { writeHit(packet, it.next()); } - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java index bd6878eb42..8b85fe85e3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java @@ -35,7 +35,6 @@ public class AutoAttackStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_START.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java index e767d1877a..a294b1e212 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java @@ -35,7 +35,6 @@ public class AutoAttackStop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_STOP.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java index 3f329415df..0c79677eae 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java @@ -38,7 +38,6 @@ public class BlockListPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BLOCK_LIST.writeId(packet); - packet.writeD(_playersId.size()); for (int playerId : _playersId) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index f610cdc6aa..d95f0543b9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -45,8 +45,7 @@ public class BuyList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x00); // Type BUY + packet.writeD(0); // Type BUY packet.writeQ(_money); // current money packet.writeD(_listId); packet.writeD(_inventorySlots); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index cd25af908d..7cb2bf4425 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -50,36 +50,34 @@ public class BuyListSeed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BUY_LIST_SEED.writeId(packet); - packet.writeQ(_money); // current money - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeD(_manorId); // manor id - if (!_list.isEmpty()) { packet.writeH(_list.size()); // list length for (SeedProduction s : _list) { - packet.writeC(0x00); // mask item 0 to print minimal item information + packet.writeC(0); // mask item 0 to print minimal item information packet.writeD(s.getId()); // ObjectId packet.writeD(s.getId()); // ItemId packet.writeC(0xFF); // T1 packet.writeQ(s.getAmount()); // Quantity - packet.writeC(0x05); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item - packet.writeC(0x00); // Filler (always 0) - packet.writeH(0x00); // Equipped : 00-No, 01-yes - packet.writeQ(0x00); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand - packet.writeH(0x00); // Enchant level (pet level shown in control item) + packet.writeC(5); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item + packet.writeC(0); // Filler (always 0) + packet.writeH(0); // Equipped : 00-No, 01-yes + packet.writeQ(0); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand + packet.writeH(0); // Enchant level (pet level shown in control item) packet.writeD(-1); packet.writeD(-9999); - packet.writeC(0x01); // GOD Item enabled = 1 disabled (red) = 0 + packet.writeC(1); // GOD Item enabled = 1 disabled (red) = 0 packet.writeQ(s.getPrice()); // price } _list.clear(); } else { - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java index 3a7b67af23..f3dc872dca 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java @@ -32,8 +32,7 @@ public class CSShowComBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - - packet.writeC(0x01); // c4 1 to show community 00 to hide + packet.writeC(1); // c4 1 to show community 00 to hide packet.writeB(_html); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java index eacc27aa07..b18dac4cc3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java @@ -36,7 +36,6 @@ public class CameraMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CAMERA_MODE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java index 1682f5bc62..adea754676 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java @@ -39,7 +39,6 @@ public class ChairSit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAIR_SIT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_staticObjectId); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java index 2bc31a285a..de141fa067 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java @@ -38,7 +38,6 @@ public class ChangeMoveType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_MOVE_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_running ? RUN : WALK); packet.writeD(0); // c2 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index 73277d923d..fbe5e39e2e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -22,17 +22,17 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ChangeWaitType implements IClientOutgoingPacket { + public static final int WT_SITTING = 0; + public static final int WT_STANDING = 1; + public static final int WT_START_FAKEDEATH = 2; + public static final int WT_STOP_FAKEDEATH = 3; + private final int _objectId; private final int _moveType; private final int _x; private final int _y; private final int _z; - public static final int WT_SITTING = 0; - public static final int WT_STANDING = 1; - public static final int WT_START_FAKEDEATH = 2; - public static final int WT_STOP_FAKEDEATH = 3; - public ChangeWaitType(Creature creature, int newMoveType) { _objectId = creature.getObjectId(); @@ -46,7 +46,6 @@ public class ChangeWaitType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_WAIT_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_moveType); packet.writeD(_x); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index 41180bac50..aa2e7b2eaa 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -30,7 +30,6 @@ public class CharCreateFail implements IClientOutgoingPacket public static final int REASON_CREATE_NOT_ALLOWED = 0x05; // "Characters cannot be created from this server." public static final int REASON_CHOOSE_ANOTHER_SVR = 0x06; // "Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please // choose another server." - private final int _error; public CharCreateFail(int errorCode) @@ -42,7 +41,6 @@ public class CharCreateFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index f0e99885ad..768617e558 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -31,8 +31,7 @@ public class CharCreateOk implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_SUCCESS.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index bed289ca0a..1674eef343 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -33,7 +33,6 @@ public class CharDeleteFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_DELETE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index c4b6d6ff28..762e2d3462 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -35,6 +35,22 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { + private static final int[] PAPERDOLL_ORDER = new int[] + { + Inventory.PAPERDOLL_UNDER, + Inventory.PAPERDOLL_HEAD, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_LHAND, + Inventory.PAPERDOLL_GLOVES, + Inventory.PAPERDOLL_CHEST, + Inventory.PAPERDOLL_LEGS, + Inventory.PAPERDOLL_FEET, + Inventory.PAPERDOLL_CLOAK, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_HAIR, + Inventory.PAPERDOLL_HAIR2 + }; + private final Player _player; private final Clan _clan; private int _objId; @@ -57,22 +73,6 @@ public class CharInfo implements IClientOutgoingPacket private int _vehicleId = 0; private final boolean _gmSeeInvis; - private static final int[] PAPERDOLL_ORDER = new int[] - { - Inventory.PAPERDOLL_UNDER, - Inventory.PAPERDOLL_HEAD, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_LHAND, - Inventory.PAPERDOLL_GLOVES, - Inventory.PAPERDOLL_CHEST, - Inventory.PAPERDOLL_LEGS, - Inventory.PAPERDOLL_FEET, - Inventory.PAPERDOLL_CLOAK, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_HAIR, - Inventory.PAPERDOLL_HAIR2 - }; - public CharInfo(Player player, boolean gmSeeInvis) { _player = player; @@ -121,17 +121,15 @@ public class CharInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); // Confirmed packet.writeD(_y); // Confirmed packet.writeD(_z); // Confirmed packet.writeD(_vehicleId); // Confirmed packet.writeD(_objId); // Confirmed packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed - packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) @@ -155,10 +153,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.getPvpFlag()); packet.writeD(_player.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -169,53 +165,40 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); - packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeS(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle()); - packet.writeD(_player.getAppearance().getVisibleClanId()); packet.writeD(_player.getAppearance().getVisibleClanCrestId()); packet.writeD(_player.getAppearance().getVisibleAllyId()); packet.writeD(_player.getAppearance().getVisibleAllyCrestId()); - - packet.writeC(_player.isSitting() ? 0x00 : 0x01); // Confirmed - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // Confirmed - packet.writeC(_player.isInCombat() ? 0x01 : 0x00); // Confirmed - - packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 0x01 : 0x00); // Confirmed - - packet.writeC(_player.isInvisible() ? 0x01 : 0x00); - + packet.writeC(_player.isSitting() ? 0 : 1); // Confirmed + packet.writeC(_player.isRunning() ? 1 : 0); // Confirmed + packet.writeC(_player.isInCombat() ? 1 : 0); // Confirmed + packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 1 : 0); // Confirmed + packet.writeC(_player.isInvisible() ? 1 : 0); packet.writeC(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount packet.writeC(_player.getPrivateStoreType().getId()); // Confirmed packet.writeH(_player.getCubics().size()); // Confirmed _player.getCubics().keySet().forEach(packet::writeH); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); // Confirmed packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); packet.writeH(_player.getRecomHave()); // Confirmed packet.writeD(_player.getMountNpcId() == 0 ? 0 : _player.getMountNpcId() + 1000000); - packet.writeD(_player.getClassId().getId()); // Confirmed - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeC(_player.isMounted() ? 0 : _enchantLevel); // Confirmed - packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeD(_player.getClanCrestLargeId()); packet.writeC(_player.getNobleLevel()); // Confirmed packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 2 : 0); // 152 - Value for enabled changed to 2? packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed - final ILocational baitLocation = _player.getFishing().getBaitLocation(); if (baitLocation != null) { @@ -231,29 +214,21 @@ public class CharInfo implements IClientOutgoingPacket } packet.writeD(_player.getAppearance().getNameColor()); // Confirmed - packet.writeD(_heading); // Confirmed - packet.writeC(_player.getPledgeClass()); packet.writeH(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); // Confirmed - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - - packet.writeC(0x00); // nPvPRestrainStatus - + packet.writeC(0); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentHp())); // Confirmed packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - - packet.writeC(0x00); // cBRLectureMark + packet.writeC(0); // cBRLectureMark final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed @@ -265,11 +240,11 @@ public class CharInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(_player.isTrueHero() ? 100 : 0); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); // Hair accessory - packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points - packet.writeD(0x00); // nCursedWeaponClassId + packet.writeC(_player.isTrueHero() ? 100 : 0); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); // Hair accessory + packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points + packet.writeD(0); // nCursedWeaponClassId // AFK animation. if ((_player.getClan() != null) && (CastleManager.getInstance().getCastleByOwner(_player.getClan()) != null)) @@ -278,17 +253,15 @@ public class CharInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); + packet.writeD(0); } // Rank. packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : RankManager.getInstance().getPlayerClassRank(_player) == 1 ? 4 : 0); - - packet.writeH(0x00); - packet.writeC(0x00); + packet.writeH(0); + packet.writeC(0); packet.writeD(_player.getClassId().getId()); - packet.writeC(0x00); - + packet.writeC(0); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 7187b73184..11f5f4df52 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -40,17 +40,16 @@ public class CharSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTED.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getTitle()); packet.writeD(_sessionId); packet.writeD(_player.getClanId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x01); // active ?? + packet.writeD(1); // active ?? packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -62,25 +61,20 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_player.getReputation()); packet.writeD(_player.getPkKills()); packet.writeD(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_player.getClassId().getId()); - packet.writeB(new byte[16]); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeB(new byte[28]); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index e872eb0ef0..e42c6a87ac 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -45,10 +45,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { private static final Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); - private final String _loginName; - private final int _sessionId; - private int _activeId; - private final List _characterPackages; private static final int[] PAPERDOLL_ORDER = new int[] { @@ -113,7 +109,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_ARTIFACT20, // 152 Inventory.PAPERDOLL_ARTIFACT21 // 152 }; - private static final int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, @@ -127,6 +122,11 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_HAIR2, }; + private final String _loginName; + private final int _sessionId; + private int _activeId; + private final List _characterPackages; + /** * Constructor for CharSelectionInfo. * @param loginName @@ -157,16 +157,13 @@ public class CharSelectionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.size(); packet.writeD(size); // Created character count - packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) - packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 0x01 : 0x00); // if 1 can't create new char - packet.writeC(0x01); // 0=can't play, 1=can play free until level 85, 2=100% free play - packet.writeD(0x02); // if 1, Korean client - packet.writeC(0x00); // Gift message for inactive accounts // 152 - + packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 1 : 0); // if 1 can't create new char + packet.writeC(1); // 0=can't play, 1=can play free until level 85, 2=100% free play + packet.writeD(2); // if 1, Korean client + packet.writeC(0); // Gift message for inactive accounts // 152 // Balthus Knights if (Config.BALTHUS_KNIGHTS_ENABLED) { @@ -175,23 +172,22 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (Config.PREMIUM_SYSTEM_ENABLED) { PremiumManager.getInstance().loadPremiumData(_loginName); - packet.writeC(PremiumManager.getInstance().getPremiumExpiration(_loginName) > 0 ? 0x01 : 0x00); + packet.writeC(PremiumManager.getInstance().getPremiumExpiration(_loginName) > 0 ? 1 : 0); } else { - packet.writeC(0x00); + packet.writeC(0); } } else { - packet.writeC(0x01); + packet.writeC(1); } } else { - packet.writeC(0x00); + packet.writeC(0); } - long lastAccess = 0; if (_activeId == -1) { @@ -204,7 +200,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - for (int i = 0; i < size; i++) { final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); @@ -212,91 +207,73 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name packet.writeD(_sessionId); // Account ID - packet.writeD(0x00); // Clan ID - packet.writeD(0x00); // Builder level - + packet.writeD(0); // Clan ID + packet.writeD(0); // Builder level packet.writeD(charInfoPackage.getSex()); // Sex packet.writeD(charInfoPackage.getRace()); // Race packet.writeD(charInfoPackage.getBaseClassId()); - packet.writeD(Config.SERVER_ID); - packet.writeD(charInfoPackage.getX()); packet.writeD(charInfoPackage.getY()); packet.writeD(charInfoPackage.getZ()); packet.writeF(charInfoPackage.getCurrentHp()); packet.writeF(charInfoPackage.getCurrentMp()); - packet.writeQ(charInfoPackage.getSp()); packet.writeQ(charInfoPackage.getExp()); packet.writeF((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel()))); packet.writeD(charInfoPackage.getLevel()); - packet.writeD(charInfoPackage.getReputation()); packet.writeD(charInfoPackage.getPkKills()); packet.writeD(charInfoPackage.getPvPKills()); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); // Ertheia - packet.writeD(0x00); // Ertheia - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); // Ertheia + packet.writeD(0); // Ertheia for (int slot : getPaperdollOrder()) { packet.writeD(charInfoPackage.getPaperdollItemId(slot)); } - for (int slot : getPaperdollOrderVisualId()) { packet.writeD(charInfoPackage.getPaperdollItemVisualId(slot)); } - packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_CHEST)); // Upper Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_LEGS)); // Lower Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_HEAD)); // Headgear enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_GLOVES)); // Gloves enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_FEET)); // Boots enchant level - packet.writeD(charInfoPackage.getHairStyle()); packet.writeD(charInfoPackage.getHairColor()); packet.writeD(charInfoPackage.getFace()); - packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); - packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption1Id() : 0); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption2Id() : 0); - // packet.writeD(charInfoPackage.getTransformId()); // Used to display Transformations - packet.writeD(0x00); // Currently on retail when you are on character select you don't see your transformation. - - packet.writeD(0x00); // Pet NpcId - packet.writeD(0x00); // Pet level - packet.writeD(0x00); // Pet Food - packet.writeD(0x00); // Pet Food Level - packet.writeF(0x00); // Current pet HP - packet.writeF(0x00); // Current pet MP - + packet.writeD(0); // Currently on retail when you are on character select you don't see your transformation. + packet.writeD(0); // Pet NpcId + packet.writeD(0); // Pet level + packet.writeD(0); // Pet Food + packet.writeD(0); // Pet Food Level + packet.writeF(0); // Current pet HP + packet.writeF(0); // Current pet MP packet.writeD(charInfoPackage.getVitalityPoints()); // Vitality packet.writeD((int) Config.RATE_VITALITY_EXP_MULTIPLIER * 100); // Vitality Percent packet.writeD(charInfoPackage.getVitalityItemsUsed()); // Remaining vitality item uses - packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0x00 : 0x01); // Char is active or not - packet.writeC(charInfoPackage.isNoble() ? 0x01 : 0x00); - packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 0x02 : 0x00); // Hero glow - packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 0x01 : 0x00); // Show hair accessory if enabled - - packet.writeD(0x00); // 235 - ban time left + packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0 : 1); // Char is active or not + packet.writeC(charInfoPackage.isNoble() ? 1 : 0); + packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 2 : 0); // Hero glow + packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 1 : 0); // Show hair accessory if enabled + packet.writeD(0); // 235 - ban time left packet.writeD((int) (charInfoPackage.getLastAccess() / 1000)); // 235 - last play time } return true; @@ -306,7 +283,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); - try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate")) { @@ -319,7 +295,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (charInfopackage != null) { characterList.add(charInfopackage); - final Player player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { @@ -333,7 +308,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return characterList; } @@ -375,7 +349,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { clan.removeClanMember(objectId, 0); } - GameClient.deleteCharByObjId(objectId); return null; } @@ -394,20 +367,16 @@ public class CharSelectionInfo implements IClientOutgoingPacket charInfopackage.setHairStyle(chardata.getInt("hairstyle")); charInfopackage.setHairColor(chardata.getInt("haircolor")); charInfopackage.setSex(chardata.getInt("sex")); - charInfopackage.setExp(chardata.getLong("exp")); charInfopackage.setSp(chardata.getLong("sp")); charInfopackage.setVitalityPoints(chardata.getInt("vitality_points")); charInfopackage.setClanId(chardata.getInt("clanid")); - charInfopackage.setRace(chardata.getInt("race")); - final int baseClassId = chardata.getInt("base_class"); final int activeClassId = chardata.getInt("classid"); charInfopackage.setX(chardata.getInt("x")); charInfopackage.setY(chardata.getInt("y")); charInfopackage.setZ(chardata.getInt("z")); - final int faction = chardata.getInt("faction"); if (faction == 1) { @@ -417,7 +386,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setEvil(); } - if (Config.MULTILANG_ENABLE) { String lang = chardata.getString("language"); @@ -427,22 +395,18 @@ public class CharSelectionInfo implements IClientOutgoingPacket } charInfopackage.setHtmlPrefix("data/lang/" + lang + "/"); } - // if is in subclass, load subclass exp, sp, level info if (baseClassId != activeClassId) { loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId); } - charInfopackage.setClassId(activeClassId); - // Get the augmentation id for equipped weapon int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); if (weaponObjId < 1) { weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); } - if (weaponObjId > 0) { try (Connection con = DatabaseFactory.getConnection(); @@ -468,7 +432,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } - // Check if the base class is set to zero and also doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly. if ((baseClassId == 0) && (activeClassId > 0)) { @@ -478,7 +441,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setBaseClassId(baseClassId); } - charInfopackage.setDeleteTimer(deletetime); charInfopackage.setLastAccess(chardata.getLong("lastAccess")); charInfopackage.setNoble(chardata.getInt("nobless") == 1); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java index 847e24db87..d59df7911a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java @@ -32,7 +32,6 @@ public class ChooseInventoryItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHOOSE_INVENTORY_ITEM.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java index 12a3940521..ac66c2fa0f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java @@ -32,7 +32,6 @@ public class ClientSetTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CLIENT_SET_TIME.writeId(packet); - packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // time in client minutes packet.writeD(6); // constant to match the server time( this determines the speed of the client clock) return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java index 195824578b..5fdb62f544 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java @@ -68,7 +68,6 @@ public class ConfirmDlg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CONFIRM_DLG.writeId(packet); - final SMParam[] params = _systemMessage.getParams(); packet.writeD(_systemMessage.getId()); packet.writeD(params.length); @@ -130,7 +129,6 @@ public class ConfirmDlg implements IClientOutgoingPacket } } } - packet.writeD(_time); packet.writeD(_requesterId); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index e11807bdba..63acd728ea 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -73,7 +73,6 @@ public class CreatureSay implements IClientOutgoingPacket _mask |= 0x08; } } - // Does not shows level if (sender.isGM()) { @@ -125,7 +124,6 @@ public class CreatureSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_sender == null ? 0 : _sender.getObjectId()); packet.writeD(_chatType.getClientId()); if (_senderName != null) @@ -156,7 +154,6 @@ public class CreatureSay implements IClientOutgoingPacket packet.writeS(s); } } - // Rank if ((_sender != null) && _sender.isPlayer()) { @@ -165,7 +162,6 @@ public class CreatureSay implements IClientOutgoingPacket { packet.writeC(0); // unknown clan byte } - final int rank = RankManager.getInstance().getPlayerGlobalRank(_sender.getActingPlayer()); if ((rank == 0) || (rank > 100)) { @@ -183,7 +179,6 @@ public class CreatureSay implements IClientOutgoingPacket { packet.writeC(3); } - if (clan != null) { packet.writeC(clan.getCastleId()); @@ -197,7 +192,6 @@ public class CreatureSay implements IClientOutgoingPacket { packet.writeC(0); } - return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index dfc40d995f..a307b06e4b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -38,9 +38,8 @@ public class DeleteObject implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DELETE_OBJECT.writeId(packet); - packet.writeD(_objectId); - packet.writeC(0x00); // c2 + packet.writeC(0); // c2 return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java index 982c8f3311..3b5917e55b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java @@ -50,7 +50,6 @@ public class Dice implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DICE.writeId(packet); - packet.writeD(_objectId); // object id of player packet.writeD(_itemId); // item id of dice (spade) 4625,4626,4627,4628 packet.writeD(_number); // number rolled diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 52daec99cc..609b485b51 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -57,7 +57,6 @@ public class Die implements IClientOutgoingPacket siegeClan = fort.getSiege().getAttackerClan(clan); isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan); } - // ClanHall check. if ((clan != null) && (clan.getHideoutId() > 0)) { @@ -92,12 +91,12 @@ public class Die implements IClientOutgoingPacket OutgoingPackets.DIE.writeId(packet); packet.writeD(_objectId); packet.writeQ(_flags); - packet.writeD(_isSweepable ? 0x01 : 0x00); - packet.writeD(0x00); // Feather item time. - packet.writeC(0x00); // Hide die animation. - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(_isSweepable ? 1 : 0); + packet.writeD(0); // Feather item time. + packet.writeC(0); // Hide die animation. + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java index 15404f9dee..5837faec19 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java @@ -33,7 +33,6 @@ public class DoorInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_INFO.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.getId()); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java index 54f8742a73..14d41afee7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java @@ -33,7 +33,6 @@ public class DoorStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_STATUS_UPDATE.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.isOpen() ? 0 : 1); packet.writeD(_door.getDamage()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index b12458e719..3035890956 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -40,20 +40,17 @@ public class DropItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DROP_ITEM.writeId(packet); - packet.writeD(_objectId); packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeC(_item.isStackable() ? 0x01 : 0x00); + packet.writeC(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - - packet.writeC(0x00); - // packet.writeD(0x01); if above C == true (1) then packet.readD() + packet.writeC(0); + // packet.writeD(1); if above C == true (1) then packet.readD() packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java index 631c43ba0c..99bd80d97e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java @@ -62,13 +62,12 @@ public class Earthquake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EARTHQUAKE.writeId(packet); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_intensity); packet.writeD(_duration); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 6063a54535..1a8b8ddfbb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -59,25 +59,20 @@ public class EnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_crystal); packet.writeQ(_count); - // Guessing. // With 166 options became 3x write integers instead of shorts and enchant level moved bellow. - // Commenting until actually knowing. // for (int option : _enchantOptions) // { // packet.writeD(option); // } - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_enchantLevel); // Confirmed. - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java index a12f0286f3..22648f887e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java @@ -41,7 +41,6 @@ public class EtcStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ETC_STATUS_UPDATE.writeId(packet); - packet.writeC(_player.getCharges()); // 1-7 increase force, level packet.writeD(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%) packet.writeC(0); // Weapon Grade Penalty [1-4] diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java index 5dca90f960..9f8d576148 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java @@ -24,13 +24,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class Ex2ndPasswordAck implements IClientOutgoingPacket { + // TODO: Enum + public static final int SUCCESS = 0; + public static final int WRONG_PATTERN = 1; + private final int _status; private final int _response; - // TODO: Enum - public static final int SUCCESS = 0x00; - public static final int WRONG_PATTERN = 0x01; - public Ex2ndPasswordAck(int status, int response) { _status = status; @@ -41,10 +41,9 @@ public class Ex2ndPasswordAck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_ACK.writeId(packet); - packet.writeC(_status); - packet.writeD(_response == WRONG_PATTERN ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(_response == WRONG_PATTERN ? 1 : 0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java index 48bde5161d..c86b5185d0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordCheck implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_NEW = 0x00; - public static final int PASSWORD_PROMPT = 0x01; - public static final int PASSWORD_OK = 0x02; + public static final int PASSWORD_NEW = 0; + public static final int PASSWORD_PROMPT = 1; + public static final int PASSWORD_OK = 2; private final int _windowType; @@ -40,9 +40,8 @@ public class Ex2ndPasswordCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_CHECK.writeId(packet); - packet.writeD(_windowType); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java index 1abf50ab01..f6731bf18f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordVerify implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_OK = 0x00; - public static final int PASSWORD_WRONG = 0x01; - public static final int PASSWORD_BAN = 0x02; + public static final int PASSWORD_OK = 0; + public static final int PASSWORD_WRONG = 1; + public static final int PASSWORD_BAN = 2; private final int _wrongTentatives; private final int _mode; @@ -42,7 +42,6 @@ public class Ex2ndPasswordVerify implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_VERIFY.writeId(packet); - packet.writeD(_mode); packet.writeD(_wrongTentatives); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java index 8f3d5ec764..528988ab5f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java @@ -45,10 +45,8 @@ public class ExAbnormalStatusUpdateFromTarget implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ABNORMAL_STATUS_UPDATE_FROM_TARGET.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeH(_effects.size()); - for (BuffInfo info : _effects) { packet.writeD(info.getSkill().getDisplayId()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java index c4b9cd8356..f3abd6ec5c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java @@ -41,7 +41,6 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRABLE_SKILL_LIST_BY_CLASS.writeId(packet); - packet.writeH(_type.getId()); packet.writeH(_learnable.size()); for (SkillLearn skill : _learnable) @@ -54,7 +53,7 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket packet.writeC(skill.getRequiredItems().size()); if (_type == AcquireSkillType.SUBPLEDGE) { - packet.writeH(0x00); + packet.writeH(0); } } return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java index fd0e2fc97c..8555bb6e86 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java @@ -61,7 +61,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_SKILL_INFO.writeId(packet); - packet.writeD(_id); packet.writeD(_level); packet.writeQ(_spCost); @@ -73,7 +72,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket packet.writeD(holder.getId()); packet.writeQ(holder.getCount()); } - packet.writeD(_skillRem.size()); for (Skill skill : _skillRem) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java index 29793f4d6c..ff8c526ec4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java @@ -36,7 +36,6 @@ public class ExAdenaInvenCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ADENA_INVEN_COUNT.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeH(_player.getInventory().getSize()); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java index 2aa2d85bc5..5ef11e0f1e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java @@ -50,13 +50,11 @@ public class ExAirShipInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_INFO.writeId(packet); - packet.writeD(_ship.getObjectId()); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(_captain); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); @@ -73,14 +71,13 @@ public class ExAirShipInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - packet.writeD(_ship.getFuel()); packet.writeD(_ship.getMaxFuel()); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java index 4cfc76bfba..8b37f4fc0a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java @@ -42,7 +42,6 @@ public class ExAirShipStopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_airShipId); packet.writeD(_playerId); packet.writeD(_x); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java index 33c57712da..52958f931b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java @@ -37,12 +37,10 @@ public class ExAirShipTeleportList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_TELEPORT_LIST.writeId(packet); - packet.writeD(_dockId); if (_teleports != null) { packet.writeD(_teleports.length); - for (int i = 0; i < _teleports.length; i++) { packet.writeD(i - 1); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java index 392b228f0d..7918022c72 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java @@ -50,13 +50,12 @@ public class ExAlchemySkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_SKILL_LIST.writeId(packet); - packet.writeD(_skills.size()); for (Skill skill : _skills) { packet.writeD(skill.getId()); packet.writeD(skill.getLevel()); - packet.writeQ(0x00); // Always 0 on Naia, SP i guess? + packet.writeQ(0); // Always 0 on Naia, SP i guess? packet.writeC(skill.getId() == CommonSkill.ALCHEMY_CUBE.getId() ? 0 : 1); // This is type in flash, visible or not } return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java index 3bfadd2650..ed7f8d4255 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java @@ -47,12 +47,10 @@ public class ExAlterSkillRequest implements IClientOutgoingPacket { return true; } - OutgoingPackets.EX_ALTER_SKILL_REQUEST.writeId(packet); packet.writeD(_nextSkillId); packet.writeD(_currentSkillId); packet.writeD(_alterTime); - if (_alterTime > 0) { _player.setAlterSkillActive(true); @@ -62,7 +60,6 @@ public class ExAlterSkillRequest implements IClientOutgoingPacket _player.setAlterSkillActive(false); }, _alterTime * 1000); } - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java index 3d7ee12a81..1990e1e701 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java @@ -37,7 +37,6 @@ public class ExAskCoupleAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_COUPLE_ACTION.writeId(packet); - packet.writeD(_actionId); packet.writeD(_objectId); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java index 61cabedd98..45615daf5a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java @@ -39,9 +39,8 @@ public class ExAskJoinMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_MPCC.writeId(packet); - packet.writeS(_requestorName); // name of CCLeader - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java index 17fa9d028f..908022ff7e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java @@ -38,7 +38,6 @@ public class ExAskJoinPartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_PARTY_ROOM.writeId(packet); - packet.writeS(_charName); packet.writeS(_roomName); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java index 2a6b958dc9..1551840013 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java @@ -38,7 +38,6 @@ public class ExAskModifyPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_MODIFY_PARTY_LOOTING.writeId(packet); - packet.writeS(_requestor); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java index 958e7c3d06..fa62c8a207 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java @@ -45,7 +45,6 @@ public class ExAttributeEnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ATTRIBUTE_ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeC(_isWeapon); packet.writeH(_type); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java index 1a3a1ef3fe..3d65055b3c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java @@ -41,9 +41,8 @@ public class ExAutoSoulShot implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AUTO_SOUL_SHOT.writeId(packet); - packet.writeD(_itemId); - packet.writeD(_enable ? 0x01 : 0x00); + packet.writeD(_enable ? 1 : 0); packet.writeD(_type); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java index 8680c6bd7a..a8137347ec 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java @@ -37,8 +37,7 @@ public class ExBaseAttributeCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASE_ATTRIBUTE_CANCEL_RESULT.writeId(packet); - - packet.writeD(0x01); // result + packet.writeD(1); // result packet.writeD(_objId); packet.writeD(_attribute); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java index 755fbc66c8..a454d136c6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java @@ -75,7 +75,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 1149, 1150, 1151, 1152, 1153, 1154, 1155 }; - public static final int[] DEFAULT_ACTION_LIST = { 0, 1, 2, 3, @@ -147,7 +146,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 5012, 5013, 5014, 5015 }; //@formatter:on - public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST); private final int[] _actionIds; @@ -161,7 +159,6 @@ public class ExBasicActionList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASIC_ACTION_LIST.writeId(packet); - packet.writeD(_actionIds.length); for (int _actionId : _actionIds) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java index 4c4fac8c91..d32dca4d21 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java @@ -34,13 +34,14 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBeautyItemList implements IClientOutgoingPacket { - private int _colorCount; - private final BeautyData _beautyData; - private final Map> _colorData = new HashMap<>(); private static final int HAIR_TYPE = 0; private static final int FACE_TYPE = 1; private static final int COLOR_TYPE = 2; + private int _colorCount; + private final BeautyData _beautyData; + private final Map> _colorData = new HashMap<>(); + public ExBeautyItemList(Player player) { _beautyData = BeautyShopData.getInstance().getBeautyData(player.getRace(), player.getAppearance().getSexType()); @@ -60,7 +61,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BEAUTY_ITEM_LIST.writeId(packet); - packet.writeD(HAIR_TYPE); packet.writeD(_beautyData.getHairList().size()); for (BeautyItem hair : _beautyData.getHairList().values()) @@ -72,7 +72,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(hair.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(FACE_TYPE); packet.writeD(_beautyData.getFaceList().size()); for (BeautyItem face : _beautyData.getFaceList().values()) @@ -84,7 +83,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(face.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(COLOR_TYPE); packet.writeD(_colorCount); for (Entry> entry : _colorData.entrySet()) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java index 1825236886..6d4c45cb2b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java @@ -34,7 +34,6 @@ public class ExBirthdayPopup implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_BIRTH_DAY.writeId(packet); - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java index 7d2f17e697..43e525f05f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java @@ -26,6 +26,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBrBroadcastEventState implements IClientOutgoingPacket { + public static final int APRIL_FOOLS = 20090401; + public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) + public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) + public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) + public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) + private final int _eventId; private final int _eventState; private int _param0; @@ -36,12 +42,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket private String _param5; private String _param6; - public static final int APRIL_FOOLS = 20090401; - public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) - public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) - public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) - public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) - public ExBrBroadcastEventState(int eventId, int eventState) { _eventId = eventId; @@ -65,7 +65,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BROADCAST_EVENT_STATE.writeId(packet); - packet.writeD(_eventId); packet.writeD(_eventState); packet.writeD(_param0); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java index 1fd7ec663a..c0683c8797 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java @@ -44,7 +44,6 @@ public class ExBrBuffEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUFF_EVENT_STATE.writeId(packet); - packet.writeD(_type); packet.writeD(_value); packet.writeD(_state); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java index 943aae8a62..8e009d7b09 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java @@ -43,7 +43,6 @@ public class ExBrLoadEventTopRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_LOAD_EVENT_TOP_RANKERS.writeId(packet); - packet.writeD(_eventId); packet.writeD(_day); packet.writeD(_count); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java index 6a98c01654..9105e39efe 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java @@ -36,9 +36,8 @@ public class ExBrPremiumState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PREMIUM_STATE.writeId(packet); - packet.writeD(_player.getObjectId()); - packet.writeC(_player.hasPremiumStatus() ? 0x01 : 0x00); + packet.writeC(_player.hasPremiumStatus() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 381dd859ad..567cfc70f9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -59,10 +59,8 @@ public class ExBuySellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x01); // Type SELL + packet.writeD(1); // Type SELL packet.writeD(_inventorySlots); - if ((_sellList != null)) { packet.writeH(_sellList.size()); @@ -74,9 +72,8 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - if ((_refundList != null) && !_refundList.isEmpty()) { packet.writeH(_refundList.size()); @@ -90,10 +87,9 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - - packet.writeC(_done ? 0x01 : 0x00); + packet.writeC(_done ? 1 : 0); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java index 2b43c0ce4b..e0ec81e0e7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java @@ -39,7 +39,6 @@ public class ExCastleState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CASTLE_STATE.writeId(packet); - packet.writeD(_castleId); packet.writeD(_castleSide.ordinal()); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java index b7f90d261b..a8196c7a83 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java @@ -52,7 +52,6 @@ public class ExChangeClientEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_CLIENT_EFFECT_INFO.writeId(packet); - packet.writeD(_type); packet.writeD(_key); packet.writeD(_value); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java index 472abc88df..eea59162ee 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java @@ -37,7 +37,6 @@ public class ExChangeNpcState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NPC_STATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java index 8cdcb4460d..45f2805517 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java @@ -49,7 +49,6 @@ public class ExChangePostState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_POST_STATE.writeId(packet); - packet.writeD(_receivedBoard ? 1 : 0); packet.writeD(_changedMsgIds.length); for (int postId : _changedMsgIds) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java index fc58ec9a2e..d765ab54e0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java @@ -35,7 +35,6 @@ public class ExChangeToAwakenedClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_TO_AWAKENED_CLASS.writeId(packet); - packet.writeD(_classId); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index 0fc5fb1c75..fec31d4775 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -47,7 +47,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket throw new IllegalArgumentException("Undefined Atribute item: " + stone); } _level = ElementalAttributeData.getInstance().getMaxElementLevel(_itemId); - // Register only items that can be put an attribute stone/crystal for (Item item : player.getInventory().getItems()) { @@ -62,7 +61,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_INVENTORY_ATTRIBUTE_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeQ(_count); packet.writeD(_atribute == AttributeType.FIRE ? 1 : 0); // Fire diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java index a272d85469..238882cd11 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java @@ -35,7 +35,6 @@ public class ExCloseMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java index d2ecd70952..877bca760a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java @@ -34,7 +34,6 @@ public class ExClosePartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_PARTY_ROOM.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java index 27c112776b..1d02c972b5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java @@ -54,7 +54,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLOSSEUM_FENCE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_clientState); packet.writeD(_x); @@ -62,7 +61,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_width); packet.writeD(_length); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java index 766d3619ad..b72bef93e8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java @@ -37,9 +37,8 @@ public class ExConfirmAddingContact implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AGIT_AUCTION_CMD.writeId(packet); - packet.writeS(_charName); - packet.writeD(_added ? 0x01 : 0x00); + packet.writeD(_added ? 1 : 0); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java index beded32254..c832d507ed 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameAddPlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x01); - + packet.writeD(1); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java index 5f36f730d0..847ea93e6a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java @@ -45,9 +45,7 @@ public class ExCubeGameChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java index 66abbf4b75..a2f2e61ded 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java @@ -43,12 +43,10 @@ public class ExCubeGameChangeTeam implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x05); - + packet.writeD(5); packet.writeD(_player.getObjectId()); - packet.writeD(_fromRedTeam ? 0x01 : 0x00); - packet.writeD(_fromRedTeam ? 0x00 : 0x01); + packet.writeD(_fromRedTeam ? 1 : 0); + packet.writeD(_fromRedTeam ? 0 : 1); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java index 5273b2099a..136b439283 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java @@ -39,9 +39,7 @@ public class ExCubeGameChangeTimeToStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x03); - + packet.writeD(3); packet.writeD(_seconds); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java index f81a302941..9bdba49029 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java @@ -35,7 +35,6 @@ public class ExCubeGameCloseUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0xffffffff); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java index 259a0e9407..3177e7a488 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java @@ -40,11 +40,9 @@ public class ExCubeGameEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x01); - - packet.writeD(_isRedTeamWin ? 0x01 : 0x00); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(1); + packet.writeD(_isRedTeamWin ? 1 : 0); + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java index 4d89e621ce..8b96bb545f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java @@ -55,14 +55,11 @@ public class ExCubeGameExtendedChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeD(_playerPoints); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java index e5a00f1ab7..c084789f13 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameRemovePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java index 00be884d2f..35a3f289d1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java @@ -35,8 +35,7 @@ public class ExCubeGameRequestReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x04); + packet.writeD(4); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java index 1bc89e0c32..8b755dd3cc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java @@ -30,7 +30,6 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket // Players Lists private final List _bluePlayers; private final List _redPlayers; - // Common Values private final int _roomNumber; @@ -51,12 +50,9 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_roomNumber); packet.writeD(0xffffffff); - packet.writeD(_bluePlayers.size()); for (Player player : _bluePlayers) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java index 2f2c092c08..d000112787 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java @@ -31,7 +31,6 @@ public class ExCursedWeaponList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet); - final Set ids = CursedWeaponsManager.getInstance().getCursedWeaponsIds(); packet.writeD(ids.size()); ids.forEach(packet::writeD); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java index 2f60a1b80c..5bc7ff3238 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java @@ -39,7 +39,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet); - if (!_cursedWeaponInfo.isEmpty()) { packet.writeD(_cursedWeaponInfo.size()); @@ -47,7 +46,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { packet.writeD(w.id); packet.writeD(w.activated); - packet.writeD(w.pos.getX()); packet.writeD(w.pos.getY()); packet.writeD(w.pos.getZ()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java index a0ba15da9f..8bee464fb0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java @@ -41,7 +41,6 @@ public class ExDieInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIE_INFO.writeId(packet); - packet.writeH(_droppedItems.size()); for (Item item : _droppedItems) { @@ -49,17 +48,15 @@ public class ExDieInfo implements IClientOutgoingPacket packet.writeD(item.getEnchantLevel()); packet.writeD((int) item.getCount()); } - packet.writeD(_lastDamageTaken.size()); for (DamageTakenHolder damageHolder : _lastDamageTaken) { packet.writeS(damageHolder.getCreature().getName()); - packet.writeH(0x00); + packet.writeH(0); packet.writeD(damageHolder.getSkillId()); packet.writeF(damageHolder.getDamage()); - packet.writeD(0x00); + packet.writeD(0); } - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java index f475a02b28..0456fb9dae 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java @@ -34,7 +34,6 @@ public class ExDissmissMPCCRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DISSMISS_MPCC_ROOM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java index 258010f717..c731b7c7a9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java @@ -37,7 +37,6 @@ public class ExDuelAskStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_ASK_START.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDuel); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java index 043c82c0db..e9a31bee57 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java @@ -38,7 +38,6 @@ public class ExDuelEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_END.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java index 264409b3d6..e1fa1cea88 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java @@ -38,7 +38,6 @@ public class ExDuelReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_READY.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java index 488aafcb7d..ecdd528a16 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java @@ -38,7 +38,6 @@ public class ExDuelStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_START.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java index 7df040c5e7..5ed0c09675 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java @@ -36,7 +36,6 @@ public class ExDuelUpdateUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_UPDATE_USER_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeD(_player.getClassId().getId()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 7ab055a3d8..f58c0573a8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExEnchantSkillInfo implements IClientOutgoingPacket { private final Set _routes; - private final int _skillId; private final int _skillLevel; private final int _skillSubLevel; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 41368a8efb..e4ee350e64 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -50,7 +50,6 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_INFO_DETAIL.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java index 5cedcd6284..1d32f0d725 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java @@ -43,7 +43,6 @@ public class ExEnchantSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_LIST.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skills.size()); for (Skill skill : _skills) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java index 6ab5e869f2..853d74039f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java @@ -38,7 +38,6 @@ public class ExEnchantSkillResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_RESULT.writeId(packet); - packet.writeD(_enchanted ? 1 : 0); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java index 7b7d2d008d..410bf16510 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java @@ -42,7 +42,6 @@ public class ExEventMatchMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_EVENT_MATCH_MESSAGE.writeId(packet); - packet.writeC(_type); packet.writeS(_message); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java index 7264e90233..1946758bf5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java @@ -37,11 +37,9 @@ public class ExGetBookMarkInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOOK_MARK_INFO.writeId(packet); - - packet.writeD(0x00); // Dummy + packet.writeD(0); // Dummy packet.writeD(_player.getBookMarkSlot()); packet.writeD(_player.getTeleportBookmarks().size()); - for (TeleportBookmark tpbm : _player.getTeleportBookmarks()) { packet.writeD(tpbm.getId()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java index 36e7bb81af..201e8eb49b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java @@ -42,15 +42,14 @@ public class ExGetBossRecord implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOSS_RECORD.writeId(packet); - packet.writeD(_ranking); packet.writeD(_totalPoints); if (_bossRecordInfo == null) { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } else { @@ -59,7 +58,7 @@ public class ExGetBossRecord implements IClientOutgoingPacket { packet.writeD(entry.getKey()); packet.writeD(entry.getValue()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? } } return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java index ea0a5f8b18..85ccad0758 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java @@ -41,7 +41,6 @@ public class ExGetOffAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_OFF_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_x); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java index f8e16a4191..9a02e49223 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java @@ -39,7 +39,6 @@ public class ExGetOnAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_ON_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java index 51197344a5..704b3212a1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExGetPremiumItemList implements IClientOutgoingPacket { private final Player _player; - private final Map _map; public ExGetPremiumItemList(Player player) @@ -43,7 +42,6 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_PREMIUM_ITEM_LIST.writeId(packet); - packet.writeD(_map.size()); for (Entry entry : _map.entrySet()) { @@ -51,7 +49,7 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket packet.writeQ(entry.getKey()); packet.writeD(item.getItemId()); packet.writeQ(item.getCount()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeS(item.getSender()); } return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index 5f4810be42..34ef181b22 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -40,19 +40,18 @@ public class ExHeroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HERO_LIST.writeId(packet); - packet.writeD(_heroList.size()); for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); packet.writeD(hero.getInt(Olympiad.CLASS_ID)); packet.writeS(hero.getString(Hero.CLAN_NAME, "")); - packet.writeD(0x00); // hero.getInt(Hero.CLAN_CREST, 0) + packet.writeD(0); // hero.getInt(Hero.CLAN_CREST, 0) packet.writeS(hero.getString(Hero.ALLY_NAME, "")); - packet.writeD(0x00); // hero.getInt(Hero.ALLY_CREST, 0) + packet.writeD(0); // hero.getInt(Hero.ALLY_CREST, 0) packet.writeD(hero.getInt(Hero.COUNT)); - packet.writeD(0x00); - packet.writeC(0x00); // 272 + packet.writeD(0); + packet.writeC(0); // 272 } return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index d5b5430142..0baca7cd86 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -48,8 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); - - packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade + packet.writeC(_hide ? 0 : 1); // Grand Crusade packet.writeD(_currentTemplateId); packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java index 81db66b88f..323c0cdf1e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java @@ -35,7 +35,6 @@ public class ExIsCharNameCreatable implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_IS_CHAR_NAME_CREATABLE.writeId(packet); - packet.writeD(_allowed); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java index 2cea176d69..4eea62de37 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java @@ -39,11 +39,11 @@ public class ExItemAnnounce implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_ANNOUNCE.writeId(packet); - packet.writeC(0x00); // item icon + packet.writeC(0); // item icon packet.writeString(_player.getName()); // name of player packet.writeD(_item.getId()); // item id packet.writeD(_item.getEnchantLevel()); // enchant level - packet.writeC(0x00); // name of item + packet.writeC(0); // name of item return true; } } \ No newline at end of file diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java index ecc751eab3..45def9e0be 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java @@ -38,7 +38,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { throw new NullPointerException(); } - if (currentAuction.getAuctionState() != ItemAuctionState.STARTED) { _timeRemaining = 0; @@ -47,7 +46,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { _timeRemaining = (int) (currentAuction.getFinishingTimeRemaining() / 1000); // in seconds } - _refresh = refresh; _currentAuction = currentAuction; _nextAuction = nextAuction; @@ -57,16 +55,12 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_AUCTION_INFO.writeId(packet); - - packet.writeC(_refresh ? 0x00 : 0x01); + packet.writeC(_refresh ? 0 : 1); packet.writeD(_currentAuction.getInstanceId()); - final ItemAuctionBid highestBid = _currentAuction.getHighestBid(); packet.writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid()); - packet.writeD(_timeRemaining); writeItem(packet, _currentAuction.getItemInfo()); - if (_nextAuction != null) { packet.writeQ(_nextAuction.getAuctionInitBid()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java index f66c77509f..e40ebdb90b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java @@ -44,7 +44,6 @@ public class ExItemAuctionStatus implements IClientOutgoingPacket _x = spawn.getX(); _y = spawn.getY(); _z = spawn.getZ(); - final ItemAuctionInstance manager = ItemAuctionManager.getInstance().getManagerInstance(AUCTION_MANAGER); if (manager != null) { @@ -64,7 +63,7 @@ public class ExItemAuctionStatus implements IClientOutgoingPacket packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); + packet.writeD(0); packet.writeH(_status); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java index 53ad8abd58..1c5e38cbab 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListMpccWaiting implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _rooms = new LinkedList<>(); @@ -53,7 +54,6 @@ public class ExListMpccWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_MPCC_WAITING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 78f2fec636..eafea24fa6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _players = new LinkedList<>(); @@ -60,7 +61,6 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(packet); - packet.writeD(_size); packet.writeD(_players.size()); for (Player player : _players) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java index 786c616875..c8723a9fc0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java @@ -46,7 +46,6 @@ public class ExMPCCPartyInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCPARTY_INFO_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_LeaderOID); packet.writeD(_memberCount); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java index 4bf07f0133..08259e4e6c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java @@ -37,7 +37,6 @@ public class ExMPCCPartymasterList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_PARTYMASTER_LIST.writeId(packet); - packet.writeD(_leadersName.size()); _leadersName.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java index abbdc8fe76..f021ef5f1f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java @@ -36,7 +36,6 @@ public class ExMPCCRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java index 154e156270..2eec590cb4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java @@ -41,7 +41,6 @@ public class ExMPCCRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java index 06e3027bfc..a0e9d0a4b0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java @@ -37,7 +37,6 @@ public class ExMPCCShowPartyMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCSHOW_PARTY_MEMBER_INFO.writeId(packet); - packet.writeD(_party.getMemberCount()); for (Player pc : _party.getMembers()) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java index e454a746f3..771b2f22cb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java @@ -49,7 +49,6 @@ public class ExMagicAttackInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAGIC_ATTACK_INFO.writeId(packet); - packet.writeD(_caster); packet.writeD(_target); packet.writeD(_type); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java index 9cfbeb5aee..1aaa5b6520 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java @@ -35,7 +35,6 @@ public class ExMailArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAIL_ARRIVED.writeId(packet); - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java index 983ff22b92..48156c0600 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java @@ -44,7 +44,6 @@ public class ExManageMpccRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MANAGE_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java index f710c006e8..9d7d14211e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java @@ -45,7 +45,6 @@ public class ExMoveToLocationAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_objId); packet.writeD(_tx); packet.writeD(_ty); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java index 3e3bdc9fed..87e44b51cd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java @@ -43,7 +43,6 @@ public class ExMoveToLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java index 7ab0d1c7da..3c1902892a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java @@ -40,11 +40,9 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet); - packet.writeS(_channel.getLeader().getName()); - packet.writeD(0x00); // Channel loot 0 or 1 + packet.writeD(0); // Channel loot 0 or 1 packet.writeD(_channel.getMemberCount()); - packet.writeD(_channel.getParties().size()); for (Party p : _channel.getParties()) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java index 1536bd5f9b..f2a32bb6e8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java @@ -43,7 +43,6 @@ public class ExNeedToChangeName implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEED_TO_CHANGE_NAME.writeId(packet); - packet.writeD(_type); packet.writeD(_subType); packet.writeS(_name); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java index be9bec8559..d18b4606b3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java @@ -35,7 +35,6 @@ public class ExNevitAdventEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CHANNELING_EFFECT.writeId(packet); - packet.writeD(_timeLeft); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java index 3a0367c178..09f6250f51 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java @@ -35,7 +35,6 @@ public class ExNevitAdventPointInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_AGATHION_ENERGY_INFO.writeId(packet); - packet.writeD(_points); // 72 = 1%, max 7200 = 100% return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java index 88fdaae499..ef220d86de 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java @@ -37,9 +37,8 @@ public class ExNevitAdventTimeChange implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - // state 0 - pause 1 - started - packet.writeC(_paused ? 0x00 : 0x01); + packet.writeC(_paused ? 0 : 1); // left time in ms max is 16000 its 4m and state is automatically changed to quit packet.writeD(_time); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java index fccdf510cc..4025bf78fa 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java @@ -34,7 +34,6 @@ public class ExNewSkillToLearnByLevelUp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEW_SKILL_TO_LEARN_BY_LEVEL_UP.writeId(packet); - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java index 324c18a517..f2ce8614dc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java @@ -43,8 +43,7 @@ public class ExNoticePostArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTICE_POST_ARRIVED.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java index afe3719d9b..050c7ccea5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java @@ -43,8 +43,7 @@ public class ExNoticePostSent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_WRITE_POST.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java index 5d98c20b09..e0bd08d39a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java @@ -30,7 +30,6 @@ public class ExNotifyPremiumItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_PREMIUM_ITEM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java index 6cb3724448..ba3c0cfeaa 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java @@ -34,7 +34,6 @@ public class ExOlympiadMatchEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MATCH_END.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java index 264d5aa484..7ffd5ed3bd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java @@ -55,19 +55,15 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x00); // Type 0 = Match List, 1 = Match Result - + packet.writeD(0); // Type 0 = Match List, 1 = Match Result packet.writeD(_games.size()); - packet.writeD(0x00); - + packet.writeD(0); for (OlympiadGameTask curGame : _games) { final AbstractOlympiadGame game = curGame.getGame(); if (game != null) { packet.writeD(game.getStadiumId()); // Stadium Id (Arena 1 = 0) - if (game instanceof OlympiadGameNonClassed) { packet.writeD(1); @@ -80,8 +76,7 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket { packet.writeD(0); } - - packet.writeD(curGame.isRunning() ? 0x02 : 0x01); // (1 = Standby, 2 = Playing) + packet.writeD(curGame.isRunning() ? 2 : 1); // (1 = Standby, 2 = Playing) packet.writeS(game.getPlayerNames()[0]); // Player 1 Name packet.writeS(game.getPlayerNames()[1]); // Player 2 Name } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java index 712651603d..b387271fba 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java @@ -53,9 +53,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x01); // Type 0 = Match List, 1 = Match Result - + packet.writeD(1); // Type 0 = Match List, 1 = Match Result packet.writeD(_tie ? 1 : 0); // 0 - win, 1 - tie packet.writeS(_winnerList.get(0).getName()); packet.writeD(_winTeam); @@ -69,9 +67,8 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } - packet.writeD(_loseTeam); packet.writeD(_loserList.size()); for (OlympiadInfo info : _loserList) @@ -83,7 +80,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java index 34d81d1f53..712b9e06c6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java @@ -38,7 +38,6 @@ public class ExOlympiadMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MODE.writeId(packet); - packet.writeC(_mode); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java index ebea6c56f3..5b4f2c2523 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java @@ -53,7 +53,6 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_SPELLED_INFO.writeId(packet); - packet.writeD(_playerId); packet.writeD(_effects.size() + _effects2.size()); for (BuffInfo info : _effects) @@ -62,7 +61,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(info.getSkill().getDisplayId()); packet.writeH(info.getSkill().getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(info.getSkill().getAbnormalType().getClientId()); writeOptionalD(packet, info.getSkill().isAura() ? -1 : info.getTime()); } @@ -73,7 +72,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(skill.getDisplayId()); packet.writeH(skill.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(skill.getAbnormalType().getClientId()); packet.writeH(-1); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java index 18c34fe9de..ca473edfcf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java @@ -76,7 +76,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_USER_INFO.writeId(packet); - if (_player != null) { packet.writeC(_player.getOlympiadSide()); @@ -91,7 +90,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket packet.writeS(_par.getName()); packet.writeD(_par.getBaseClass()); } - packet.writeD(_curHp); packet.writeD(_maxHp); packet.writeD(_curCp); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java index e84d0251bd..7ec64cc8c3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java @@ -35,7 +35,6 @@ public class ExOpenMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OPEN_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java index 90349cc1a2..5661dc9f57 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java @@ -56,7 +56,6 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PCCAFE_POINT_INFO.writeId(packet); - packet.writeD(_points); // num points packet.writeD(_mAddPoint); // points inc display packet.writeC(_mPeriodType); // period(0=don't show window,1=acquisition,2=use points) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java index f7e8b4a99a..248a2f7d98 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_ADD.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java index 832bee0012..1f452f4bae 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_DELETE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_summon.getSummonType()); packet.writeD(_summon.getOwner().getObjectId()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java index 0646a67001..703694fa2f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_UPDATE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 0e3edb3ea7..e4c6b79ae0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -47,7 +47,6 @@ public class ExPartyRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index dec8a55f3b..c1272bd98c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -43,10 +43,8 @@ public class ExPetInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class ExPetInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class ExPetInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,9 +154,8 @@ public class ExPetInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -227,28 +205,24 @@ public class ExPetInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PET_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0x00); + packet.writeQ(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -267,7 +241,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -283,19 +257,19 @@ public class ExPetInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -307,20 +281,20 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -344,12 +318,12 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -379,12 +353,10 @@ public class ExPetInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java index 082f4c7662..0f72c05a3a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java @@ -34,7 +34,6 @@ public class ExPlayScene implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLAY_SCENE.writeId(packet); - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java index e98d317e14..7e3803bdaa 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java @@ -36,7 +36,6 @@ public class ExPledgeCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_COUNT.writeId(packet); - packet.writeD(_count); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java index 838029e284..4084de3481 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java @@ -38,7 +38,6 @@ public class ExPledgeDraftListSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_DRAFT_LIST_SEARCH.writeId(packet); - packet.writeD(_pledgeRecruitList.size()); for (PledgeWaitingInfo prl : _pledgeRecruitList) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java index fb956e9996..44e34004ea 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java @@ -25,11 +25,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExPledgeEmblem implements IClientOutgoingPacket { + private static final int TOTAL_SIZE = 65664; + private final int _crestId; private final int _clanId; private final byte[] _data; private final int _chunkId; - private static final int TOTAL_SIZE = 65664; public ExPledgeEmblem(int crestId, byte[] chunkedData, int clanId, int chunkId) { @@ -43,7 +44,6 @@ public class ExPledgeEmblem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clanId); packet.writeD(_crestId); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java index ed19bf976b..b32f8c0645 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitApplyInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_APPLY_INFO.writeId(packet); - packet.writeD(_status.ordinal()); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java index fc98b7b6f7..af4af9c9c1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitBoardDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_DETAIL.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClanId()); packet.writeD(_pledgeRecruitInfo.getKarma()); packet.writeS(_pledgeRecruitInfo.getInformation()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index b4d48373a6..eda808e754 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -34,7 +34,6 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket private final int _clanOnCurrentPage; private final int _startIndex; private final int _endIndex; - static final int CLAN_PER_PAGE = 12; public ExPledgeRecruitBoardSearch(List clanList, int currentPage) @@ -51,11 +50,9 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_SEARCH.writeId(packet); - packet.writeD(_currentPage); packet.writeD(_totalNumberOfPage); packet.writeD(_clanOnCurrentPage); - for (int i = _startIndex; i < _endIndex; i++) { packet.writeD(_clanList.get(i).getClanId()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 4ae5ffe316..b1f139226d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -40,7 +40,6 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java index 77080a3820..5844f220ec 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java @@ -39,7 +39,6 @@ public class ExPledgeWaitingList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST.writeId(packet); - packet.writeD(pledgePlayerRecruitInfos.size()); for (PledgeApplicantInfo recruitInfo : pledgePlayerRecruitInfos.values()) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java index a9245c1309..6b88572057 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java @@ -30,7 +30,6 @@ public class ExPledgeWaitingListAlarm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_ALARM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java index 60997b3da0..28c3967119 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java @@ -40,7 +40,6 @@ public class ExPledgeWaitingListApplied implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_APPLIED.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClan().getId()); packet.writeS(_pledgeRecruitInfo.getClan().getName()); packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java index 66a06892c2..1f53d1bb38 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java @@ -36,7 +36,6 @@ public class ExPledgeWaitingUser implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_USER.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getPlayerId()); packet.writeS(_pledgeRecruitInfo.getMessage()); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java index 49bc9b0995..5f404779f5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java @@ -43,7 +43,6 @@ public class ExPrivateStoreSetWholeMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_objectId); packet.writeS(_msg); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java index cb5e8fbce9..ff996b5d0c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutCommissionResultForVariationMake implements IClientOutgoingPac public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_COMMISSION_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_gemstoneObjId); packet.writeD(_itemId); packet.writeQ(_gemstoneCount); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java index 81721e921f..098472b7ae 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantScrollItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SCROLL_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java index 871f377db2..ffea182a49 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java index c47a4bcff4..8016e128f4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java index c8b46be499..95c0c0e4e1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_INTENSIVE_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_refinerItemObjId); packet.writeD(_lifestoneItemId); packet.writeD(_gemstoneItemId); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 2128b2b19f..2970ca00a2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -41,13 +41,12 @@ public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_CANCEL.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); packet.writeD(_itemAug1); packet.writeD(_itemAug2); packet.writeQ(_price); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java index 80541e65cd..c25dd16b01 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java @@ -34,10 +34,9 @@ public class ExPutItemResultForVariationMake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java index fe5eb74eb0..bc8896164d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java @@ -56,13 +56,12 @@ public class ExQuestNpcLogList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_NPC_LOG_LIST.writeId(packet); - packet.writeD(_questId); packet.writeC(_npcLogList.size()); for (NpcLogListHolder holder : _npcLogList) { packet.writeD(holder.isNpcString() ? holder.getId() : holder.getId() + 1000000); - packet.writeC(holder.isNpcString() ? 0x01 : 0x00); + packet.writeC(holder.isNpcString() ? 1 : 0); packet.writeD(holder.getCount()); } return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java index 62d622caff..60616b256d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java @@ -35,7 +35,6 @@ public class ExRedSky implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RED_SKY.writeId(packet); - packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java index ce40b1a792..163faff855 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java @@ -36,7 +36,6 @@ public class ExRegenMax implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REGEN_MAX.writeId(packet); - packet.writeD(1); packet.writeD(_time); packet.writeD(_tickInterval); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java index d864795cd6..a17525576b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java @@ -34,7 +34,6 @@ public class ExRemoveEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REMOVE_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 57ed88ac29..4e479e75a6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -56,7 +56,6 @@ public class ExReplyReceivedPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_RECEIVED_POST.writeId(packet); - packet.writeD(_msg.getMailType().ordinal()); // GOD if (_msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED) { @@ -76,11 +75,10 @@ public class ExReplyReceivedPost extends AbstractItemPacket } packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown packet.writeS(_msg.getSenderName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -92,9 +90,8 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeQ(_msg.getReqAdena()); packet.writeD(_msg.hasAttachments() ? 1 : 0); packet.writeD(_msg.isReturned() ? 1 : 0); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 75f6596194..ed490eae91 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -54,14 +54,12 @@ public class ExReplySentPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_SENT_POST.writeId(packet); - - packet.writeD(0x00); // GOD + packet.writeD(0); // GOD packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); packet.writeS(_msg.getReceiverName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -73,11 +71,11 @@ public class ExReplySentPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeQ(_msg.getReqAdena()); - packet.writeD(_msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(_msg.isReturned() ? 0x01 : 00); + packet.writeD(_msg.hasAttachments() ? 1 : 0); + packet.writeD(_msg.isReturned() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index cc4f7ce1d8..e6a3f9bca2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -35,7 +35,6 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java index 2634aa1cdd..60201b177f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java @@ -35,7 +35,6 @@ public class ExRequestHackShield implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REQUEST_HACK_SHIELD.writeId(packet); - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java index c51ff31d0b..75e3b3a945 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java @@ -29,13 +29,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyList implements IClientOutgoingPacket { + public static final int SHOW_FACESHAPE = 1; + public static final int SHOW_HAIRSTYLE = 0; + private final Player _player; private final int _type; private final Map _beautyItem; - public static final int SHOW_FACESHAPE = 1; - public static final int SHOW_HAIRSTYLE = 0; - public ExResponseBeautyList(Player player, int type) { _player = player; @@ -54,7 +54,6 @@ public class ExResponseBeautyList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java index ca2ed360ab..4b19201833 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java @@ -25,16 +25,15 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket { + public static final int FAILURE = 0; + public static final int SUCCESS = 1; + public static final int CHANGE = 0; + public static final int RESTORE = 1; + private final Player _player; private final int _type; private final int _result; - public static final int FAILURE = 0; - public static final int SUCCESS = 1; - - public static final int CHANGE = 0; - public static final int RESTORE = 1; - public ExResponseBeautyRegistReset(Player player, int type, int result) { _player = player; @@ -46,7 +45,6 @@ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_REGIST_RESET.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java index 0e313ef3b7..c0922cfb04 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java @@ -36,10 +36,8 @@ public class ExResponseResetList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_RESET_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); - packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java index 01fe1945ef..a230033d67 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java @@ -37,7 +37,6 @@ public class ExRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ROTATION.writeId(packet); - packet.writeD(_charId); packet.writeD(_heading); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index c58ccfc233..2646a71e77 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -36,7 +36,6 @@ public class ExRpItemLink extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RP_ITEM_LINK.writeId(packet); - writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java index 04556bbed2..f0c6eba8e9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java @@ -34,7 +34,6 @@ public class ExSearchOrc implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEARCH_ORC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index 1e06cc2a3f..7a4dced122 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -38,7 +38,6 @@ public class ExSendManorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_MANOR_LIST.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java index 1cf12b0ad1..095307c9c8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java @@ -125,7 +125,6 @@ public class ExSendUIEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_UIEVENT.writeId(packet); - packet.writeD(_objectId); packet.writeD(_type); // 0 = show, 1 = hide (there is 2 = pause and 3 = resume also but they don't work well you can only pause count down and you cannot resume it because resume hides the counter). packet.writeD(0); // unknown diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java index 4378479707..716a3e8623 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java @@ -385,16 +385,13 @@ public class ExServerPrimitive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SERVER_PRIMITIVE.writeId(packet); - packet.writeS(_name); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(65535); // has to do something with display range and angle packet.writeD(65535); // has to do something with display range and angle - packet.writeD(_points.size() + _lines.size()); - for (Point point : _points) { packet.writeC(1); // Its the type in this case Point @@ -408,7 +405,6 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(point.getY()); packet.writeD(point.getZ()); } - for (Line line : _lines) { packet.writeC(2); // Its the type in this case Line diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java index fb32e199b2..51fb91b643 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java @@ -46,7 +46,6 @@ public class ExSetCompassZoneCode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_COMPASS_ZONE_CODE.writeId(packet); - packet.writeD(_zoneType); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java index 1d0fbae3a4..34dee8bda0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java @@ -38,7 +38,6 @@ public class ExSetPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_PARTY_LOOTING.writeId(packet); - packet.writeD(_result); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java index 7b14ec8412..4e491af9d1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java @@ -34,7 +34,6 @@ public class ExShowAdventurerGuideBook implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_ADVENTURER_GUIDE_BOOK.writeId(packet); - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index 82554fdc5f..1f8df76083 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -39,7 +39,6 @@ public class ExShowAgitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AGIT_INFO.writeId(packet); - final Collection clanHalls = ClanHallData.getInstance().getClanHalls(); packet.writeD(clanHalls.size()); clanHalls.forEach(clanHall -> diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index dd11ee0150..51e6646ff5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -44,7 +44,6 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BASE_ATTRIBUTE_CANCEL_WINDOW.writeId(packet); - packet.writeD(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java index 14e55d39f3..e22345c4fd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java @@ -25,13 +25,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExShowBeautyMenu implements IClientOutgoingPacket { - private final Player _player; - private final int _type; - // TODO: Enum public static final int MODIFY_APPEARANCE = 0; public static final int RESTORE_APPEARANCE = 1; + private final Player _player; + private final int _type; + public ExShowBeautyMenu(Player player, int type) { _player = player; @@ -42,7 +42,6 @@ public class ExShowBeautyMenu implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BEAUTY_MENU.writeId(packet); - packet.writeD(_type); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 15d011befc..b0d2b90494 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -41,7 +41,6 @@ public class ExShowCastleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CASTLE_INFO.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) @@ -65,8 +64,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } packet.writeD(castle.getTaxPercent(TaxType.BUY)); packet.writeD((int) (castle.getSiege().getSiegeDate().getTimeInMillis() / 1000)); - - packet.writeC(castle.getSiege().isInProgress() ? 0x01 : 0x00); // Grand Crusade + packet.writeC(castle.getSiege().isInProgress() ? 1 : 0); // Grand Crusade packet.writeC(castle.getSide().ordinal()); // Grand Crusade } return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java index aeb4079f3a..f9a6ebe0e7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java @@ -38,7 +38,6 @@ public class ExShowContactList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_SHOW_POST_FRIEND.writeId(packet); - packet.writeD(_contacts.size()); _contacts.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index a079ea3129..94b989b583 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -37,7 +37,6 @@ public class ExShowCropInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _crops = (nextPeriod && !manor.isManorApproved()) ? null : manor.getCropProcure(manorId, nextPeriod); } @@ -46,10 +45,9 @@ public class ExShowCropInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Crop Sales" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Crop Sales" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); + packet.writeD(0); if (_crops != null) { packet.writeD(_crops.size()); @@ -64,17 +62,17 @@ public class ExShowCropInfo implements IClientOutgoingPacket if (seed == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(seed.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(seed.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(seed.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index a1e06eb2bf..1c65dde1a6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -62,10 +62,8 @@ public class ExShowCropSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getCropId()); // crop id diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index ee9fa9fd37..b625a1e4e7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -39,7 +39,6 @@ public class ExShowFortressInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_INFO.writeId(packet); - final Collection forts = FortManager.getInstance().getForts(); packet.writeD(forts.size()); for (Fort fort : forts) @@ -47,7 +46,7 @@ public class ExShowFortressInfo implements IClientOutgoingPacket final Clan clan = fort.getOwnerClan(); packet.writeD(fort.getResidenceId()); packet.writeS(clan != null ? clan.getName() : ""); - packet.writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00); + packet.writeD(fort.getSiege().isInProgress() ? 1 : 0); // Time of possession packet.writeD(fort.getOwnedTime()); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index f389b26ed5..678ab43e96 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -42,11 +42,9 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_MAP_INFO.writeId(packet); - packet.writeD(_fortress.getResidenceId()); packet.writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status packet.writeD(_fortress.getFortSize()); // barracks count - final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId()); if ((commanders != null) && !commanders.isEmpty() && _fortress.getSiege().isInProgress()) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 27da99cf41..da186103ae 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -51,7 +51,6 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_SIEGE_INFO.writeId(packet); - packet.writeD(_fortId); // Fortress Id packet.writeD(_size); // Total Barracks Count if (_csize > 0) @@ -64,22 +63,22 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { case 0: { - packet.writeD(0x03); + packet.writeD(3); break; } case 1: { - packet.writeD(0x02); + packet.writeD(2); break; } case 2: { - packet.writeD(0x01); + packet.writeD(1); break; } case 3: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -92,27 +91,27 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket // TODO: once control room supported, update packet.writeD(0x0x) to support 5th room case 0: { - packet.writeD(0x05); + packet.writeD(5); break; } case 1: { - packet.writeD(0x04); + packet.writeD(4); break; } case 2: { - packet.writeD(0x03); + packet.writeD(3); break; } case 3: { - packet.writeD(0x02); + packet.writeD(2); break; } case 4: { - packet.writeD(0x01); + packet.writeD(1); break; } } @@ -124,7 +123,7 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { for (int i = 0; i < _size; i++) { - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java index 8bb38fd28c..bc1e679418 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java @@ -41,8 +41,7 @@ public class ExShowManorDefaultInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_MANOR_DEFAULT_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" and "Crop Sales" buttons + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" and "Crop Sales" buttons packet.writeD(_crops.size()); for (Seed crop : _crops) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 1d3312d668..d03ce2a5fd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -52,10 +52,8 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet); - packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java index cf38d18c1c..f41999329f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java @@ -34,7 +34,6 @@ public class ExShowQuestInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_INFO.writeId(packet); - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java index 70f31e318f..0fa64c401d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java @@ -37,7 +37,6 @@ public class ExShowQuestMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_MARK.writeId(packet); - packet.writeD(_questId); packet.writeD(_questState); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index ab85228caf..1a6ee00a10 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ExShowReceivedPostList implements IClientOutgoingPacket { - private final List _inbox; - private static final int MESSAGE_FEE = 100; private static final int MESSAGE_FEE_PER_SLOT = 1000; + private final List _inbox; + public ExShowReceivedPostList(int objectId) { _inbox = MailManager.getInstance().getInbox(objectId); @@ -45,7 +45,6 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { @@ -64,18 +63,18 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getSenderName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); + packet.writeD(msg.isUnread() ? 1 : 0); packet.writeD(((msg.getMailType() == MailType.COMMISSION_ITEM_SOLD) || (msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED)) ? 0 : 1); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(msg.isReturned() ? 0x01 : 0x00); - packet.writeD(0x00); // SysString in some case it seems + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(msg.isReturned() ? 1 : 0); + packet.writeD(0); // SysString in some case it seems } } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(MESSAGE_FEE); packet.writeD(MESSAGE_FEE_PER_SLOT); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java index 9679468789..deebb99c8f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java @@ -33,6 +33,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; */ public class ExShowScreenMessage implements IClientOutgoingPacket { + // Positions + public static final byte TOP_LEFT = 1; + public static final byte TOP_CENTER = 2; + public static final byte TOP_RIGHT = 3; + public static final byte MIDDLE_LEFT = 4; + public static final byte MIDDLE_CENTER = 5; + public static final byte MIDDLE_RIGHT = 6; + public static final byte BOTTOM_CENTER = 7; + public static final byte BOTTOM_RIGHT = 8; + private final int _type; private final int _sysMessageId; private final int _unk1; @@ -48,15 +58,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket private List _parameters; // Localisation related. private String _lang; - // Positions - public static final byte TOP_LEFT = 0x01; - public static final byte TOP_CENTER = 0x02; - public static final byte TOP_RIGHT = 0x03; - public static final byte MIDDLE_LEFT = 0x04; - public static final byte MIDDLE_CENTER = 0x05; - public static final byte MIDDLE_RIGHT = 0x06; - public static final byte BOTTOM_CENTER = 0x07; - public static final byte BOTTOM_RIGHT = 0x08; public void setLang(String lang) { @@ -265,7 +266,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SCREEN_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -284,9 +284,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(sml.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -308,9 +308,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -318,7 +318,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket } } } - packet.writeD(_type); packet.writeD(_sysMessageId); packet.writeD(_position); @@ -326,9 +325,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java index 29ab5d355f..6123b08991 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java @@ -37,7 +37,6 @@ public class ExShowSeedInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _seeds = (nextPeriod && !manor.isManorApproved()) ? null : manor.getSeedProduction(manorId, nextPeriod); } @@ -46,16 +45,14 @@ public class ExShowSeedInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown if (_seeds == null) { packet.writeD(0); return true; } - packet.writeD(_seeds.size()); for (SeedProduction seed : _seeds) { @@ -67,17 +64,17 @@ public class ExShowSeedInfo implements IClientOutgoingPacket if (s == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(s.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(s.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(s.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java index e628099700..eb6e686e10 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java @@ -32,13 +32,10 @@ public class ExShowSeedMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_MAP_INFO.writeId(packet); - packet.writeD(2); // seed count - // Seed of Destruction packet.writeD(1); // id 1? Grand Crusade packet.writeD(2770 + GraciaSeedsManager.getInstance().getSoDState()); // sys msg id - // Seed of Infinity packet.writeD(2); // id 2? Grand Crusade // Manager not implemented yet diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index c9bf485ee2..05c0401a7c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -62,10 +62,8 @@ public class ExShowSeedSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getSeedId()); // seed id diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 1994402da2..269bec5b97 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -47,7 +47,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _cropsItems.put(cropId, item); } } - for (CropProcure crop : CastleManorManager.getInstance().getCropProcure(_manorId, false)) { if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) @@ -61,7 +60,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_cropsItems.size()); // size for (Item item : _cropsItems.values()) @@ -70,9 +68,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket packet.writeD(item.getObjectId()); // Object id packet.writeD(item.getId()); // crop id packet.writeD(seed.getLevel()); // seed level - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(1)); // reward 1 id - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(2)); // reward 2 id if (_castleCrops.containsKey(item.getId())) { @@ -85,9 +83,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket else { packet.writeD(0xFFFFFFFF); // manor - packet.writeQ(0x00); // buy residual - packet.writeQ(0x00); // buy price - packet.writeC(0x00); // reward + packet.writeQ(0); // buy residual + packet.writeQ(0); // buy price + packet.writeC(0); // reward } packet.writeQ(item.getCount()); // my crops } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index db4bccc928..b61d5b2301 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -40,7 +40,6 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { @@ -50,17 +49,17 @@ public class ExShowSentPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getReceiverName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); - packet.writeD(0x01); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(msg.isUnread() ? 1 : 0); + packet.writeD(1); + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(0); } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java index 0e4e9fd2ef..0dca57f2f8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java @@ -48,7 +48,6 @@ public class ExShowTerritory implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TERRITORY.writeId(packet); - packet.writeD(_vertices.size()); packet.writeD(_minZ); packet.writeD(_maxZ); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java index 4e284f82c5..86e1009bbf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java @@ -46,7 +46,6 @@ public class ExShowTrace implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TRACE.writeId(packet); - packet.writeH(0); // type broken in H5 packet.writeD(0); // time broken in H5 packet.writeH(_locations.size()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java index 3245767ed7..836a5c9624 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java @@ -44,7 +44,6 @@ public class ExShowUsm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_USM.writeId(packet); - packet.writeD(_videoId); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java index 4acdffa842..1f1a14c31b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java @@ -34,7 +34,6 @@ public class ExShowVariationCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_CANCEL_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java index 3a2298019e..9870424e26 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java @@ -35,7 +35,6 @@ public class ExShowVariationMakeWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_MAKE_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java index 169827bab3..86211c8d97 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java @@ -44,10 +44,9 @@ public class ExSpawnEmitter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SPAWN_EMITTER.writeId(packet); - packet.writeD(_npcObjectId); packet.writeD(_playerObjectId); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java index 620800c1c4..534549b4fe 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java @@ -36,7 +36,6 @@ public class ExStartScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_START_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java index 0bd990cf34..babac59129 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java index 0e2689d598..d3e67afe99 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipObjId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java index 44b064113f..f5b3e1340f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java @@ -36,7 +36,6 @@ public class ExStopScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index 8029930c9a..367ac79be4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -66,7 +66,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket } OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet); - packet.writeD(_inventory); packet.writeD(_warehouse); // packet.writeD(_freight); // Removed with 152. diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java index 3293a5b557..57563ca2f9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java @@ -39,7 +39,6 @@ public class ExSubPledgeSkillAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUB_PLEDGET_SKILL_ADD.writeId(packet); - packet.writeD(_type); packet.writeD(_skillId); packet.writeD(_skillLevel); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java index d61dfa20ab..816d6f16a6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java @@ -97,7 +97,6 @@ public class ExSubjobInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUBJOB_INFO.writeId(packet); - packet.writeC(_type); packet.writeD(_currClassId); packet.writeD(_currRace); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java index 85616016c7..b7a152629d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java @@ -38,7 +38,6 @@ public class ExTacticalSign implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TACTICAL_SIGN.writeId(packet); - packet.writeD(_target.getObjectId()); packet.writeD(_tokenId); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java index 8a1f520529..397e185fdd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java @@ -39,7 +39,6 @@ public class ExTeleportToLocationActivate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_TO_LOCATION_ACTIVATE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java index f860c2a40f..aab66c2e48 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java @@ -44,7 +44,6 @@ public class ExTryEnchantArtifactResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TRY_ENCHANT_ARTIFACT_RESULT.writeId(packet); - packet.writeD(_state); packet.writeD(_enchant); packet.writeD(0); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java index a214c53a0f..7bcddd964d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java @@ -27,6 +27,7 @@ public class ExUISetting implements IClientOutgoingPacket { public static final String UI_KEY_MAPPING_VAR = "UI_KEY_MAPPING"; public static final String SPLIT_VAR = " "; + private final byte[] _uiKeyMapping; public ExUISetting(Player player) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java index 187770cfc8..eff4285a8b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java @@ -37,7 +37,6 @@ public class ExUnReadMailCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_UN_READ_MAIL_COUNT.writeId(packet); - packet.writeD(_mailUnreadCount); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java index f992b3c937..e59c651371 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java @@ -41,7 +41,6 @@ public class ExUseSharedGroupItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USE_SHARED_GROUP_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeD(_grpId); packet.writeD(_remainingTime); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java index 66fa7d87db..97ceb8aa15 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java @@ -40,7 +40,6 @@ public class ExUserBoostStat implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_BOOST_STAT.writeId(packet); - int count = 0; int bonus = 0; switch (_type) @@ -68,7 +67,6 @@ public class ExUserBoostStat implements IClientOutgoingPacket count = 1; bonus = 100; } - if (bonus > 0) { count += (int) _player.getStat().getValue(Stat.VITALITY_SKILLS, 0); @@ -89,11 +87,9 @@ public class ExUserBoostStat implements IClientOutgoingPacket break; } } - packet.writeC(_type.getId()); packet.writeC(count); packet.writeH(bonus); - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java index 474fcc5208..f49d451587 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class ExUserInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getTransformationId()); - final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); final boolean isInvisible = _player.isInvisible(); packet.writeD(abnormalVisualEffects.size() + (isInvisible ? 1 : 0)); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java index b841449ab3..1069a64e3e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java @@ -36,12 +36,9 @@ public class ExUserInfoCubic implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_CUBIC.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(_player.getCubics().size()); - _player.getCubics().keySet().forEach(packet::writeH); - packet.writeD(_player.getAgathionId()); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java index 3e4afb995b..6ef31d6117 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java @@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExUserInfoEquipSlot extends AbstractMaskPacket { private final Player _player; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -66,11 +65,9 @@ public class ExUserInfoEquipSlot extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_EQUIP_SLOT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(InventorySlot.values().length); // 152 packet.writeB(_masks); - final PlayerInventory inventory = _player.getInventory(); for (InventorySlot slot : InventorySlot.values()) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java index 3eb1cf9578..d655e48843 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java @@ -36,7 +36,6 @@ public class ExUserInfoInvenWeight implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_INVEN_WEIGHT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java index 91e0e92338..16aa81e9c0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java @@ -44,7 +44,6 @@ public class ExValidateLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java index 727267c9d5..50cb4025e4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java @@ -35,7 +35,6 @@ public class ExVariationCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_CANCEL_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java index 5cdc1b8d0e..4fde190ae2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java @@ -32,14 +32,13 @@ public class ExVariationResult implements IClientOutgoingPacket { _option1 = option1; _option2 = option2; - _success = success ? 0x01 : 0x00; + _success = success ? 1 : 0; } @Override public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_RESULT.writeId(packet); - packet.writeD(_option1); packet.writeD(_option2); packet.writeD(_success); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java index db0acfd5ff..60fb57c0b3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java @@ -41,10 +41,9 @@ public class ExVitalityEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_EFFECT_INFO.writeId(packet); - packet.writeD(_points); packet.writeD(_vitalityBonus); // Vitality Bonus - packet.writeH(0x00); // Vitality additional bonus in % + packet.writeH(0); // Vitality additional bonus in % packet.writeH(_vitalityItemsRemaining); // How much vitality items remaining for use packet.writeH(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java index 3cd9d26602..9a401c2321 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java @@ -35,7 +35,6 @@ public class ExVitalityPointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_POINT_INFO.writeId(packet); - packet.writeD(_vitalityPoints); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java index 71baff96ea..c4c5539ca4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java @@ -45,7 +45,6 @@ public class ExVoteSystemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VOTE_SYSTEM_INFO.writeId(packet); - packet.writeD(_recomLeft); packet.writeD(_recomHave); packet.writeD(_bonusTime); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java index 21411f5abc..452b0dc43a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java @@ -37,7 +37,6 @@ public class ExWorldChatCnt implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_WORLD_CHAT_CNT.writeId(packet); - packet.writeD(_points); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java index 5f935fe0dc..dc9c2288f8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java @@ -79,19 +79,17 @@ public class FakePlayerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // vehicleId + packet.writeD(0); // vehicleId packet.writeD(_objId); packet.writeS(_npc.getName()); - packet.writeH(_npc.getRace().ordinal()); - packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 0x01 : 0x00); + packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 1 : 0); packet.writeD(_fpcHolder.getClassId()); - - packet.writeD(0x00); // Inventory.PAPERDOLL_UNDER + packet.writeD(0); // Inventory.PAPERDOLL_UNDER packet.writeD(_fpcHolder.getEquipHead()); packet.writeD(_fpcHolder.getEquipRHand()); packet.writeD(_fpcHolder.getEquipLHand()); @@ -103,28 +101,22 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_fpcHolder.getEquipRHand()); // dual hand packet.writeD(_fpcHolder.getEquipHair()); packet.writeD(_fpcHolder.getEquipHair2()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderAugument()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } - packet.writeC(_fpcHolder.getArmorEnchantLevel()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderVisualId()) { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeC(_npc.getScriptValue()); // getPvpFlag() packet.writeD(_npc.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -135,16 +127,12 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_npc.getCollisionRadius()); packet.writeF(_npc.getCollisionHeight()); - packet.writeD(_fpcHolder.getHair()); packet.writeD(_fpcHolder.getHairColor()); packet.writeD(_fpcHolder.getFace()); - packet.writeS(_npc.getTemplate().getTitle()); - if (_clan != null) { packet.writeD(_clan.getId()); @@ -154,71 +142,51 @@ public class FakePlayerInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - - packet.writeC(0x01); // isSitting() ? 0x00 : 0x01 (at some initial tests it worked) - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); - packet.writeC(_npc.isInCombat() ? 0x01 : 0x00); - - packet.writeC(_npc.isAlikeDead() ? 0x01 : 0x00); - - packet.writeC(_npc.isInvisible() ? 0x01 : 0x00); - - packet.writeC(0x00); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount - packet.writeC(0x00); // getPrivateStoreType().getId() - - packet.writeH(0x00); // getCubics().size() + packet.writeC(1); // isSitting() ? 0 : 1 (at some initial tests it worked) + packet.writeC(_npc.isRunning() ? 1 : 0); + packet.writeC(_npc.isInCombat() ? 1 : 0); + packet.writeC(_npc.isAlikeDead() ? 1 : 0); + packet.writeC(_npc.isInvisible() ? 1 : 0); + packet.writeC(0); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount + packet.writeC(0); // getPrivateStoreType().getId() + packet.writeH(0); // getCubics().size() // getCubics().keySet().forEach(packet::writeH); - packet.writeC(0x00); - + packet.writeC(0); packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : 0); packet.writeH(_fpcHolder.getRecommends()); - packet.writeD(0x00); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 - + packet.writeD(0); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 packet.writeD(_fpcHolder.getClassId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(_fpcHolder.getWeaponEnchantLevel()); // isMounted() ? 0 : _enchantLevel - packet.writeC(_npc.getTeam().getId()); - - packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0x00); + packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0); packet.writeC(_fpcHolder.getNobleLevel()); - packet.writeC(_fpcHolder.isHero() ? 0x01 : 0x00); - - packet.writeC(_fpcHolder.isFishing() ? 0x01 : 0x00); - + packet.writeC(_fpcHolder.isHero() ? 1 : 0); + packet.writeC(_fpcHolder.isFishing() ? 1 : 0); packet.writeD(_fpcHolder.getBaitLocationX()); packet.writeD(_fpcHolder.getBaitLocationY()); packet.writeD(_fpcHolder.getBaitLocationZ()); - packet.writeD(_fpcHolder.getNameColor()); - packet.writeD(_heading); - packet.writeC(_fpcHolder.getPledgeStatus()); - packet.writeH(0x00); // getPledgeType() - + packet.writeH(0); // getPledgeType() packet.writeD(_fpcHolder.getTitleColor()); - - packet.writeC(0x00); // isCursedWeaponEquipped - - packet.writeD(0x00); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 - packet.writeD(0x00); // getTransformationDisplayId() + packet.writeC(0); // isCursedWeaponEquipped + packet.writeD(0); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 + packet.writeD(0); // getTransformationDisplayId() packet.writeD(_fpcHolder.getAgathionId()); - - packet.writeC(0x00); - - packet.writeD(0x00); // getCurrentCp() + packet.writeC(0); + packet.writeD(0); // getCurrentCp() packet.writeD(_npc.getMaxHp()); packet.writeD((int) Math.round(_npc.getCurrentHp())); packet.writeD(_npc.getMaxMp()); packet.writeD((int) Math.round(_npc.getCurrentMp())); - - packet.writeC(0x00); + packet.writeC(0); final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) @@ -229,9 +197,9 @@ public class FakePlayerInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(0x00); // cocPlayer.getPosition() - packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 0x01 : 0x00); - packet.writeC(0x00); // Used Ability Points + packet.writeC(0); // cocPlayer.getPosition() + packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 1 : 0); + packet.writeC(0); // Used Ability Points return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java index ae088538da..03223c8a3e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java @@ -62,7 +62,6 @@ public class FlyToLocation implements IClientOutgoingPacket _destY = destY; _destZ = destZ; _type = type; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -82,7 +81,6 @@ public class FlyToLocation implements IClientOutgoingPacket _flySpeed = flySpeed; _flyDelay = flyDelay; _animationSpeed = animationSpeed; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -103,7 +101,6 @@ public class FlyToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FLY_TO_LOCATION.writeId(packet); - packet.writeD(_chaObjId); packet.writeD(_destX); packet.writeD(_destY); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java index 1e52b0ef72..471d70f791 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java @@ -35,8 +35,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x01); + packet.writeC(1); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 81a384642c..fb7572fc5d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -50,7 +50,6 @@ public class GMHennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GMHENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON @@ -64,19 +63,19 @@ public class GMHennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(0x01); + packet.writeD(1); } if (_player.getHenna(4) != null) { packet.writeD(_player.getHenna(4).getDyeId()); - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 1 : 0); } else { - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid } return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java index 38ca4c7be0..59bf0d9d93 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java @@ -38,7 +38,6 @@ public class GMHide implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_HIDE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index a828a26584..117f9cf67d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -50,7 +50,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -79,28 +78,24 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); packet.writeD(_player.getPkKills()); - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollObjectId(slot)); } - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); } - for (int slot = 0; slot < 11; slot++) { final VariationInstance augment = _player.getInventory().getPaperdollAugmentation(slot); packet.writeD(augment != null ? augment.getOption1Id() : 0); // Confirmed packet.writeD(augment != null ? augment.getOption2Id() : 0); // Confirmed } - packet.writeC(_player.getInventory().getTalismanSlots()); // CT2.3 packet.writeC(_player.getInventory().canEquipCloak() ? 1 : 0); // CT2.3 - packet.writeD(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeH(0); packet.writeD(_player.getPAtk()); packet.writeD(_player.getPAtkSpd()); packet.writeD(_player.getPDef()); @@ -108,18 +103,14 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAccuracy()); packet.writeD(_player.getCriticalHit()); packet.writeD(_player.getMAtk()); - packet.writeD(_player.getMAtkSpd()); packet.writeD(_player.getPAtkSpd()); - packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicEvasionRate()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name packet.writeD(_player.getReputation()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -135,8 +126,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeD(_player.isGM() ? 0x01 : 0x00); // builder level - + packet.writeD(_player.isGM() ? 1 : 0); // builder level packet.writeS(_player.getTitle()); packet.writeD(_player.getClanId()); // pledge id packet.writeD(_player.getClanCrestId()); // pledge crest id @@ -146,26 +136,19 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeC(_player.getCreateItemLevel() > 0 ? 1 : 0); packet.writeD(_player.getPkKills()); packet.writeD(_player.getPvpKills()); - packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); - - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeC(321); - packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window - packet.writeC(_player.getNobleLevel()); - packet.writeC(_player.isHero() ? 0x01 : 0x00); - + packet.writeC(_player.isHero() ? 1 : 0); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); - final AttributeType attackAttribute = _player.getAttackElement(); packet.writeH(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); @@ -175,8 +158,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket } packet.writeD(_player.getFame()); packet.writeD(_player.getVitalityPoints()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index 1d88596096..552b6e6168 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -37,14 +37,12 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_player.getName()); packet.writeD(_clan.getId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); @@ -52,15 +50,14 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 packet.writeD(_clan.getAllyCrestId()); // c2 packet.writeD(_clan.isAtWar() ? 1 : 0); // c3 - packet.writeD(0x00); // T3 Unknown - + packet.writeD(0); // T3 Unknown packet.writeD(_clan.getMembers().size()); for (ClanMember member : _clan.getMembers()) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java index 93af10e254..3c155ff816 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -38,10 +38,8 @@ public class GMViewSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_SKILL_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_skills.size()); - final boolean isDisabled = (_player.getClan() != null) && (_player.getClan().getReputationScore() < 0); for (Skill skill : _skills) { @@ -49,7 +47,7 @@ public class GMViewSkillInfo implements IClientOutgoingPacket packet.writeH(skill.getDisplayLevel()); packet.writeH(skill.getSubLevel()); packet.writeD(skill.getDisplayId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(isDisabled && skill.isClanSkill() ? 1 : 0); packet.writeC(skill.isEnchantable() ? 1 : 0); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index f49138fafe..c909d5e6e1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -51,7 +51,6 @@ public class GMViewWarehouseWithdrawList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_WAREHOUSE_WITHDRAW_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java index d8c273f914..449271993b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java @@ -35,7 +35,6 @@ public class GameGuardQuery implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GAME_GUARD_QUERY.writeId(packet); - packet.writeD(0x27533DD9); packet.writeD(0x2E72A51D); packet.writeD(0x2017038B); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index b0c011b696..037b2e6b6b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -35,10 +35,8 @@ public class GetItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ITEM.writeId(packet); - packet.writeD(_playerId); packet.writeD(_item.getObjectId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java index f8c6126c87..5f4d7bf3ca 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java @@ -50,7 +50,6 @@ public class GetOffVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_OFF_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_x); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java index ffa8d5f310..77d1e6ba28 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java @@ -45,7 +45,6 @@ public class GetOnVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ON_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java index e5dcb9ded6..b1f5b588f9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java @@ -44,14 +44,13 @@ public class GmViewQuestInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_QUEST_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeH(_questList.size()); // quest count - for (Quest quest : _questList) { final QuestState qs = _player.getQuestState(quest.getName()); packet.writeD(quest.getId()); packet.writeD(qs == null ? 0 : qs.getCond()); } - packet.writeH(0x00); // some size + packet.writeH(0); // some size // for size; ddQQ return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 395487097c..4309e2d74f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -51,7 +51,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeQ(_player.getAdena()); // activeChar current amount of Adena packet.writeD(3); // available equip slot packet.writeD(_hennaEquipList.size()); - for (Henna henna : _hennaEquipList) { // Player must have at least one dye in inventory @@ -62,8 +61,8 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); // item Id of the dye packet.writeQ(henna.getWearCount()); // amount of dyes required packet.writeQ(henna.getWearFee()); // amount of Adena required - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not - packet.writeD(0x00); // TODO: Find me! + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // meet the requirement or not + packet.writeD(0); // TODO: Find me! } } return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 30dc837721..b84d2283e8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -51,7 +51,6 @@ public class HennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON @@ -65,9 +64,8 @@ public class HennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); } - final Henna premium = _player.getHenna(4); if (premium != null) { @@ -77,16 +75,15 @@ public class HennaInfo implements IClientOutgoingPacket final long currentTime = Chronos.currentTimeMillis(); duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000; } - packet.writeD(premium.getDyeId()); packet.writeD(duration); // Premium Slot Dye Time Left - packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 1 : 0); } else { - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid } return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index cf3d83263f..5b77709720 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -40,12 +40,11 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_ITEM_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getWearCount()); // total amount of dye require packet.writeQ(_henna.getWearFee()); // total amount of Adena require to draw symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to draw or not 0 is false and 1 is true + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to draw or not 0 is false and 1 is true packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() + _player.getHennaValue(BaseStat.INT)); // equip INT @@ -63,7 +62,7 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket packet.writeH(_player.getLUC() + _player.getHennaValue(BaseStat.LUC)); // equip LUC packet.writeD(_player.getCHA()); // current CHA packet.writeH(_player.getCHA() + _player.getHennaValue(BaseStat.CHA)); // equip CHA - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index cb1379ac29..fc93d02a73 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -40,12 +40,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getCancelCount()); // total amount of dye require packet.writeQ(_henna.getCancelFee()); // total amount of Adena require to remove symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to remove or not + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to remove or not packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() - _player.getHennaValue(BaseStat.INT)); // equip INT @@ -63,7 +62,7 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket packet.writeH(_player.getLUC() - _player.getHennaValue(BaseStat.LUC)); // equip LUC packet.writeD(_player.getCHA()); // current CHA packet.writeH(_player.getCHA() - _player.getHennaValue(BaseStat.CHA)); // equip CHA - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 844fad86c7..452d354ac4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -39,7 +39,7 @@ public class HennaRemoveList implements IClientOutgoingPacket OutgoingPackets.HENNA_UNEQUIP_LIST.writeId(packet); packet.writeQ(_player.getAdena()); final boolean premiumSlotEnabled = _player.getHenna(4) != null; - packet.writeD(premiumSlotEnabled ? 0x04 : 0x03); // seems to be max size + packet.writeD(premiumSlotEnabled ? 4 : 3); // seems to be max size packet.writeD((premiumSlotEnabled ? 4 : 3) - _player.getHennaEmptySlots()); // slots used for (Henna henna : _player.getHennaList()) { @@ -49,8 +49,8 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); packet.writeQ(henna.getCancelCount()); packet.writeQ(henna.getCancelFee()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index b5c8628b50..f2a9cf1822 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -89,14 +89,12 @@ public interface IClientOutgoingPacket extends IOutgoingPacket Inventory.PAPERDOLL_ARTIFACT20, Inventory.PAPERDOLL_ARTIFACT21, }; - int[] PAPERDOLL_ORDER_AUGMENT = new int[] { Inventory.PAPERDOLL_RHAND, Inventory.PAPERDOLL_LHAND, Inventory.PAPERDOLL_RHAND }; - int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 0c54e810f0..3378827f34 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -46,7 +46,6 @@ public class InventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index c4598a72e6..cef69ecb6f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -59,8 +59,8 @@ public class ItemList extends AbstractItemPacket } else { - packet.writeC(0x01); // _showWindow ? 0x01 : 0x00 - packet.writeD(0x00); + packet.writeC(1); // _showWindow ? 1 : 0 + packet.writeD(0); packet.writeD(_items.size()); } writeInventoryBlock(packet, _player.getInventory()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java index b32b4df4a3..c3b9918230 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java @@ -32,9 +32,8 @@ public class JoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PARTY.writeId(packet); - packet.writeD(_response); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java index 65e06efeb7..f347f7efcd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java @@ -32,7 +32,6 @@ public class JoinPledge implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PLEDGE.writeId(packet); - packet.writeD(_pledgeId); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index 96f6d7c34d..996622b9e9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -35,17 +35,16 @@ public class KeyPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VERSION_CHECK.writeId(packet); - packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok for (int i = 0; i < 8; i++) { packet.writeC(_key[i]); // key } - packet.writeD(0x01); + packet.writeD(1); packet.writeD(Config.SERVER_ID); // server id - packet.writeC(0x01); - packet.writeD(0x00); // obfuscation key - packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 0x01 : 0x00); // isClassic + packet.writeC(1); + packet.writeD(0); // obfuscation key + packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 1 : 0); // isClassic return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java index 484c10f0c4..62424fd03a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java @@ -40,7 +40,6 @@ public class L2FriendSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_SAY.writeId(packet); - packet.writeD(0); // ?? packet.writeS(_receiver); packet.writeS(_sender); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java index b875edb772..790d599b5b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java @@ -32,11 +32,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ListPartyWaiting implements IClientOutgoingPacket { + private static final int NUM_PER_PAGE = 64; + private final List _rooms = new LinkedList<>(); private final int _size; - private static final int NUM_PER_PAGE = 64; - public ListPartyWaiting(PartyMatchingRoomLevelType type, int location, int page, int requestorLevel) { final List rooms = MatchingRoomManager.getInstance().getPartyMathchingRooms(location, type, requestorLevel); @@ -57,7 +57,6 @@ public class ListPartyWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_PARTY_WATING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java index 4f8f9adc64..bb0ac61dbd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java @@ -54,7 +54,6 @@ public class LoginFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LOGIN_FAIL.writeId(packet); - packet.writeD(_success); packet.writeD(_reason); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java index 18a522c315..6743e3e66f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java @@ -32,7 +32,6 @@ public class MagicSkillCanceld implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_CANCELED.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java index d56de10079..7ab29cc1a8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java @@ -66,7 +66,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // MagicSkillUse castingType packet.writeD(_objectId); packet.writeD(_skillId); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java index 1dbf929e1c..37ad6bd5cc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java @@ -84,7 +84,6 @@ public class MagicSkillUse implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_USE.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // Casting bar type: 0 - default, 1 - default up, 2 - blue, 3 - green, 4 - red. packet.writeD(_creature.getObjectId()); packet.writeD(_target.getObjectId()); @@ -111,7 +110,7 @@ public class MagicSkillUse implements IClientOutgoingPacket packet.writeD(_target.getX()); packet.writeD(_target.getY()); packet.writeD(_target.getZ()); - packet.writeD(_actionId >= 0 ? 0x01 : 0x00); // 1 when ID from RequestActionUse is used + packet.writeD(_actionId >= 0 ? 1 : 0); // 1 when ID from RequestActionUse is used packet.writeD(_actionId >= 0 ? _actionId : 0); // ID from RequestActionUse. Used to set cooldown on summon skills. packet.writeD(-1); // 306 return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java index 6b710c692e..12e2488f24 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java @@ -37,11 +37,9 @@ public class ManagePledgePower implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet); - packet.writeD(_rank); packet.writeD(_action); packet.writeD(_clan.getRankPrivs(_rank).getBitmask()); - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 95f4b6f201..4e2ab3f00b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -42,11 +42,9 @@ public class MonRaceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MON_RACE_INFO.writeId(packet); - packet.writeD(_unknown1); packet.writeD(_unknown2); - packet.writeD(0x08); - + packet.writeD(8); for (int i = 0; i < 8; i++) { packet.writeD(_monsters[i].getObjectId()); // npcObjectID @@ -68,7 +66,7 @@ public class MonRaceInfo implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java index 0093b3edc9..e6386921ff 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java @@ -45,13 +45,10 @@ public class MoveToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_xDst); packet.writeD(_yDst); packet.writeD(_zDst); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java index b1fb3ea003..59103c6c4c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java @@ -48,7 +48,6 @@ public class MoveToLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java index 30ff3c96af..aa261f924f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java @@ -50,11 +50,9 @@ public class MoveToPawn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_PAWN.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetId); packet.writeD(_distance); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index 00d7618d34..f94917d93d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -58,18 +58,16 @@ public class MultiSellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.MULTI_SELL_LIST.writeId(packet); - - packet.writeC(0x00); // Helios + packet.writeC(0); // Helios packet.writeD(_list.getId()); // list id - packet.writeC(0x00); // GOD Unknown + packet.writeC(0); // GOD Unknown packet.writeD(1 + (_index / PAGE_SIZE)); // page started from 1 - packet.writeD(_finished ? 0x01 : 0x00); // finished + packet.writeD(_finished ? 1 : 0); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - packet.writeC(0x00); // Grand Crusade - packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window - packet.writeD(0x20); // Helios - Always 32 - + packet.writeC(0); // Grand Crusade + packet.writeC(_list.isChanceMultisell() ? 1 : 0); // new multisell window + packet.writeD(32); // Helios - Always 32 while (_size-- > 0) { ItemInfo itemEnchantment = _list.getItemEnchantment(_index); @@ -86,20 +84,16 @@ public class MultiSellList extends AbstractItemPacket } } } - packet.writeD(_index); // Entry ID. Start from 1. packet.writeC(entry.isStackable() ? 1 : 0); - // Those values will be passed down to MultiSellChoose packet. packet.writeH(itemEnchantment != null ? itemEnchantment.getEnchantLevel() : 0); // enchant level writeItemAugment(packet, itemEnchantment); writeItemElemental(packet, itemEnchantment); writeItemEnsoulOptions(packet, itemEnchantment); - packet.writeC(0x00); // 286 - + packet.writeC(0); // 286 packet.writeH(entry.getProducts().size()); packet.writeH(entry.getIngredients().size()); - for (ItemChanceHolder product : entry.getProducts()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(product.getId()); @@ -122,9 +116,8 @@ public class MultiSellList extends AbstractItemPacket writeItemAugment(packet, displayItemEnchantment); writeItemElemental(packet, displayItemEnchantment); writeItemEnsoulOptions(packet, displayItemEnchantment); - packet.writeC(0x00); // 286 + packet.writeC(0); // 286 } - for (ItemChanceHolder ingredient : entry.getIngredients()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(ingredient.getId()); @@ -144,7 +137,7 @@ public class MultiSellList extends AbstractItemPacket writeItemAugment(packet, displayItemEnchantment); writeItemElemental(packet, displayItemEnchantment); writeItemEnsoulOptions(packet, displayItemEnchantment); - packet.writeC(0x00); // 286 + packet.writeC(0); // 286 } } return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java index 6e85f5348c..cd46aac3aa 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java @@ -45,11 +45,10 @@ public class MyTargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MY_TARGET_SELECTED.writeId(packet); - - packet.writeD(0x01); // Grand Crusade + packet.writeD(1); // Grand Crusade packet.writeD(_objectId); packet.writeH(_color); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java index 1901ad1297..166c5c1e00 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java @@ -36,7 +36,6 @@ public class NewCharacterSuccess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NEW_CHARACTER_SUCCESS.writeId(packet); - packet.writeD(_chars.size()); for (PlayerTemplate chr : _chars) { @@ -44,31 +43,24 @@ public class NewCharacterSuccess implements IClientOutgoingPacket { continue; } - // TODO: Unhardcode these packet.writeD(chr.getRace().ordinal()); packet.writeD(chr.getClassId().getId()); - packet.writeD(99); packet.writeD(chr.getBaseSTR()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseDEX()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseCON()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseINT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseWIT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseMEN()); packet.writeD(1); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java index be1605f679..6061ea26ef 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java @@ -38,7 +38,6 @@ public class NicknameChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NICK_NAME_CHANGED.writeId(packet); - packet.writeD(_objectId); packet.writeS(_title); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index f9cd107e2c..3e4837b4a4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -54,24 +54,20 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public NpcHtmlMessage(int npcObjId, int itemId) { super(npcObjId); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } public NpcHtmlMessage(int npcObjId, int itemId, String html) { super(npcObjId, html); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } @@ -79,11 +75,10 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java index 2b296c3d8e..ce56e727f2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java @@ -47,10 +47,8 @@ public class NpcInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -58,7 +56,6 @@ public class NpcInfo extends AbstractMaskPacket private int _clanId = 0; private int _statusMask = 0; private final Set _abnormalVisualEffects; - private String[] _localisation; public void setLang(String lang) @@ -101,112 +98,90 @@ public class NpcInfo extends AbstractMaskPacket { addComponentType(NpcInfoType.HEADING); } - if ((npc.getStat().getPAtkSpd() > 0) || (npc.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (npc.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((npc.getLeftHandItem() > 0) || (npc.getRightHandItem() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (npc.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (npc.getDisplayEffect() > 0) { addComponentType(NpcInfoType.DISPLAY_EFFECT); } - if (npc.isInsideZone(ZoneId.WATER) || npc.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (npc.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (npc.getCloneObjId() > 0) { addComponentType(NpcInfoType.CLONE); } - if (npc.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (npc.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (npc.getCurrentHp() <= npc.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (npc.getCurrentMp() <= npc.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (npc.getTemplate().isUsingServerSideName()) { addComponentType(NpcInfoType.NAME); } - if (npc.getTemplate().isUsingServerSideTitle() || (npc.isMonster() && (Config.SHOW_NPC_LEVEL || Config.SHOW_NPC_AGGRESSION)) || npc.isChampion() || npc.isTrap()) { addComponentType(NpcInfoType.TITLE); } - if (npc.getNameString() != null) { addComponentType(NpcInfoType.NAME_NPCSTRINGID); } - if (npc.getTitleString() != null) { addComponentType(NpcInfoType.TITLE_NPCSTRINGID); } - if (_npc.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (!_abnormalVisualEffects.isEmpty() || npc.isInvisible()) { addComponentType(NpcInfoType.ABNORMALS); } - if (npc.getEnchantEffect() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (npc.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (npc.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (npc.getClanId() > 0) { final Clan clan = ClanTable.getInstance().getClan(npc.getClanId()); @@ -220,14 +195,11 @@ public class NpcInfo extends AbstractMaskPacket addComponentType(NpcInfoType.CLAN); } } - addComponentType(NpcInfoType.COLOR_EFFECT); - if (npc.getPvpFlag() > 0) { addComponentType(NpcInfoType.PVP_FLAG); } - // TODO: Confirm me if (npc.isInCombat()) { @@ -245,8 +217,7 @@ public class NpcInfo extends AbstractMaskPacket { _statusMask |= 0x08; } - - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -296,27 +267,23 @@ public class NpcInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO.writeId(packet); - packet.writeD(_npc.getObjectId()); - packet.writeC(_npc.isShowSummonAnimation() ? 0x02 : 0x00); // // 0=teleported 1=default 2=summoned + packet.writeC(_npc.isShowSummonAnimation() ? 2 : 0); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 0x01 : 0x00); + packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0x00); + packet.writeQ(0); } if (containsMask(NpcInfoType.TITLE)) { String title = _npc.getTitle(); - // Localisation related. if ((_localisation != null) && !_localisation[1].equals("")) { @@ -329,10 +296,8 @@ public class NpcInfo extends AbstractMaskPacket title = title.replace(NpcData.getInstance().getTemplate(_npc.getId()).getTitle(), _localisation[1]); } } - packet.writeS(title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -351,7 +316,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -366,20 +331,20 @@ public class NpcInfo extends AbstractMaskPacket if (containsMask(NpcInfoType.EQUIPPED)) { packet.writeD(_npc.getRightHandItem()); - packet.writeD(0x00); // Armor id? + packet.writeD(0); // Armor id? packet.writeD(_npc.getLeftHandItem()); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_npc.isDead() ? 0x00 : 0x01); + packet.writeC(_npc.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); + packet.writeC(_npc.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 0x01 : _npc.isFlying() ? 0x02 : 0x00); + packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -391,7 +356,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_npc.isFlying() ? 0x01 : 0x00); + packet.writeD(_npc.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { @@ -427,12 +392,12 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(0x00); // 2 - do some animation on spawn + packet.writeC(0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -464,12 +429,10 @@ public class NpcInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java index c95a8e5274..923e9cebad 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class NpcInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_npc.getObjectId()); packet.writeD(_npc.getTransformationDisplayId()); - final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size()); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java index a294edc57a..2a0ba41eeb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java @@ -38,7 +38,6 @@ public class NpcQuestHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NPC_QUEST_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_questId); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java index d3328ade97..fc6d0d4a3a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java @@ -106,7 +106,6 @@ public class NpcSay implements IClientOutgoingPacket { _parameters = new ArrayList<>(); } - for (String item : params) { if ((item != null) && (item.length() > 0)) @@ -127,11 +126,9 @@ public class NpcSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_SAY.writeId(packet); - packet.writeD(_objectId); packet.writeD(_textType.getClientId()); packet.writeD(_npcId); - // Localisation related. if (_lang != null) { @@ -147,7 +144,6 @@ public class NpcSay implements IClientOutgoingPacket } } } - packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java index 356e3f48a9..ac61f9d247 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java @@ -33,11 +33,10 @@ public class ObservationMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_START.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me packet.writeD(0xc0); // TODO: Find me return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java index 5c0a0766b3..896ccea02b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java @@ -33,7 +33,6 @@ public class ObservationReturn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_END.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java index c2f7ab404f..173772c870 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java @@ -37,7 +37,6 @@ public class OnEventTrigger implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EVENT_TRIGGER.writeId(packet); - packet.writeD(_emitterId); packet.writeC(_enabled); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index fbb5c84dfe..37d4fea9cf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -45,7 +45,6 @@ public class PackageSendableList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java index a53f589386..e24d63f717 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java @@ -39,7 +39,6 @@ public class PackageToList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_TO_LIST.writeId(packet); - packet.writeD(_players.size()); for (Entry entry : _players.entrySet()) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 655c7abcd1..44b23b37f4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -55,7 +55,6 @@ public class PartyMemberPosition implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); - packet.writeD(locations.size()); for (Entry entry : locations.entrySet()) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java index 9e275ec246..c9d3595037 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java @@ -36,7 +36,6 @@ public class PartyRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java index 2233054c14..76c4555d3b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java @@ -36,12 +36,10 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ADD.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); // c3 packet.writeD(_party.getDistributionType().getId()); // c3 packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); - packet.writeD((int) _member.getCurrentCp()); // c4 packet.writeD(_member.getMaxCp()); // c4 packet.writeD((int) _member.getCurrentHp()); @@ -51,9 +49,9 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket packet.writeD(_member.getVitalityPoints()); packet.writeC(_member.getLevel()); packet.writeH(_member.getClassId().getId()); - packet.writeC(0x00); + packet.writeC(0); packet.writeH(_member.getRace().ordinal()); - packet.writeD(0x00); // 228 + packet.writeD(0); // 228 return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java index e806018375..3a47801de1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java @@ -37,21 +37,17 @@ public class PartySmallWindowAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ALL.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); packet.writeC(_party.getDistributionType().getId()); packet.writeC(_party.getMemberCount() - 1); - for (Player member : _party.getMembers()) { if ((member != null) && (member != _exclude)) { packet.writeD(member.getObjectId()); packet.writeS(member.getName()); - packet.writeD((int) member.getCurrentCp()); // c4 packet.writeD(member.getMaxCp()); // c4 - packet.writeD((int) member.getCurrentHp()); packet.writeD(member.getMaxHp()); packet.writeD((int) member.getCurrentMp()); @@ -59,10 +55,9 @@ public class PartySmallWindowAll implements IClientOutgoingPacket packet.writeD(member.getVitalityPoints()); packet.writeC(member.getLevel()); packet.writeH(member.getClassId().getId()); - packet.writeC(0x01); // Unk + packet.writeC(1); // Unk packet.writeH(member.getRace().ordinal()); - packet.writeD(0x00); // 228 - + packet.writeD(0); // 228 final Summon pet = member.getPet(); packet.writeD(member.getServitors().size() + (pet != null ? 1 : 0)); // Summon size, one only atm if (pet != null) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java index 94a8a5a2ce..09ce132af4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java @@ -33,7 +33,6 @@ public class PartySmallWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_DELETE.writeId(packet); - packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java index c53c6c7779..e9ea2efbbe 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java @@ -42,7 +42,6 @@ public class PartySmallWindowUpdate extends AbstractMaskPacket _summon.getStat().getExp()) { packet.writeQ(_summon.getStat().getExp()); // 0% absolute value @@ -160,11 +148,8 @@ public class PetInfo implements IClientOutgoingPacket { packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value } - packet.writeQ(_summon.getExpForNextLevel()); // 100% absoulte value - - packet.writeC(0x00); // 286 - + packet.writeC(0); // 286 packet.writeD(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight packet.writeD(_summon.getMaxLoad()); // max weight it can carry packet.writeD(_summon.getPAtk()); // patk @@ -180,25 +165,20 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD((int) _summon.getStat().getMoveSpeed()); // speed packet.writeD(_summon.getPAtkSpd()); // atkspeed packet.writeD(_summon.getMAtkSpd()); // casting speed - packet.writeC(0); // TODO: Check me, might be ride status packet.writeC(_summon.getTeam().getId()); // Confirmed packet.writeC(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed packet.writeC(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed - - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. - + packet.writeD(0); // TODO: Find me + packet.writeD(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. packet.writeC(_summon.getOwner().getSummonPoints()); // Used Summon Points packet.writeC(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points - final Set aves = _summon.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeH(aves.size()); // Confirmed for (AbnormalVisualEffect ave : aves) { packet.writeH(ave.getClientId()); // Confirmed } - packet.writeC(_statusMask); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 5b43daa74b..1f60ec39d1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -46,7 +46,6 @@ public class PetInventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.PET_INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index e4cf35779f..16dc83b7ed 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -35,7 +35,6 @@ public class PetItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java index fdb00ddbb1..913f65d470 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java @@ -38,7 +38,6 @@ public class PetStatusShow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_SHOW.writeId(packet); - packet.writeD(_summonType); packet.writeD(_summonObjectId); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 25c2c74292..823a8c405a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -52,7 +52,6 @@ public class PetStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_UPDATE.writeId(packet); - packet.writeD(_summon.getSummonType()); packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getX()); @@ -69,7 +68,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket packet.writeQ(_summon.getStat().getExp()); packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value packet.writeQ(_summon.getExpForNextLevel()); // 100% absolute value - packet.writeD(0x01); // TODO: Find me! + packet.writeD(1); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java index 4bc3570779..0898b01f67 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java @@ -63,7 +63,6 @@ public class PlaySound implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLAY_SOUND.writeId(packet); - packet.writeD(_unknown1); // unknown 0 for quest and ship; packet.writeS(_soundFile); packet.writeD(_unknown3); // unknown 0 for quest; 1 for ship; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java index fbe57d4aaf..5108fe7e1b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java @@ -44,7 +44,6 @@ public class PledgeCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java index aa11b1213e..6805f64d7c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java @@ -34,7 +34,6 @@ public class PledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_INFO.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getId()); packet.writeS(_clan.getName()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java index 7ae6a0d284..b28dbf33c3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java @@ -36,7 +36,6 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_MEMBER_INFO.writeId(packet); - packet.writeD(_member.getPledgeType()); packet.writeS(_member.getName()); packet.writeS(_member.getTitle()); // title diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java index eefd482979..6aa5067c8f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java @@ -36,7 +36,6 @@ public class PledgeReceivePowerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_POWER_INFO.writeId(packet); - packet.writeD(_member.getPowerGrade()); // power grade packet.writeS(_member.getName()); packet.writeD(_member.getClan().getRankPrivs(_member.getPowerGrade()).getBitmask()); // privileges diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 79d478aff9..f9387ea1d8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -40,8 +40,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_SUB_PLEDGE_CREATED.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); packet.writeD(_subPledge.getId()); packet.writeS(_subPledge.getName()); packet.writeS(getLeaderName()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java index 4d0efeb82a..7649947064 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java @@ -43,7 +43,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(packet); - packet.writeD(_tab); // page packet.writeD(_clanList.size()); for (ClanWar clanWar : _clanList) @@ -53,7 +52,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket { continue; } - packet.writeS(clan.getName()); packet.writeD(clanWar.getState().ordinal()); // type: 0 = Declaration, 1 = Blood Declaration, 2 = In War, 3 = Victory, 4 = Defeat, 5 = Tie, 6 = Error packet.writeD(clanWar.getRemainingTime()); // Time if friends to start remaining diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java index 2cbbdbf046..80d10fcb66 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java @@ -34,26 +34,25 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_INFO_UPDATE.writeId(packet); - // sending empty data so client will ask all the info in response ;) packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getLevel()); // clan level packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); // castle state ? + packet.writeD(0); // castle state ? packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); // clan reputation score - packet.writeD(0x00); // ? - packet.writeD(0x00); // ? + packet.writeD(0); // ? + packet.writeD(0); // ? packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); // c5 packet.writeD(_clan.getAllyCrestId()); // c5 packet.writeD(_clan.isAtWar() ? 1 : 0); // c5 - packet.writeD(0x00); // TODO: Find me! - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java index ae26e50dbb..2fa9f26d4a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java @@ -51,12 +51,11 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ADD.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); - packet.writeD(0x00); - packet.writeD(0x01); + packet.writeD(0); + packet.writeD(1); packet.writeD(_isOnline); // 1 = online 0 = offline packet.writeD(_pledgeType); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index 971d88c53d..8880e7853d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -57,30 +57,27 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(packet); - - packet.writeD(0x00); // _isSubPledge + packet.writeD(0); // _isSubPledge packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_name); packet.writeS(_leaderName); - packet.writeD(_clan.getCrestId()); // crest id .. is used again packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); // 0 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(0); // 0 packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.isAtWar() ? 1 : 0); // new c3 - packet.writeD(0x00); // Territory castle ID - + packet.writeD(0); // Territory castle ID packet.writeD(_members.size()); for (ClanMember m : _members) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java index 0fd387e419..154bcc610d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java @@ -32,7 +32,6 @@ public class PledgeShowMemberListDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_DELETE.writeId(packet); - packet.writeS(_player); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java index 9789e1e951..beefd2b6bd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java @@ -50,7 +50,6 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index 4e89797e45..09f70ea024 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -62,14 +62,14 @@ public class PledgeSkillList implements IClientOutgoingPacket { packet.writeD(sk.getDisplayId()); packet.writeH(sk.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } for (SubPledgeSkill sk : _subSkills) { packet.writeD(sk._subType); // Clan Sub-unit types packet.writeD(sk._skillId); packet.writeH(sk._skillLevel); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java index f3b8d4c26c..a94601294f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java @@ -37,7 +37,6 @@ public class PledgeSkillListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST_ADD.writeId(packet); - packet.writeD(_id); packet.writeD(_level); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java index 9e1b4843ac..5f32f2bf54 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java @@ -33,15 +33,14 @@ public class PledgeStatusChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_STATUS_CHANGED.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getLeaderId()); packet.writeD(_clan.getId()); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getAllyId()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.getCrestLargeId()); - packet.writeD(0x00); // pledge type ? + packet.writeD(0); // pledge type ? return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java index 5b56d0b28d..41d0f9f7d8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java @@ -44,12 +44,10 @@ public class PrivateStoreListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_LIST.writeId(packet); - packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); // Viewer's item count? + packet.writeD(0); // Viewer's item count? packet.writeD(_items.size()); - int slotNumber = 0; for (TradeItem item : _items) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 67b6ba8d94..d72050283e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -43,11 +43,10 @@ public class PrivateStoreListSell extends AbstractItemPacket else { OutgoingPackets.PRIVATE_STORE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index d05590cbde..df056c2e43 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -60,13 +60,13 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket { packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); + packet.writeD(0); for (Item item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item2 : _buyList) { writeItem(packet, item2); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index d8768104a4..6bbabb282b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -63,13 +63,13 @@ public class PrivateStoreManageListSell extends AbstractItemPacket packet.writeD(_objId); packet.writeD(_packageSale ? 1 : 0); packet.writeQ(_playerAdena); - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item2 : _sellList) { writeItem(packet, item2); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java index 8a5b9eef92..0d7bcbea16 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgBuy implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java index b00bd2add2..8fdb5701b8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgSell implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PvpBookList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PvpBookList.java index ac5e01a6a3..5d84e6471a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PvpBookList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PvpBookList.java @@ -32,7 +32,6 @@ public class PvpBookList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PVPBOOK_LIST.writeId(packet); - final int size = 1; packet.writeD(4); // show killer's location count packet.writeD(5); // teleport count diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java index c3958367e8..5ddaa46ba0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java @@ -40,7 +40,6 @@ public class RadarControl implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RADAR_CONTROL.writeId(packet); - packet.writeD(_showRadar); packet.writeD(_type); // maybe type packet.writeD(_x); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java index c7e4525bf2..bcfd911f58 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java @@ -40,10 +40,8 @@ public class RecipeBookItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_BOOK_ITEM_LIST.writeId(packet); - - packet.writeD(_isDwarvenCraft ? 0x00 : 0x01); // 0 = Dwarven - 1 = Common + packet.writeD(_isDwarvenCraft ? 0 : 1); // 0 = Dwarven - 1 = Common packet.writeD(_maxMp); - if (_recipes == null) { packet.writeD(0); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index d9c2621c84..a4e4641944 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -78,7 +78,6 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(_offeringMaximumAdena); // Adena worth of items for maximum offering. return true; } - PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java index a24ba356ef..ab67f9bff3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java @@ -50,7 +50,6 @@ public class RecipeShopItemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_ITEM_INFO.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD(_recipeId); packet.writeD((int) _manufacturer.getCurrentMp()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java index aac30faf53..ec67224b1e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java @@ -57,11 +57,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MANAGE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD((int) _seller.getAdena()); - packet.writeD(_isDwarven ? 0x00 : 0x01); - + packet.writeD(_isDwarven ? 0 : 1); if ((_recipes == null) || _recipes.isEmpty()) { packet.writeD(0); @@ -69,7 +67,6 @@ public class RecipeShopManageList implements IClientOutgoingPacket else { packet.writeD(_recipes.size()); // number of items in recipe book - int i = 1; for (RecipeHolder recipe : _recipes) { @@ -77,10 +74,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket packet.writeD(i++); } } - if ((_manufacture == null) || _manufacture.isEmpty()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -88,7 +84,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket for (Entry item : _manufacture) { packet.writeD(item.getKey()); - packet.writeD(0x00); // CanCraft? + packet.writeD(0); // CanCraft? packet.writeQ(item.getValue()); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java index c025b5e4ed..2b9bc5b6e7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java @@ -33,7 +33,6 @@ public class RecipeShopMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MSG.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeS(_player.getStoreName()); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java index 07ba331de9..8f504ce103 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java @@ -37,14 +37,13 @@ public class RecipeShopSellList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_SELL_LIST.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD((int) _manufacturer.getCurrentMp()); // Creator's MP packet.writeD(_manufacturer.getMaxMp()); // Creator's MP packet.writeQ(_buyer.getAdena()); // Buyer Adena if (!_manufacturer.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -52,7 +51,7 @@ public class RecipeShopSellList implements IClientOutgoingPacket for (Entry item : _manufacturer.getManufactureItems().entrySet()) { packet.writeD(item.getKey()); - packet.writeD(0x00); // CanCreate? + packet.writeD(0); // CanCreate? packet.writeQ(item.getValue()); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 1f19ffc899..393947e0bd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -88,7 +88,6 @@ public class RelationChanged implements IClientOutgoingPacket { return; } - final Relation r = new Relation(); r._objId = activeChar.getObjectId(); r._relation = relation; @@ -102,7 +101,6 @@ public class RelationChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RELATION_CHANGED.writeId(packet); - packet.writeC(_mask); if (_multi == null) { @@ -122,7 +120,6 @@ public class RelationChanged implements IClientOutgoingPacket private void writeRelation(PacketWriter packet, Relation relation) { packet.writeD(relation._objId); - if ((_mask & SEND_DEFAULT) != SEND_DEFAULT) { packet.writeQ(relation._relation); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java index b4e9dc25c5..4477cfb705 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java @@ -35,7 +35,6 @@ public class RequestEnchant implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java index 4ef15fb74c..7a0a6cbe58 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java @@ -33,7 +33,6 @@ public class Revive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.REVIVE.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java index 9c409601e3..b9ddf7733f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java @@ -42,7 +42,6 @@ public class Ride implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RIDE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_mounted); packet.writeD(_rideType); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 813ce03f4d..13ef62f55f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -49,11 +49,9 @@ public class SellListProcure implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SELL_LIST_PROCURE.writeId(packet); - packet.writeQ(_money); // money - packet.writeD(0x00); // lease ? + packet.writeD(0); // lease ? packet.writeH(_sellList.size()); // list size - for (Entry entry : _sellList.entrySet()) { final Item item = entry.getKey(); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java index baa37a8507..75b5b07854 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java @@ -39,12 +39,10 @@ public class SendMacroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MACRO_LIST.writeId(packet); - packet.writeC(_updateType.getId()); - packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0x00); // modified, created or deleted macro's id + packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0); // modified, created or deleted macro's id packet.writeC(_count); // count of Macros packet.writeC(_macro != null ? 1 : 0); // unknown - if ((_macro != null) && (_updateType != MacroUpdateType.DELETE)) { packet.writeD(_macro.getId()); // Macro ID @@ -52,9 +50,7 @@ public class SendMacroList implements IClientOutgoingPacket packet.writeS(_macro.getDescr()); // Desc packet.writeS(_macro.getAcronym()); // acronym packet.writeD(_macro.getIcon()); // icon - packet.writeC(_macro.getCommands().size()); // count - int i = 1; for (MacroCmd cmd : _macro.getCommands()) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java index 47fada25be..21622b5f19 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java @@ -32,7 +32,6 @@ public class SendTradeRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_REQUEST.writeId(packet); - packet.writeD(_senderId); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java index 69aa749406..1513a0e3d1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java @@ -55,7 +55,6 @@ public class ServerObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SERVER_OBJECT_INFO.writeId(packet); - packet.writeD(_activeChar.getObjectId()); packet.writeD(_displayId + 1000000); packet.writeS(_name); // name @@ -70,8 +69,8 @@ public class ServerObjectInfo implements IClientOutgoingPacket packet.writeF(_collisionHeight); packet.writeD((int) (_isAttackable ? _activeChar.getCurrentHp() : 0)); packet.writeD(_isAttackable ? _activeChar.getMaxHp() : 0); - packet.writeD(0x01); // object type - packet.writeD(0x00); // special effects + packet.writeD(1); // object type + packet.writeD(0); // special effects return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java index 88b370ad8b..0164e5c4a2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java @@ -34,7 +34,6 @@ public class SetSummonRemainTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SET_SUMMON_REMAIN_TIME.writeId(packet); - packet.writeD(_maxTime); packet.writeD(_remainingTime); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java index db28b72acf..016f5a0c9a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java @@ -38,7 +38,6 @@ public class ShopPreviewInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_INFO.writeId(packet); - packet.writeD(Inventory.PAPERDOLL_TOTALSLOTS); // Slots packet.writeD(getFromList(Inventory.PAPERDOLL_UNDER)); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index 358ee2361b..3e7efda220 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -49,11 +49,9 @@ public class ShopPreviewList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_LIST.writeId(packet); - packet.writeD(5056); packet.writeQ(_money); // current money packet.writeD(_listId); - int newlength = 0; for (Product product : _list) { @@ -63,23 +61,20 @@ public class ShopPreviewList implements IClientOutgoingPacket } } packet.writeH(newlength); - for (Product product : _list) { if (product.getItem().isEquipable()) { packet.writeD(product.getItemId()); packet.writeH(product.getItem().getType2()); // item type2 - if (product.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { packet.writeQ(product.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } else { - packet.writeQ(0x00); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand + packet.writeQ(0); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } - packet.writeQ(Config.WEAR_PRICE); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 298301ed0d..b13080ff28 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -40,7 +40,6 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_BUFF_STATUS_UPDATE.writeId(packet); - packet.writeD(_skillId); packet.writeH(_skillLevel); packet.writeH(_skillSubLevel); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index 33d36611b8..be5e1fadab 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -33,7 +33,6 @@ public class ShortCutInit implements IClientOutgoingPacket { return; } - _shortCuts = player.getAllShortCuts(); } @@ -41,26 +40,23 @@ public class ShortCutInit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); packet.writeD(sc.getSlot() + (sc.getPage() * 12)); - - packet.writeC(0x00); // 228 - + packet.writeC(0); // 228 switch (sc.getType()) { case ITEM: { packet.writeD(sc.getId()); - packet.writeD(0x01); // Enabled or not + packet.writeD(1); // Enabled or not packet.writeD(sc.getSharedReuseGroup()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeQ(0x00); // Augment id - packet.writeD(0x00); // Visual id + packet.writeD(0); + packet.writeD(0); + packet.writeQ(0); // Augment id + packet.writeD(0); // Visual id break; } case SKILL: @@ -69,8 +65,8 @@ public class ShortCutInit implements IClientOutgoingPacket packet.writeH(sc.getLevel()); packet.writeH(sc.getSubLevel()); packet.writeD(sc.getSharedReuseGroup()); - packet.writeC(0x00); // C5 - packet.writeD(0x01); // C6 + packet.writeC(0); // C5 + packet.writeD(1); // C6 break; } case ACTION: @@ -79,7 +75,7 @@ public class ShortCutInit implements IClientOutgoingPacket case BOOKMARK: { packet.writeD(sc.getId()); - packet.writeD(0x01); // C6 + packet.writeD(1); // C6 } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java index 7f584f966f..f85ada83c7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java @@ -37,12 +37,9 @@ public class ShortCutRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_REGISTER.writeId(packet); - packet.writeD(_shortcut.getType().ordinal()); packet.writeD(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client - - packet.writeC(0x00); // 228 - + packet.writeC(0); // 228 switch (_shortcut.getType()) { case ITEM: @@ -50,10 +47,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeD(_shortcut.getId()); packet.writeD(_shortcut.getCharacterType()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeD(0x00); // unknown - packet.writeD(0x00); // unknown - packet.writeD(0x00); // item augment id - packet.writeD(0x00); // TODO: Find me, item visual id ? + packet.writeD(0); // unknown + packet.writeD(0); // unknown + packet.writeD(0); // item augment id + packet.writeD(0); // TODO: Find me, item visual id ? break; } case SKILL: @@ -62,10 +59,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeH(_shortcut.getLevel()); packet.writeH(_shortcut.getSubLevel()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeC(0x00); // C5 + packet.writeC(0); // C5 packet.writeD(_shortcut.getCharacterType()); - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me + packet.writeD(0); // TODO: Find me break; } case ACTION: diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java index d6f71b5f70..cfae3b3fad 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java @@ -54,7 +54,6 @@ public class ShowBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - packet.writeC(_showBoard); // c4 1 to show community 00 to hide packet.writeS("bypass _bbshome"); // top packet.writeS("bypass _bbsgetfav"); // favorite diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java index 4b62a7001b..4d62e99d7a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java @@ -32,7 +32,6 @@ public class ShowCalculator implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_CALC.writeId(packet); - packet.writeD(_calculatorId); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java index 55f58d5375..4574762467 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java @@ -32,9 +32,8 @@ public class ShowMiniMap implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_MINIMAP.writeId(packet); - packet.writeD(_mapId); - packet.writeC(0x00); // Seven Signs state + packet.writeC(0); // Seven Signs state return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java index 303eab4e8a..97100d09d2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java @@ -34,7 +34,6 @@ public class ShowPCCafeCouponShowUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_PCCAFE_COUPON_SHOW_UI.writeId(packet); - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java index d86958e586..0a0f3ae861 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java @@ -35,7 +35,6 @@ public class ShowXMasSeal implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_XMAS_SEAL.writeId(packet); - packet.writeD(_item); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java index 66eccc7fbf..1baa030c4d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java @@ -28,9 +28,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = ca
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Attackers Clans?
* d = Number of Attackers Clans
* { //repeats
@@ -58,11 +58,10 @@ public class SiegeAttackerList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _castle.getSiege().getAttackerClans().size(); if (size > 0) { @@ -76,12 +75,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -90,8 +88,8 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index 5d5c831f14..8afd1f38ce 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -29,9 +29,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = 0xcb
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Defending Clans?
* d = Number of Defending Clans
* { //repeats
@@ -60,16 +60,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // Unknown - packet.writeD(0x01); // Unknown - packet.writeD(0x00); // Unknown - + packet.writeD(0); // Unknown + packet.writeD(1); // Unknown + packet.writeD(0); // Unknown final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0); packet.writeD(size); packet.writeD(size); - // Add owners final Clan ownerClan = _castle.getOwner(); if (ownerClan != null) @@ -78,14 +75,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket packet.writeS(ownerClan.getName()); packet.writeS(ownerClan.getLeaderName()); packet.writeD(ownerClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.OWNER.ordinal()); packet.writeD(ownerClan.getAllyId()); packet.writeS(ownerClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(ownerClan.getAllyCrestId()); } - // List of confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans()) { @@ -94,19 +90,17 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(defendingClan.getAllyCrestId()); } - // List of not confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans()) { @@ -115,12 +109,11 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER_PENDING.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 0a3fe46cb7..dfeefdaecf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -59,13 +59,11 @@ public class SiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_INFO.writeId(packet); - if (_castle != null) { packet.writeD(_castle.getResidenceId()); - final int ownerId = _castle.getOwnerId(); - packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 0x01 : 0x00); + packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0); packet.writeD(ownerId); if (ownerId > 0) { @@ -89,7 +87,6 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { @@ -97,7 +94,7 @@ public class SiegeInfo implements IClientOutgoingPacket cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis()); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(Config.SIEGE_HOUR_LIST.size()); for (int hour : Config.SIEGE_HOUR_LIST) { @@ -108,7 +105,7 @@ public class SiegeInfo implements IClientOutgoingPacket else { packet.writeD((int) (_castle.getSiegeDate().getTimeInMillis() / 1000)); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index d11b3817c0..3c4c475339 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -51,12 +51,11 @@ public class SkillCoolTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SKILL_COOL_TIME.writeId(packet); - packet.writeD(_skillReuseTimeStamps.size()); for (TimeStamp ts : _skillReuseTimeStamps) { packet.writeD(ts.getSkillId()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD((int) ts.getReuse() / 1000); packet.writeD((int) Math.max(ts.getStamp() - _currentTime, 0) / 1000); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index de54232b51..ed4615c403 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -41,10 +41,9 @@ public class Snoop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SNOOP.writeId(packet); - packet.writeD(_convoId); packet.writeS(_name); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_type.getClientId()); packet.writeS(_speaker); packet.writeS(_msg); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java index 37827bdf6c..52f15519a5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java @@ -37,10 +37,9 @@ public class SocialAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SOCIAL_ACTION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_actionId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index fd7e43a153..19066f5f85 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -33,16 +33,15 @@ public class SpawnItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPAWN_ITEM.writeId(packet); - packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeD(_item.isStackable() ? 0x01 : 0x00); + packet.writeD(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java index ccae75b850..04f3ad716c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java @@ -110,7 +110,6 @@ public class SpecialCamera implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPECIAL_CAMERA.writeId(packet); - packet.writeD(_id); packet.writeD(_force); packet.writeD(_angle1); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java index cdd3821740..281756e793 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java @@ -34,7 +34,6 @@ public class StartPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_PLEDGE_WAR.writeId(packet); - packet.writeS(_playerName); packet.writeS(_pledgeName); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java index 48b4238eea..27fb4f606b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java @@ -38,7 +38,6 @@ public class StartRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_side); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java index b4f421df36..067bdeb082 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java @@ -72,7 +72,6 @@ public class StaticObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATIC_OBJECT.writeId(packet); - packet.writeD(_staticObjectId); packet.writeD(_objectId); packet.writeD(_type); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index 928b54aa48..40836e4af8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -46,7 +46,6 @@ public class StatusUpdate implements IClientOutgoingPacket public void addUpdate(StatusUpdateType type, int level) { _updates.put(type, level); - if (_isPlayable) { switch (type) @@ -75,10 +74,9 @@ public class StatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATUS_UPDATE.writeId(packet); - packet.writeD(_objectId); // casterId - packet.writeD(_isVisible ? _casterObjectId : 0x00); - packet.writeC(_isVisible ? 0x01 : 0x00); + packet.writeD(_isVisible ? _casterObjectId : 0); + packet.writeC(_isVisible ? 1 : 0); packet.writeC(_updates.size()); for (Entry entry : _updates.entrySet()) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java index 9919307366..cf2b71df5a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java @@ -53,7 +53,6 @@ public class StopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java index 50fdc3fe4c..78fdb5d70c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java @@ -43,7 +43,6 @@ public class StopMoveInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java index 9c828c3962..b254cad8b1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java @@ -34,7 +34,6 @@ public class StopPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java index b0392de226..ca69cd5346 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java @@ -36,7 +36,6 @@ public class StopRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FINISH_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_speed); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index 4b332d0467..377301825d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -43,10 +43,8 @@ public class SummonInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class SummonInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class SummonInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,11 +154,9 @@ public class SummonInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - // Show red aura? - // if (_statusMask != 0) + // if (_statusMask != 0x00) // { // addComponentType(NpcInfoType.VISUAL_STATE); // } @@ -229,28 +206,24 @@ public class SummonInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.SUMMON_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0x00); + packet.writeQ(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -269,7 +242,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -285,19 +258,19 @@ public class SummonInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -309,20 +282,20 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -346,12 +319,12 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -381,12 +354,10 @@ public class SummonInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java index 864462f76f..6f88551204 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java @@ -34,7 +34,6 @@ public class SurrenderPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SURRENDER_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 746b2da3f7..b509d599db 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -161,7 +161,6 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } - _params[_paramIndex++] = param; } @@ -267,7 +266,6 @@ public class SystemMessage implements IClientOutgoingPacket { return addString(item.getName()); } - append(new SMParam(TYPE_ITEM_NAME, id)); return this; } @@ -389,7 +387,6 @@ public class SystemMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SYSTEM_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -402,13 +399,12 @@ public class SystemMessage implements IClientOutgoingPacket params[i] = _params[i].getValue(); } packet.writeH(SystemMessageId.S1_2.getId()); - packet.writeC(0x01); + packet.writeC(1); packet.writeC(TYPE_TEXT); packet.writeS(sml.getLocalisation(params)); return true; } } - packet.writeH(getId()); packet.writeC(_params.length); for (SMParam param : _params) @@ -418,9 +414,7 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } - packet.writeC(param.getType()); - switch (param.getType()) { case TYPE_ELEMENT_NAME: diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java index a91da07e77..d357efbb0e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java @@ -47,13 +47,12 @@ public class TargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_SELECTED.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java index 3dadd249f6..3d7208c06f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java @@ -42,12 +42,11 @@ public class TargetUnselected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_UNSELECTED.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index 943b5078b6..13f9b9565a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -41,14 +41,13 @@ public class TeleportToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TELEPORT_TO_LOCATION.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // Fade 0, Instant 1. + packet.writeD(0); // Fade 0, Instant 1. packet.writeD(_heading); - packet.writeD(0x00); // Unknown. + packet.writeD(0); // Unknown. return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java index cb82f2da59..8d09576d9d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java @@ -32,7 +32,6 @@ public class TradeDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_DONE.writeId(packet); - packet.writeD(_num); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java index 716ed2a099..6a94d2463f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java @@ -41,9 +41,9 @@ public class TradeOtherAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java index 3d0ef0b501..7907f3d498 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java @@ -41,9 +41,9 @@ public class TradeOwnAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c59568bf1d..3822108c5a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -58,7 +58,6 @@ public class TradeStart extends AbstractItemPacket { _mask |= 0x08; } - // Does not shows level if (_partner.isGM()) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java index f8e2a191de..e5ec2376cc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java @@ -44,10 +44,10 @@ public class TradeUpdate extends AbstractItemPacket { OutgoingPackets.TRADE_UPDATE.writeId(packet); packet.writeC(_sendType); - packet.writeD(0x01); + packet.writeD(1); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2); writeItem(packet, _item, _count); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java index c7102ca385..728020c0b1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java @@ -32,7 +32,6 @@ public class TutorialEnableClientEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_ENABLE_CLIENT_EVENT.writeId(packet); - packet.writeD(_eventId); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java index 92ac75afcf..7cc33a0f80 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java @@ -48,7 +48,6 @@ public class TutorialShowHtml extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_HTML.writeId(packet); - packet.writeD(_type); packet.writeS(getHtml()); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java index 75a57be38b..2ee62835db 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java @@ -37,7 +37,6 @@ public class TutorialShowQuestionMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_QUESTION_MARK.writeId(packet); - packet.writeC(_markType); packet.writeD(_markId); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index d47aa72532..7d19fd9246 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -38,7 +38,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class UserInfo extends AbstractMaskPacket { private Player _player; - private int _relation; private int _runSpd; private int _walkSpd; @@ -52,7 +51,6 @@ public class UserInfo extends AbstractMaskPacket private int _enchantLevel; private int _armorEnchant; private String _title; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -60,7 +58,6 @@ public class UserInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 5; public UserInfo(Player player) @@ -84,6 +81,7 @@ public class UserInfo extends AbstractMaskPacket _enchantLevel = player.getInventory().getWeaponEnchant(); _armorEnchant = player.getInventory().getArmorMinEnchant(); _title = player.getTitle(); + if (player.isGM() && player.isInvisible()) { _title = "[Invisible]"; @@ -139,30 +137,26 @@ public class UserInfo extends AbstractMaskPacket } OutgoingPackets.USER_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_initSize); packet.writeH(28); // 286 - 28 packet.writeB(_masks); - if (containsMask(UserInfoType.RELATION)) { packet.writeD(_relation); } - if (containsMask(UserInfoType.BASIC_INFO)) { packet.writeH(23 + (_player.getAppearance().getVisibleName().length() * 2)); packet.writeString(_player.getName()); - packet.writeC(_player.isGM() ? 0x01 : 0x00); + packet.writeC(_player.isGM() ? 1 : 0); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeD(_player.getLevel()); // 270 packet.writeD(_player.getClassId().getId()); // 286 } - if (containsMask(UserInfoType.BASE_STATS)) { packet.writeH(18); @@ -175,7 +169,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getLUC()); packet.writeH(_player.getCHA()); } - if (containsMask(UserInfoType.MAX_HPCPMP)) { packet.writeH(14); @@ -183,7 +176,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMaxMp()); packet.writeD(_player.getMaxCp()); } - if (containsMask(UserInfoType.CURRENT_HPMPCP_EXP_SP)) { packet.writeH(38); @@ -194,23 +186,20 @@ public class UserInfo extends AbstractMaskPacket packet.writeQ(_player.getExp()); packet.writeF((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel()))); } - if (containsMask(UserInfoType.ENCHANTLEVEL)) { packet.writeH(4); packet.writeC(_enchantLevel); packet.writeC(_armorEnchant); } - if (containsMask(UserInfoType.APPAREANCE)) { packet.writeH(15); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); } - if (containsMask(UserInfoType.STATUS)) { packet.writeH(6); @@ -219,7 +208,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.getCrystallizeGrade() != ItemGrade.NONE ? 1 : 0); packet.writeC(_player.getAbilityPoints() - _player.getAbilityPointsUsed()); } - if (containsMask(UserInfoType.STATS)) { packet.writeH(64); // 270 @@ -237,10 +225,9 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(0x00); // 270 - packet.writeD(0x00); // 270 + packet.writeD(0); // 270 + packet.writeD(0); // 270 } - if (containsMask(UserInfoType.ELEMENTALS)) { packet.writeH(14); @@ -251,7 +238,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getDefenseElementValue(AttributeType.HOLY)); packet.writeH(_player.getDefenseElementValue(AttributeType.DARK)); } - if (containsMask(UserInfoType.POSITION)) { packet.writeH(18); @@ -260,7 +246,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getZ()); packet.writeD(_player.isInVehicle() ? _player.getVehicle().getObjectId() : 0); } - if (containsMask(UserInfoType.SPEED)) { packet.writeH(18); @@ -273,21 +258,18 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_flyRunSpd); packet.writeH(_flyWalkSpd); } - if (containsMask(UserInfoType.MULTIPLIER)) { packet.writeH(18); packet.writeF(_moveMultiplier); packet.writeF(_player.getAttackSpeedMultiplier()); } - if (containsMask(UserInfoType.COL_RADIUS_HEIGHT)) { packet.writeH(18); packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); } - if (containsMask(UserInfoType.ATK_ELEMENTAL)) { packet.writeH(5); @@ -295,7 +277,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); } - if (containsMask(UserInfoType.CLAN)) { packet.writeH(32 + (_title.length() * 2)); @@ -305,12 +286,11 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getClanCrestLargeId()); packet.writeD(_player.getClanCrestId()); packet.writeD(_player.getClanPrivileges().getBitmask()); - packet.writeC(_player.isClanLeader() ? 0x01 : 0x00); + packet.writeC(_player.isClanLeader() ? 1 : 0); packet.writeD(_player.getAllyId()); packet.writeD(_player.getAllyCrestId()); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); } - if (containsMask(UserInfoType.SOCIAL)) { packet.writeH(30); // 228 @@ -330,130 +310,115 @@ public class UserInfo extends AbstractMaskPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeD(0x00); // 228 + packet.writeD(0); // 228 } - if (containsMask(UserInfoType.VITA_FAME)) { packet.writeH(19); // 196 packet.writeD(_player.getVitalityPoints()); - packet.writeC(0x00); // Vita Bonus + packet.writeC(0); // Vita Bonus packet.writeD(_player.getFame()); packet.writeD(_player.getRaidbossPoints()); - packet.writeC(0x00); // 196 + packet.writeC(0); // 196 packet.writeH(_player.getSymbolSealPoints()); // Henna Seal Engraving Gauge - packet.writeC(0x00); // 196 + packet.writeC(0); // 196 } - if (containsMask(UserInfoType.SLOTS)) { packet.writeH(12); // 152 packet.writeC(_player.getInventory().getTalismanSlots()); packet.writeC(_player.getInventory().getBroochJewelSlots()); packet.writeC(_player.getTeam().getId()); - packet.writeD(0x00); - + packet.writeD(0); if (_player.getInventory().getAgathionSlots() > 0) { - packet.writeC(0x01); // Charm slots + packet.writeC(1); // Charm slots packet.writeC(_player.getInventory().getAgathionSlots() - 1); packet.writeC(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152 } else { - packet.writeC(0x00); // Charm slots - packet.writeC(0x00); + packet.writeC(0); // Charm slots + packet.writeC(0); packet.writeC(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152 } } - if (containsMask(UserInfoType.MOVEMENTS)) { packet.writeH(4); packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); - packet.writeC(_player.isRunning() ? 0x01 : 0x00); + packet.writeC(_player.isRunning() ? 1 : 0); } - if (containsMask(UserInfoType.COLOR)) { packet.writeH(10); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); } - if (containsMask(UserInfoType.INVENTORY_LIMIT)) { packet.writeH(13); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); packet.writeH(_player.getInventoryLimit()); - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 } - if (containsMask(UserInfoType.TRUE_HERO)) { packet.writeH(9); - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeC(_player.isTrueHero() ? 100 : 0x00); + packet.writeD(0); + packet.writeH(0); + packet.writeC(_player.isTrueHero() ? 100 : 0); } - if (containsMask(UserInfoType.ATT_SPIRITS)) // 152 { packet.writeH(26); packet.writeD(-1); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - if (containsMask(UserInfoType.RANKING)) // 196 { packet.writeH(6); packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : RankManager.getInstance().getPlayerClassRank(_player) == 1 ? 4 : 0); } - if (containsMask(UserInfoType.STAT_POINTS)) // 235 { packet.writeH(16); - packet.writeH(0x00); // Usable points? - packet.writeH(0x00); // STR points - packet.writeH(0x00); // DEX points - packet.writeH(0x00); // CON points - packet.writeH(0x00); // INT points - packet.writeH(0x00); // WIT points - packet.writeH(0x00); // MEN points + packet.writeH(0); // Usable points? + packet.writeH(0); // STR points + packet.writeH(0); // DEX points + packet.writeH(0); // CON points + packet.writeH(0); // INT points + packet.writeH(0); // WIT points + packet.writeH(0); // MEN points } - if (containsMask(UserInfoType.STAT_ABILITIES)) // 235 { packet.writeH(18); - packet.writeH(0x00); // STR additional - packet.writeH(0x00); // DEX additional - packet.writeH(0x00); // CON additional - packet.writeH(0x00); // INT additional - packet.writeH(0x00); // WIT additional - packet.writeH(0x00); // MEN additional - packet.writeH(0x00); // ? - packet.writeH(0x00); // ? + packet.writeH(0); // STR additional + packet.writeH(0); // DEX additional + packet.writeH(0); // CON additional + packet.writeH(0); // INT additional + packet.writeH(0); // WIT additional + packet.writeH(0); // MEN additional + packet.writeH(0); // ? + packet.writeH(0); // ? } - if (containsMask(UserInfoType.ELIXIR_USED)) // 286 { packet.writeH(1); - packet.writeD(0x00); + packet.writeD(0); } - // Send exp bonus change. if (containsMask(UserInfoType.VITA_FAME)) { @@ -461,7 +426,6 @@ public class UserInfo extends AbstractMaskPacket _player.sendPacket(new ExUserBoostStat(_player, BonusExpType.BUFFS)); _player.sendPacket(new ExUserBoostStat(_player, BonusExpType.PASSIVE)); } - return true; } @@ -478,7 +442,6 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x10; // Party leader } } - if (clan != null) { relation |= 0x20; // Clan member @@ -487,12 +450,10 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x40; // Clan leader } } - if (player.isInSiege()) { relation |= 0x80; // In siege } - return relation; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java index 283bcf1614..90c416726a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java @@ -36,7 +36,6 @@ public class ValidateLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java index 4d8f9683d0..83f72bf981 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java @@ -40,7 +40,6 @@ public class ValidateLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java index b684e70bdc..71367cd26d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java @@ -36,7 +36,6 @@ public class VehicleCheckLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_CHECK_LOCATION.writeId(packet); - packet.writeD(_boat.getObjectId()); packet.writeD(_boat.getX()); packet.writeD(_boat.getY()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java index a4a5780f30..5b565c08b7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java @@ -46,7 +46,6 @@ public class VehicleDeparture implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_DEPARTURE.writeId(packet); - packet.writeD(_objId); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java index ec611028bf..4a995a6352 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java @@ -44,7 +44,6 @@ public class VehicleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java index 207a6fd899..bf629dcbbc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java @@ -42,7 +42,6 @@ public class VehicleStarted implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_START.writeId(packet); - packet.writeD(_objectId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 35ca986d35..5eb9eb7ab9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -30,6 +30,7 @@ public class WareHouseDepositList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; public static final int FREIGHT = 1; + private final int _sendType; private final long _playerAdena; private final List _items = new ArrayList<>(); @@ -49,7 +50,6 @@ public class WareHouseDepositList extends AbstractItemPacket _sendType = sendType; _whType = type; _playerAdena = player.getAdena(); - final boolean isPrivate = _whType == PRIVATE; for (Item temp : player.getInventory().getAvailableItems(true, isPrivate, false)) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 7af1cd273c..5ece99310a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -32,6 +32,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private final int _sendType; private Player _player; private long _playerAdena; @@ -60,7 +61,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } - _items = _player.getActiveWarehouse().getItems(); for (Item item : _items) { @@ -78,15 +78,15 @@ public class WareHouseWithdrawalList extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeH(0x00); + packet.writeH(0); packet.writeD(_invSize); packet.writeD(_items.size()); for (Item item : _items) { writeItem(packet, item); packet.writeD(item.getObjectId()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } else diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java index 7442882a70..bd10e174c6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java @@ -59,7 +59,6 @@ public class ExAcquireAPSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_AP_SKILL_LIST.writeId(packet); - packet.writeD(_enable ? 1 : 0); packet.writeQ(Config.ABILITY_POINTS_RESET_SP); // Changed to from Adena to SP on Grand Crusade // packet.writeQ(_price); Removed on Grand Crusade diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java index f9af89e4db..ff296bf632 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java @@ -35,7 +35,6 @@ public class ExCloseAPListWnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_AP_LIST_WND.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java index d72baf2a44..69c47ce99f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java @@ -35,7 +35,6 @@ public class ExShowAPListWnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AP_LIST_WND.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java index 5f2dd05f3b..aea1476fb2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java @@ -35,8 +35,7 @@ public class ExDivideAdenaCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_CANCEL.writeId(packet); - - packet.writeC(0x00); // TODO: Find me + packet.writeC(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java index 6af912cebf..de4e955aba 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java @@ -46,9 +46,8 @@ public class ExDivideAdenaDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_DONE.writeId(packet); - - packet.writeC(_isPartyLeader ? 0x01 : 0x00); - packet.writeC(_isCCLeader ? 0x01 : 0x00); + packet.writeC(_isPartyLeader ? 1 : 0); + packet.writeC(_isCCLeader ? 1 : 0); packet.writeD(_memberCount); packet.writeQ(_distributedAdenaCount); packet.writeQ(_adenaCount); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java index ab8a7471d6..32f99abfdc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java @@ -38,8 +38,7 @@ public class ExAlchemyConversion implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_CONVERSION.writeId(packet); - - packet.writeC((_successCount == 0) && (_failureCount == 0) ? 0x01 : 0x00); + packet.writeC((_successCount == 0) && (_failureCount == 0) ? 1 : 0); packet.writeD(_successCount); packet.writeD(_failureCount); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java index be4a2a57e6..cb3cf4b3e0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java @@ -47,7 +47,6 @@ public class ExTryMixCube implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TRY_MIX_CUBE.writeId(packet); - packet.writeC(_type.ordinal()); packet.writeD(_items.size()); for (AlchemyResult holder : _items) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index 549def456e..84b5fead76 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -43,7 +43,6 @@ public class ExChooseShapeShiftingItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_SHAPE_SHIFTING_ITEM.writeId(packet); - packet.writeD(_targetType != null ? _targetType.ordinal() : 0); packet.writeD(_type != null ? _type.ordinal() : 0); packet.writeD(_itemId); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java index 33fb439aa5..ba55887a1a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java @@ -45,7 +45,6 @@ public class ExCuriousHouseMemberUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_UPDATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_maxHp); packet.writeD(_maxCp); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java index 8ad3659725..be2d29d864 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPacket { - public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0x00); - public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(0x01); + public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0); + public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(1); private final int _result; @@ -39,7 +39,6 @@ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPa public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_EXTRACTION_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java index ec82cc14f3..e84d7a7255 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; public static final ExPutShapeShiftingTargetItemResult FAILED = new ExPutShapeShiftingTargetItemResult(RESULT_FAILED, 0); @@ -43,7 +43,6 @@ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_resultId); packet.writeQ(_price); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java index f4d3118cc4..038eae0042 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExShapeShiftingResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; - public static final int RESULT_CLOSE = 0x02; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; + public static final int RESULT_CLOSE = 2; public static final ExShapeShiftingResult FAILED = new ExShapeShiftingResult(RESULT_FAILED, 0, 0); public static final ExShapeShiftingResult CLOSE = new ExShapeShiftingResult(RESULT_CLOSE, 0, 0); @@ -47,7 +47,6 @@ public class ExShapeShiftingResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHAPE_SHIFTING_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_targetItemId); packet.writeD(_extractItemId); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java index eaf0d209fd..4b48b09002 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java @@ -38,7 +38,7 @@ public class ExConfirmVipAttendanceCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CONFIRM_VIP_ATTENDANCE_CHECK.writeId(packet); - packet.writeC(_available ? 0x01 : 0x00); // can receive reward today? 1 else 0 + packet.writeC(_available ? 1 : 0); // can receive reward today? 1 else 0 packet.writeC(_index); // active reward index packet.writeD(0); packet.writeD(0); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java index 9d61fe68d6..dd94df023f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java @@ -45,10 +45,10 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket OutgoingPackets.EX_VIP_ATTENDANCE_ITEM_LIST.writeId(packet); packet.writeC(_available ? _index + 1 : _index); // index to receive? packet.writeC(_index); // last received index? - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeC(0x01); - packet.writeC(_available ? 0x01 : 0x00); // player can receive reward today? + packet.writeD(0); + packet.writeD(0); + packet.writeC(1); + packet.writeC(_available ? 1 : 0); // player can receive reward today? packet.writeC(250); packet.writeC(AttendanceRewardData.getInstance().getRewardsCount()); // reward size int rewardCounter = 0; @@ -57,11 +57,11 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket rewardCounter++; packet.writeD(reward.getId()); packet.writeQ(reward.getCount()); - packet.writeC(0x01); // is unknown? - packet.writeC((rewardCounter % 7) == 0 ? 0x01 : 0x00); // is last in row? + packet.writeC(1); // is unknown? + packet.writeC((rewardCounter % 7) == 0 ? 1 : 0); // is last in row? } - packet.writeC(0x00); - packet.writeD(0x00); + packet.writeC(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java index 0282966053..9963a080c6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java @@ -41,7 +41,7 @@ public class ExActivateAutoShortcut implements IClientOutgoingPacket { OutgoingPackets.EX_ACTIVATE_AUTO_SHORTCUT.writeId(packet); packet.writeH(_position); - packet.writeC(_active ? 0x01 : 0x00); + packet.writeC(_active ? 1 : 0); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java index 7f1d6d60d1..73f93335ef 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java @@ -43,7 +43,6 @@ public class ExCuriousHouseMemberList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_LIST.writeId(packet); - packet.writeD(_id); packet.writeD(_maxPlayers); packet.writeD(_players.size()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java index b71caa5f14..5d9b34db61 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java @@ -37,7 +37,6 @@ public class ExCuriousHouseRemainTime implements IClientOutgoingPacket { OutgoingPackets.EX_CURIOUS_HOUSE_REMAIN_TIME.writeId(packet); packet.writeD(_time); - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionCloseUI.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionCloseUI.java index 494a5464a2..6a9a1ae36a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionCloseUI.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionCloseUI.java @@ -29,7 +29,7 @@ public class ExCollectionCloseUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLLECTION_CLOSE_UI.writeId(packet); - packet.writeC(0x00); + packet.writeC(0); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionFavoriteList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionFavoriteList.java index 7c441b7681..92ae04b2ba 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionFavoriteList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionFavoriteList.java @@ -29,7 +29,7 @@ public class ExCollectionFavoriteList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLLECTION_FAVORITE_LIST.writeId(packet); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java index 4c3ae253ea..c79b68becc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java @@ -39,7 +39,6 @@ public class ExResponseCommissionBuyInfo extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_INFO.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java index ddfa8b6db1..c1d29735b8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java @@ -40,7 +40,6 @@ public class ExResponseCommissionBuyItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_ITEM.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java index aa4bbbde24..01e4782408 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java @@ -39,7 +39,6 @@ public class ExResponseCommissionDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_DELETE.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java index e7e3c39816..b915574175 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java @@ -55,7 +55,6 @@ public class ExResponseCommissionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_INFO.writeId(packet); - packet.writeD(_result); packet.writeD(_itemId); packet.writeQ(_presetPricePerUnit); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java index 4963393b42..a012b3ab30 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java @@ -64,7 +64,6 @@ public class ExResponseCommissionList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_LIST.writeId(packet); - packet.writeD(_replyType.getClientId()); switch (_replyType) { @@ -73,13 +72,11 @@ public class ExResponseCommissionList extends AbstractItemPacket { packet.writeD((int) Instant.now().getEpochSecond()); packet.writeD(_chunkId); - int chunkSize = _items.size() - _listIndexStart; if (chunkSize > MAX_CHUNK_SIZE) { chunkSize = MAX_CHUNK_SIZE; } - packet.writeD(chunkSize); for (int i = _listIndexStart; i < (_listIndexStart + chunkSize); i++) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java index b1b0a97d7a..183547af06 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java @@ -39,7 +39,6 @@ public class ExResponseCommissionRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_REGISTER.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java index 74d8a95587..b68386e4ed 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java @@ -35,8 +35,7 @@ public class ExShowCommission implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_COMMISSION.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java index 0c267ecf34..11b1ff1e0a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExEnchantFail implements IClientOutgoingPacket { public static final ExEnchantFail STATIC_PACKET = new ExEnchantFail(0, 0); + private final int _itemOne; private final int _itemTwo; @@ -39,7 +40,6 @@ public class ExEnchantFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_FAIL.writeId(packet); - packet.writeD(_itemOne); packet.writeD(_itemTwo); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java index 71ba811ed5..87d29a8e7c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java @@ -36,7 +36,6 @@ public class ExEnchantSucess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SUCESS.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java index eb4eb8b26c..ec67d50fb6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java @@ -39,7 +39,6 @@ public class ExGetCrystalizingEstimation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - packet.writeD(_items.size()); for (ItemChanceHolder holder : _items) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java index 23b770e406..ebe77fa654 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java @@ -29,7 +29,7 @@ public class ExShowUpgradeSystem extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_UPGRADE_SYSTEM.writeId(packet); - packet.writeH(0x01); + packet.writeH(1); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java index 586d77c13f..2fb9bb65a1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java @@ -40,11 +40,9 @@ public class ExFactionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FACTION_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_openDialog ? 1 : 0); packet.writeD(Faction.values().length); - for (Faction faction : Faction.values()) { packet.writeC(faction.getId()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java index fa605b548a..a99ad7f4e3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java @@ -52,7 +52,7 @@ public class ExFishingStart implements IClientOutgoingPacket packet.writeD(_baitLocation.getX()); packet.writeD(_baitLocation.getY()); packet.writeD(_baitLocation.getZ()); - packet.writeC(0x01); // 0 = newbie, 1 = normal, 2 = night + packet.writeC(1); // 0 = newbie, 1 = normal, 2 = night return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java index 046ad04cb6..74501fe7ff 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java @@ -49,7 +49,6 @@ public class ExUserInfoFishing implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_FISHING.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_isFishing ? 1 : 0); if (_baitLocation == null) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index dc0e3e05bc..336a384bcc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -47,9 +47,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FRIEND_DETAIL_INFO.writeId(packet); - packet.writeD(_objectId); - if (_friend == null) { packet.writeS(_name); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java index 0d4bb47ff0..a90b7b6083 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java @@ -33,8 +33,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x00); + packet.writeC(0); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java index 9add9c9caa..d24139644c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java @@ -49,7 +49,6 @@ public class FriendAddRequestResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_charId); packet.writeS(_charName); @@ -57,7 +56,7 @@ public class FriendAddRequestResult implements IClientOutgoingPacket packet.writeD(_charObjectId); packet.writeD(_charLevel); packet.writeD(_charClassId); - packet.writeH(0x00); // Always 0 on retail + packet.writeH(0); // Always 0 on retail return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java index a135944662..13a7d01967 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java @@ -86,12 +86,10 @@ public class FriendList implements IClientOutgoingPacket } continue; } - if (player1.isOnline()) { online = true; } - classid = player1.getClassId().getId(); level = player1.getLevel(); _info.add(new FriendInfo(objId, name, online, classid, level)); @@ -102,14 +100,13 @@ public class FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._classid); packet.writeD(info._level); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java index 07c23f9fd2..1bb4142e34 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java @@ -38,7 +38,6 @@ public class FriendRemove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_REMOVE.writeId(packet); - packet.writeD(_responce); packet.writeS(_charName); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java index e8dbddcd63..a3990c0879 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java @@ -52,7 +52,6 @@ public class FriendStatus implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_STATUS.writeId(packet); - packet.writeD(_type); packet.writeS(_name); switch (_type) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java index 8752104e06..78da5850b8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java @@ -50,7 +50,6 @@ public class L2Friend implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND.writeId(packet); - packet.writeD(_action ? 1 : 3); // 1-add 3-remove packet.writeD(_objid); packet.writeS(_name); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java index b69a253635..e50693cb11 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java @@ -81,17 +81,16 @@ public class L2FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._level); packet.writeD(info._classId); - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExActivateHomunculusResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExActivateHomunculusResult.java index 1f0161916f..600cd7e3c6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExActivateHomunculusResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExActivateHomunculusResult.java @@ -37,7 +37,6 @@ public class ExActivateHomunculusResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACTIVATE_HOMUNCULUS_RESULT.writeId(packet); - packet.writeD(1); // success if (_activate) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExEnchantHomunculusSkillResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExEnchantHomunculusSkillResult.java index 96d9d9c491..1001fd2f94 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExEnchantHomunculusSkillResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExEnchantHomunculusSkillResult.java @@ -43,11 +43,9 @@ public class ExEnchantHomunculusSkillResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_HOMUNCULUS_SKILL_RESULT.writeId(packet); - final int playerNumber = Rnd.get(1, 6); final int homunculusNumber = Rnd.get(1, 6); final int systemNumber = Rnd.get(1, 6); - final Homunculus homunculus = _player.getHomunculusList().get(_slot); int boundLevel = 1; if ((playerNumber == homunculusNumber) && (playerNumber == systemNumber)) @@ -58,7 +56,6 @@ public class ExEnchantHomunculusSkillResult implements IClientOutgoingPacket { boundLevel = 2; } - switch (_skillNumber) { case 1: @@ -89,7 +86,6 @@ public class ExEnchantHomunculusSkillResult implements IClientOutgoingPacket } _player.getHomunculusList().update(homunculus); _player.getHomunculusList().refreshStats(true); - packet.writeD(boundLevel); // skill bound level result packet.writeD(homunculus.getId()); // homunculus id? random value on JP packet.writeD(_slot); // slot @@ -97,7 +93,6 @@ public class ExEnchantHomunculusSkillResult implements IClientOutgoingPacket packet.writeD(playerNumber); // player number packet.writeD(homunculusNumber); // homunculus number packet.writeD(systemNumber); // system number - return true; } } \ No newline at end of file diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusHPSPVP.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusHPSPVP.java index fc014757c1..142c6180d5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusHPSPVP.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusHPSPVP.java @@ -41,11 +41,9 @@ public class ExHomunculusHPSPVP implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HOMUNCULUS_HPSPVP.writeId(packet); - packet.writeD(_hp); packet.writeQ(_sp); packet.writeD(_vp); - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusInsertResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusInsertResult.java index 55e879fde7..678c865f06 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusInsertResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusInsertResult.java @@ -37,7 +37,6 @@ public class ExHomunculusInsertResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HOMUNCULUS_INSERT_RESULT.writeId(packet); - packet.writeD(1); // 1 - success if (_type == 0) { @@ -51,7 +50,6 @@ public class ExHomunculusInsertResult implements IClientOutgoingPacket { packet.writeD(SystemMessageId.THE_HOMUNCULUS_TAKES_YOUR_TEARS_VP.getId()); } - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java index 400dda6bd7..f52a9c1d38 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java @@ -31,10 +31,8 @@ public class ExHomunculusSummonResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HOMUNCULUS_SUMMON_RESULT.writeId(packet); - packet.writeD(1); // 1 - success packet.writeD(SystemMessageId.A_NEW_HOMUNCULUS_IS_CREATED.getId()); - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusBirthInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusBirthInfo.java index c42a0cd6ca..cdc24a4c11 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusBirthInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusBirthInfo.java @@ -44,7 +44,6 @@ public class ExShowHomunculusBirthInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_HOMUNCULUS_BIRTH_INFO.writeId(packet); - int creationStage = 0; if (_homunculusCreateTime > 0) { @@ -63,7 +62,6 @@ public class ExShowHomunculusBirthInfo implements IClientOutgoingPacket packet.writeD(_vpPoints); // vp points packet.writeD(_homunculusCreateTime); // finish time packet.writeD(0); // JP = 0. ? - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusCouponUi.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusCouponUi.java index 2dc15a3e77..3c288d09c7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusCouponUi.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusCouponUi.java @@ -29,7 +29,7 @@ public class ExShowHomunculusCouponUi implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_HOMUNCULUS_COUPON_UI.writeId(packet); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusList.java index 2af4d1b996..74372f0878 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusList.java @@ -39,7 +39,6 @@ public class ExShowHomunculusList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_HOMUNCULUS_LIST.writeId(packet); - if (_player.getHomunculusList().size() > 0) { packet.writeD(_player.getHomunculusList().size()); // homunculus count @@ -51,7 +50,6 @@ public class ExShowHomunculusList implements IClientOutgoingPacket { continue; } - packet.writeD(counter); // slot packet.writeD(homunculus.getId()); // homunculus id packet.writeD(homunculus.getType()); @@ -81,7 +79,6 @@ public class ExShowHomunculusList implements IClientOutgoingPacket { packet.writeD(0); } - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExSummonHomunculusCouponResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExSummonHomunculusCouponResult.java index 4ae3e05b36..28c7d148e2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExSummonHomunculusCouponResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExSummonHomunculusCouponResult.java @@ -36,11 +36,9 @@ public class ExSummonHomunculusCouponResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUMMON_HOMUNCULUS_COUPON_RESULT.writeId(packet); - packet.writeD(1); // 1 - success packet.writeD(_slot); // homunculus slot packet.writeD(0); // keep or delete - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java index 0d4fa5cb5d..d0b92dbd1d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java @@ -40,7 +40,7 @@ public class TimedHuntingZoneEnter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); - packet.writeC(0x01); // bEnterSuccess + packet.writeC(1); // bEnterSuccess packet.writeD(_zoneId); packet.writeD((int) ((Chronos.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) packet.writeD(_player.getTimedHuntingZoneRemainingTime(_zoneId) / 1000); // nRemainTime (zone left time) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java index 2c93f25c76..c80dbcfa6a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java @@ -35,7 +35,7 @@ public class TimedHuntingZoneExit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); - packet.writeC(0x00); // bEnterSuccess + packet.writeC(0); // bEnterSuccess return true; } } \ No newline at end of file diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java index 677c09091f..706c179a9c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java @@ -37,7 +37,6 @@ public class ExMentorAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_ADD.writeId(packet); - packet.writeS(_mentor.getName()); packet.writeD(_mentor.getActiveClass()); packet.writeD(_mentor.getLevel()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java index 4722a9cab3..18c1cdeedf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java @@ -64,9 +64,8 @@ public class ExMentorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_LIST.writeId(packet); - packet.writeD(_type); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mentees.size()); for (Mentee mentee : _mentees) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java index d739dd94b7..2283920b98 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ListMenteeWaiting implements IClientOutgoingPacket { private static final int PLAYERS_PER_PAGE = 64; + private final List _possibleCandiates = new ArrayList<>(); private final int _page; @@ -51,18 +52,15 @@ public class ListMenteeWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_MENTEE_WAITING.writeId(packet); - - packet.writeD(0x01); // always 1 in retail + packet.writeD(1); // always 1 in retail if (_possibleCandiates.isEmpty()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } - packet.writeD(_possibleCandiates.size()); packet.writeD(_possibleCandiates.size() % PLAYERS_PER_PAGE); - for (Player player : _possibleCandiates) { if ((1 <= (PLAYERS_PER_PAGE * _page)) && (1 > (PLAYERS_PER_PAGE * (_page - 1)))) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pk/ExPkPenaltyList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pk/ExPkPenaltyList.java index f292e1e19f..cc0522fecb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pk/ExPkPenaltyList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pk/ExPkPenaltyList.java @@ -37,7 +37,6 @@ public class ExPkPenaltyList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PK_PENALTY_LIST.writeId(packet); - final Set players = World.getInstance().getPkPlayers(); packet.writeD(World.getInstance().getLastPkTime()); packet.writeD(players.size()); @@ -48,7 +47,6 @@ public class ExPkPenaltyList implements IClientOutgoingPacket packet.writeD(player.getLevel()); packet.writeD(player.getClassId().getId()); } - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pk/ExPkPenaltyListOnlyLoc.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pk/ExPkPenaltyListOnlyLoc.java index 66b8ef6664..82934b1535 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pk/ExPkPenaltyListOnlyLoc.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pk/ExPkPenaltyListOnlyLoc.java @@ -37,7 +37,6 @@ public class ExPkPenaltyListOnlyLoc implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PK_PENALTY_LIST_ONLY_LOC.writeId(packet); - final Set players = World.getInstance().getPkPlayers(); packet.writeD(World.getInstance().getLastPkTime()); packet.writeD(players.size()); @@ -48,7 +47,6 @@ public class ExPkPenaltyListOnlyLoc implements IClientOutgoingPacket packet.writeD(player.getY()); packet.writeD(player.getZ()); } - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java index e33e29a487..fc80b0a6c0 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java @@ -41,7 +41,6 @@ public class ExPledgeContributionInfo implements IClientOutgoingPacket { return false; } - OutgoingPackets.EX_PLEDGE_CONTRIBUTION_INFO.writeId(packet); packet.writeD(_player.getClanContribution()); packet.writeD(_player.getClanContribution()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java index e65c0ced20..64b1bfd2e6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java @@ -44,10 +44,8 @@ public class ExPledgeContributionRank implements IClientOutgoingPacket { return false; } - OutgoingPackets.EX_PLEDGE_CONTRIBUTION_RANK.writeId(packet); packet.writeC(_cycle); - packet.writeD(_clan.getMembersCount()); int order = 1; for (ClanMember member : _clan.getMembers()) @@ -70,7 +68,6 @@ public class ExPledgeContributionRank implements IClientOutgoingPacket packet.writeD(member.getClanContributionTotal()); } } - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java index c235245d89..e66b814d06 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java @@ -42,9 +42,7 @@ public class ExPledgeItemList extends AbstractItemPacket { return false; } - OutgoingPackets.EX_PLEDGE_ITEM_LIST.writeId(packet); - packet.writeH(ClanShopData.getInstance().getProducts().size()); // Product count. for (ClanShopProductHolder product : ClanShopData.getInstance().getProducts()) { @@ -61,7 +59,6 @@ public class ExPledgeItemList extends AbstractItemPacket packet.writeH(0); // Current stock packet.writeH(0); // Total stock } - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java index e4df4b523e..21c5ba1724 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java @@ -44,9 +44,7 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket { return false; } - OutgoingPackets.EX_PLEDGE_MASTERY_INFO.writeId(packet); - packet.writeD(clan.getUsedDevelopmentPoints()); // Consumed development points packet.writeD(clan.getTotalDevelopmentPoints()); // Total development points packet.writeD(16); // Mastery count @@ -56,8 +54,7 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket { final int id = mastery.getId(); packet.writeD(id); // Mastery - packet.writeD(0x00); // ? - + packet.writeD(0); // ? boolean available = true; if (clan.getLevel() < mastery.getClanLevel()) { @@ -76,11 +73,9 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket available = clan.hasMastery(previous); } } - - packet.writeC(clan.hasMastery(id) ? 0x02 : available ? 0x01 : 0x00); // Availability. + packet.writeC(clan.hasMastery(id) ? 2 : available ? 1 : 0); // Availability. } } - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java index d31a014aea..568aa70f70 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java @@ -46,15 +46,12 @@ public class ExPledgeMissionInfo implements IClientOutgoingPacket { return true; } - OutgoingPackets.EX_PLEDGE_MISSION_INFO.writeId(packet); - packet.writeD(_rewards.size()); for (DailyMissionDataHolder reward : _rewards) { int progress = reward.getProgress(_player); int status = reward.getStatus(_player); - // TODO: Figure out this. if (reward.isLevelUpMission()) { @@ -76,12 +73,10 @@ public class ExPledgeMissionInfo implements IClientOutgoingPacket { status = 2; } - packet.writeD(reward.getId()); packet.writeD(progress); packet.writeC(status); } - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java index ce1d6327e7..604181c6ed 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java @@ -41,10 +41,8 @@ public class ExPledgeMissionRewardCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_MISSION_REWARD_COUNT.writeId(packet); - packet.writeD(Math.min(_availableMissionsCount, _doneMissionsCount)); // Received missions rewards. packet.writeD(_availableMissionsCount); // Available missions rewards. 18 - for noble, 20 - for honnorable noble. - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java index e59ebcfaab..22cf060348 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java @@ -43,7 +43,6 @@ public class ExPledgeShowInfoUpdate extends AbstractItemPacket { return false; } - OutgoingPackets.EX_PLEDGE_SHOW_INFO_UPDATE.writeId(packet); packet.writeD(clan.getId()); // Clan ID packet.writeD(ClanLevelData.getLevelRequirement(clan.getLevel())); // Next level cost diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index fb735b8925..e75426e598 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -69,7 +69,6 @@ public class ExBRBuyProduct implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUY_PRODUCT.writeId(packet); - packet.writeD(_reply); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java index 742b3eba9d..91a186b81d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java @@ -39,10 +39,9 @@ public class ExBRGamePoint implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_GAME_POINT.writeId(packet); - packet.writeD(_charId); packet.writeQ(_charPoints); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java index 50f21df46a..e36f2ff502 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java @@ -45,7 +45,6 @@ public class ExBRProductInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_INFO.writeId(packet); - packet.writeD(_item.getBrId()); packet.writeD(_item.getPrice()); packet.writeD(_item.getItems().size()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java index dc851ffd43..0f042ba043 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java @@ -45,9 +45,8 @@ public class ExBRProductList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); // Adena - packet.writeQ(0x00); // Hero coins + packet.writeQ(0); // Hero coins packet.writeC(_type); // Type 0 - Home, 1 - History, 2 - Favorites packet.writeD(_primeList.size()); for (PrimeShopGroup brItem : _primeList) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java index 320140ace6..bf67164bfe 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java @@ -39,7 +39,6 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RAID_BOSS_SPAWN_INFO.writeId(packet); - packet.writeD(_statuses.size()); // count for (Entry entry : _statuses.entrySet()) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java index d1896f32a7..5c835c1dea 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java @@ -47,7 +47,6 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_HERO_AND_LEGEND_INFO.writeId(packet); - if (!Hero.getInstance().getHeroes().isEmpty()) { try (Connection con = DatabaseFactory.getConnection(); @@ -63,7 +62,6 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket { packet.writeC(1); // ?? shows 78 on JP packet.writeC(1); // ?? shows 0 on JP - packet.writeString(rset.getString("char_name")); final int clanId = rset.getInt("clanid"); if (clanId > 0) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java index b7395dee4e..3e7261542a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java @@ -55,7 +55,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MY_RANKING_INFO.writeId(packet); - final Date date = new Date(); final Calendar calendar = new GregorianCalendar(); calendar.setTime(date); @@ -99,7 +98,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket { PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } - int previousPlace = 0; int previousWins = 0; int previousLoses = 0; @@ -128,7 +126,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket { PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } - int heroCount = 0; int legendCount = 0; if (Hero.getInstance().getCompleteHeroes().containsKey(_player.getObjectId())) @@ -137,7 +134,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket heroCount = hero.getInt("count", 0); legendCount = hero.getInt("legend_count", 0); } - packet.writeD(year); // Year packet.writeD(month); // Month packet.writeD(Math.min(Olympiad.getInstance().getCurrentCycle() - 1, 0)); // cycle ? diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java index bad88659b0..db5efac89a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java @@ -64,20 +64,17 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_RANKING_INFO.writeId(packet); - packet.writeC(_tabId); // Tab id packet.writeC(_rankingType); // ranking type packet.writeC(_unk); // unk, shows 1 all time packet.writeD(_classId); // class id (default 148) or caller class id for personal rank packet.writeD(_serverId); // 0 - all servers, server id - for caller server packet.writeD(933); // unk, 933 all time - if (!_playerList.isEmpty()) { final RankingOlympiadCategory category = RankingOlympiadCategory.values()[_tabId]; writeFilteredRankingData(packet, category, category.getScopeByGroup(_rankingType), ClassId.getClassId(_classId)); } - return true; } @@ -100,10 +97,8 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket private void writeScopeData(PacketWriter packet, RankingOlympiadScope scope, List> list, List> snapshot) { - Entry playerData = list.stream().filter(it -> it.getValue().getInt("charId", 0) == _player.getObjectId()).findFirst().orElse(null); final int indexOf = list.indexOf(playerData); - final List> limited; switch (scope) { @@ -132,9 +127,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket limited = Collections.emptyList(); } } - packet.writeD(limited.size()); - int rank = 1; for (Entry data : limited.stream().sorted(Entry.comparingByKey()).collect(Collectors.toList())) { @@ -143,7 +136,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket packet.writeString(player.getString("name")); // name packet.writeString(player.getString("clanName")); // clan name packet.writeD(scope == RankingOlympiadScope.SELF ? data.getKey() : curRank); // rank - if (!snapshot.isEmpty()) { int snapshotRank = 1; @@ -160,7 +152,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket { packet.writeD(scope == RankingOlympiadScope.SELF ? data.getKey() : curRank); } - packet.writeD(Config.SERVER_ID); // server id packet.writeD(player.getInt("level")); // level packet.writeD(player.getInt("classId")); // class id diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingList.java index ad8f5d0034..164286d6f1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingList.java @@ -114,10 +114,8 @@ public class ExPvpRankingList implements IClientOutgoingPacket private void writeScopeData(PacketWriter packet, RankingScope scope, List> list, List> snapshot) { - Entry playerData = list.stream().filter(it -> it.getValue().getInt("charId", 0) == _player.getObjectId()).findFirst().orElse(null); final int indexOf = list.indexOf(playerData); - final List> limited; switch (scope) { @@ -146,9 +144,7 @@ public class ExPvpRankingList implements IClientOutgoingPacket limited = Collections.emptyList(); } } - packet.writeD(limited.size()); - int rank = 1; for (Entry data : limited.stream().sorted(Entry.comparingByKey()).collect(Collectors.toList())) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java index 3b3728f090..f2e96db6b1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java @@ -48,7 +48,6 @@ public class ExRankingCharInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RANKING_CHAR_INFO.writeId(packet); - if (!_playerList.isEmpty()) { for (Integer id : _playerList.keySet()) @@ -59,7 +58,6 @@ public class ExRankingCharInfo implements IClientOutgoingPacket packet.writeD(id); // server rank packet.writeD(player.getInt("raceRank")); // race rank packet.writeD(player.getInt("classRank")); // class rank - for (Integer id2 : _snapshotList.keySet()) { final StatSet snapshot = _snapshotList.get(id2); @@ -68,7 +66,7 @@ public class ExRankingCharInfo implements IClientOutgoingPacket packet.writeD(id2); // server rank snapshot packet.writeD(snapshot.getInt("raceRank")); // race rank snapshot packet.writeD(snapshot.getInt("classRank")); // class rank snapshot - packet.writeD(0); + packet.writeD(0); packet.writeD(0); packet.writeD(0); return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java index f89d104f27..54de929cd5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java @@ -55,12 +55,10 @@ public class ExRankingCharRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RANKING_CHAR_RANKERS.writeId(packet); - packet.writeC(_group); packet.writeC(_scope); packet.writeD(_race); packet.writeD(_player.getClassId().getId()); - if (!_playerList.isEmpty()) { switch (_group) @@ -71,7 +69,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket { final int count = _playerList.size() > 150 ? 150 : _playerList.size(); packet.writeD(count); - for (Integer id : _playerList.keySet()) { final StatSet player = _playerList.get(id); @@ -130,7 +127,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket packet.writeD(plr.getInt("classId")); packet.writeD(plr.getInt("race")); packet.writeD(id2); // server rank - if (!_snapshotList.isEmpty()) { for (Integer id3 : _snapshotList.keySet()) @@ -168,7 +164,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } } packet.writeD(count > 100 ? 100 : count); - int i = 1; for (Integer id : _playerList.keySet()) { @@ -218,7 +213,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket else { boolean found = false; - final Map raceList = new ConcurrentHashMap<>(); int i = 1; for (Integer id : _playerList.keySet()) @@ -230,7 +224,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket i++; } } - for (Integer id : raceList.keySet()) { final StatSet player = raceList.get(id); @@ -284,9 +277,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket i++; } } - packet.writeD(clanList.size()); - for (Integer id : clanList.keySet()) { final StatSet player = clanList.get(id); @@ -342,9 +333,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } } friendList.add(_player.getObjectId()); - packet.writeD(count); - for (int id : _playerList.keySet()) { final StatSet player = _playerList.get(id); @@ -381,7 +370,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket else { packet.writeD(1); - packet.writeString(_player.getName()); if (_player.getClan() != null) { @@ -431,7 +419,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } } packet.writeD(count > 100 ? 100 : count); - int i = 1; for (Integer id : _playerList.keySet()) { @@ -481,7 +468,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket else { boolean found = false; - final Map raceList = new ConcurrentHashMap<>(); int i = 1; for (Integer id : _playerList.keySet()) @@ -493,7 +479,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket i++; } } - for (Integer id : raceList.keySet()) { final StatSet player = raceList.get(id); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java index 2463589c81..c09b3e899d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java @@ -47,18 +47,15 @@ public class ExFlyMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_mapId); - packet.writeD(_locations.size()); for (SayuneEntry loc : _locations) { packet.writeD(loc.getId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(loc.getX()); packet.writeD(loc.getY()); packet.writeD(loc.getZ()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java index 03fc6b580d..70b3fb25d2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java @@ -47,16 +47,13 @@ public class ExFlyMoveBroadcast implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE_BROADCAST.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); packet.writeD(_mapId); - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD(_currentLoc.getX()); packet.writeD(_currentLoc.getY()); packet.writeD(_currentLoc.getZ()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java index cfe11a27e0..49e5d86910 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java @@ -35,7 +35,6 @@ public class ExNotifyFlyMoveStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_FLY_MOVE_START.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java index d5640a47ef..0efa37ae8c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java @@ -51,7 +51,6 @@ public class ExMoveToLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_SUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_targetX); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java index 0cbe2c3e02..a0314c39aa 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java @@ -46,7 +46,6 @@ public class ExShuttleGetOff implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_OFF.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_x); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java index 5211bef5ba..061bcafed9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java @@ -43,7 +43,6 @@ public class ExShuttleGetOn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_ON.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java index 97d54a9019..c8aee1fde7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java @@ -43,7 +43,6 @@ public class ExShuttleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHUTTLE_INFO.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD(_shuttle.getX()); packet.writeD(_shuttle.getY()); @@ -60,8 +59,8 @@ public class ExShuttleInfo implements IClientOutgoingPacket packet.writeD(loc.getY()); packet.writeD(loc.getZ()); } - packet.writeD(stop.isDoorOpen() ? 0x01 : 0x00); - packet.writeD(stop.hasDoorChanged() ? 0x01 : 0x00); + packet.writeD(stop.isDoorOpen() ? 1 : 0); + packet.writeD(stop.hasDoorChanged() ? 1 : 0); } return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java index 6ba38f29a1..28b33b998e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java @@ -43,7 +43,6 @@ public class ExShuttleMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_MOVE.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD((int) _shuttle.getStat().getMoveSpeed()); packet.writeD((int) _shuttle.getStat().getRotationSpeed()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java index bf2b6ea6eb..6c31189d6a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java @@ -44,7 +44,6 @@ public class ExStopMoveInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_SHUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java index f7f6849732..8492f42a6e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java @@ -44,7 +44,6 @@ public class ExValidateLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_SHUTTLE.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExTeleportFavoritesList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExTeleportFavoritesList.java index 0f68a71088..6bd6a492d2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExTeleportFavoritesList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExTeleportFavoritesList.java @@ -42,14 +42,12 @@ public class ExTeleportFavoritesList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_FAVORITES_LIST.writeId(packet); - - packet.writeC(_enable ? 0x01 : 0x00); + packet.writeC(_enable ? 1 : 0); packet.writeD(_teleports.size()); for (int id : _teleports) { packet.writeD(id); } - return true; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java index 1d59c6d002..e7654ed911 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java @@ -60,7 +60,7 @@ public class AccountKicked implements IOutgoingPacket { OutgoingPackets.ACCOUNT_KICKED.writeId(packet); packet.writeD(_reason.getCode()); - return true; } } + diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 2e3a1f6163..1fe813e393 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: response + * Format: d d: response */ public class GGAuth implements IOutgoingPacket { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/network/serverpackets/Init.java index 4b3f71f30e..d725f45ca2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/network/serverpackets/Init.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/network/serverpackets/Init.java @@ -52,7 +52,6 @@ public class Init implements IOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.INIT.writeId(packet); - packet.writeD(_sessionId); // session id packet.writeD(0x0000c621); // protocol revision diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index 8c534554a8..f4dcd22b00 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: the failure reason + * Format: d d: the failure reason */ public class LoginFail implements IOutgoingPacket { diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java index c700328f3d..f8b05abb47 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java @@ -529,7 +529,7 @@ public class Lindvior extends AbstractNpcAI for (Location loc : CONTROL_GENERATOR_SPAWNS) { guard = (FriendlyNpc) addSpawn(NPC_GENERATOR, loc, true); - guard.setDisplayEffect(0x01); + guard.setDisplayEffect(1); guard.setScriptValue(i++); _generatorSpawn.add(guard); } @@ -685,7 +685,7 @@ public class Lindvior extends AbstractNpcAI if (!hasFlag(_activeMask, 1 << index)) { _activeMask |= 1 << index; - npc.setDisplayEffect(0x02); + npc.setDisplayEffect(2); sendEventTrigger(true, GENERATOR_TRIGERS[index]); _zoneLair.getPlayersInside().stream().forEach(p -> p.broadcastPacket(new Earthquake(p.getX(), p.getY(), p.getZ(), 20, 10))); if (hasFlag(_activeMask, 0xf)) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/commons/network/BaseRecievePacket.java index c682cb741d..a6ed15ce32 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/commons/network/BaseRecievePacket.java @@ -73,7 +73,7 @@ public abstract class BaseRecievePacket try { result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE); - result = result.substring(0, result.indexOf(0x00)); + result = result.substring(0, result.indexOf(0)); _off += (result.length() * 2) + 2; } catch (Exception e) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/commons/network/BaseSendablePacket.java index a9d918de4c..8fa8491cbf 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/commons/network/BaseSendablePacket.java @@ -117,16 +117,16 @@ public abstract class BaseSendablePacket public byte[] getBytes() { // if (this instanceof Init) - // writeD(0x00); // reserve for XOR initial key + // writeD(0); // reserve for XOR initial key - writeD(0x00); // reserve for checksum + writeD(0); // reserve for checksum final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++) { - writeC(0x00); + writeC(0); } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/AttackType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/AttackType.java index 6064b10ed7..e9983f15e3 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/AttackType.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/AttackType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum AttackType { - MISSED(0x01), - BLOCKED(0x02), - CRITICAL(0x04), - SHOT_USED(0x08); + MISSED(1), + BLOCKED(2), + CRITICAL(4), + SHOT_USED(8); private final int _mask; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/GroupType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/GroupType.java index 954aaace8b..916a14fd05 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/GroupType.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/GroupType.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum GroupType implements IUpdateTypeComponent { - NONE(0x01), - PARTY(0x02), - COMMAND_CHANNEL(0x04); + NONE(1), + PARTY(2), + COMMAND_CHANNEL(4); private int _mask; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/ItemListType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/ItemListType.java index 2d38c8f5b1..c80234439f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/ItemListType.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/ItemListType.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum ItemListType implements IUpdateTypeComponent { - AUGMENT_BONUS(0x01), - ELEMENTAL_ATTRIBUTE(0x02), - ENCHANT_EFFECT(0x04), - VISUAL_ID(0x08), - SOUL_CRYSTAL(0x10); + AUGMENT_BONUS(1), + ELEMENTAL_ATTRIBUTE(2), + ENCHANT_EFFECT(4), + VISUAL_ID(8), + SOUL_CRYSTAL(16); private final int _mask; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java index b3d08596c6..29403b783d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum MacroUpdateType { - ADD(0x01), - LIST(0x01), - MODIFY(0x02), - DELETE(0x00); + ADD(1), + LIST(1), + MODIFY(2), + DELETE(0); private final int _id; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java index 86c6159869..7776721c0f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java @@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum PartySmallWindowUpdateType implements IUpdateTypeComponent { - CURRENT_CP(0x01), - MAX_CP(0x02), - CURRENT_HP(0x04), - MAX_HP(0x08), - CURRENT_MP(0x10), - MAX_MP(0x20), - LEVEL(0x40), - CLASS_ID(0x80), - PARTY_SUBSTITUTE(0x100), - VITALITY_POINTS(0x200); + CURRENT_CP(1), + MAX_CP(2), + CURRENT_HP(4), + MAX_HP(8), + CURRENT_MP(16), + MAX_MP(32), + LEVEL(64), + CLASS_ID(128), + PARTY_SUBSTITUTE(256), + VITALITY_POINTS(512); private final int _mask; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 00bb331778..667ce7f17c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.Broadcast; import org.l2jmobius.gameserver.util.Util; /** - * Fromat:(ch) dddddc + * Format:(ch) dddddc * @author -Wooden- */ public class RequestExMagicSkillUseGround implements IClientIncomingPacket diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java index ec60042793..6054868de7 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java @@ -39,7 +39,6 @@ public class AbnormalStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ABNORMAL_STATUS_UPDATE.writeId(packet); - packet.writeH(_effects.size()); for (BuffInfo info : _effects) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 1b8ddb2042..bec794bef3 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -44,7 +44,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; } @@ -60,7 +59,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; setHtml(html); } @@ -77,13 +75,11 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } - if (!html.contains(""; return; } - _html = html; } @@ -96,7 +92,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } - setHtml(content); return true; } @@ -138,12 +133,10 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { player.clearHtmlActions(getScope()); } - if (_disabledValidation) { return; } - if (player != null) { Util.buildHtmlActionCache(player, getScope(), _npcObjId, _html); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index f143a8aec9..f10f114f31 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -71,7 +71,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket= 0) || (item.getAttributeDefence(AttributeType.FIRE) > 0) || (item.getAttributeDefence(AttributeType.WATER) > 0) || (item.getAttributeDefence(AttributeType.WIND) > 0) || (item.getAttributeDefence(AttributeType.EARTH) > 0) || (item.getAttributeDefence(AttributeType.HOLY) > 0) || (item.getAttributeDefence(AttributeType.DARK) > 0)) { mask |= ItemListType.ELEMENTAL_ATTRIBUTE.getMask(); } - if (item.getEnchantOptions() != null) { for (int id : item.getEnchantOptions()) @@ -186,22 +180,18 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket 0) { mask |= ItemListType.VISUAL_ID.getMask(); } - if (((item.getSoulCrystalOptions() != null) && !item.getSoulCrystalOptions().isEmpty()) || ((item.getSoulCrystalSpecialOptions() != null) && !item.getSoulCrystalSpecialOptions().isEmpty())) { mask |= ItemListType.SOUL_CRYSTAL.getMask(); } - // if (item.isBlessed()) // { // mask |= ItemListType.BLESSED.getMask(); // } - return mask; } @@ -269,7 +259,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); packet.writeC(removeSkills.size()); for (Skill removed : removeSkills) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java index 8fa6259f64..6451dffd02 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ActionFailed implements IClientOutgoingPacket { public static final ActionFailed STATIC_PACKET = new ActionFailed(); - private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); + private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); static { for (SkillCastingType castingType : SkillCastingType.values()) @@ -57,7 +57,6 @@ public class ActionFailed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ACTION_FAIL.writeId(packet); - packet.writeD(_castingType); // MagicSkillUse castingType return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java index 6e868368c9..30ce58da60 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java @@ -44,9 +44,8 @@ public class AgitDecoInfo implements IClientOutgoingPacket { continue; } - packet.writeC(_residense.hasFunction(type) ? 0x01 : 0x00); + packet.writeC(_residense.hasFunction(type) ? 1 : 0); } - // Unknown packet.writeD(0); // TODO: Find me! packet.writeD(0); // TODO: Find me! diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java index 6cb71fc985..4683fb30f0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java @@ -44,7 +44,6 @@ public class AllianceInfo implements IClientOutgoingPacket _name = leader.getAllyName(); _leaderC = leader.getName(); _leaderP = leader.getLeaderName(); - final Collection allies = ClanTable.getInstance().getClanAllies(allianceId); _allies = new ClanInfo[allies.size()]; int idx = 0; @@ -57,7 +56,6 @@ public class AllianceInfo implements IClientOutgoingPacket total += ci.getTotal(); online += ci.getOnline(); } - _total = total; _online = online; } @@ -66,18 +64,16 @@ public class AllianceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_INFO.writeId(packet); - packet.writeS(_name); packet.writeD(_total); packet.writeD(_online); packet.writeS(_leaderC); packet.writeS(_leaderP); - packet.writeD(_allies.length); for (ClanInfo aci : _allies) { packet.writeS(aci.getClan().getName()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(aci.getClan().getLevel()); packet.writeS(aci.getClan().getLeaderName()); packet.writeD(aci.getTotal()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java index 6218f1717f..1ae4653f91 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java @@ -38,7 +38,6 @@ public class AskJoinAlly implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_ALLIANCE.writeId(packet); - packet.writeD(_requestorObjId); packet.writeS(null); // Ally Name ? packet.writeS(null); // TODO: Find me! diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java index a66bb3cd33..b9cfbe81b9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java @@ -39,7 +39,6 @@ public class AskJoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_PARTY.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 05c420ff59..227ab571be 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -45,7 +45,6 @@ public class Attack implements IClientOutgoingPacket _attackerObjId = attacker.getObjectId(); _attackerLoc = new Location(attacker); _targetLoc = new Location(target); - final Player player = attacker.getActingPlayer(); if (player == null) { @@ -111,7 +110,6 @@ public class Attack implements IClientOutgoingPacket final Iterator it = _hits.iterator(); final Hit firstHit = it.next(); OutgoingPackets.ATTACK.writeId(packet); - packet.writeD(_attackerObjId); packet.writeD(firstHit.getTargetId()); packet.writeD(_soulshotVisualSubstitute); // Ertheia @@ -121,13 +119,11 @@ public class Attack implements IClientOutgoingPacket packet.writeD(_attackerLoc.getX()); packet.writeD(_attackerLoc.getY()); packet.writeD(_attackerLoc.getZ()); - packet.writeH(_hits.size() - 1); while (it.hasNext()) { writeHit(packet, it.next()); } - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java index bd6878eb42..8b85fe85e3 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java @@ -35,7 +35,6 @@ public class AutoAttackStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_START.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java index e767d1877a..a294b1e212 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java @@ -35,7 +35,6 @@ public class AutoAttackStop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_STOP.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java index 3f329415df..0c79677eae 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java @@ -38,7 +38,6 @@ public class BlockListPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BLOCK_LIST.writeId(packet); - packet.writeD(_playersId.size()); for (int playerId : _playersId) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index f610cdc6aa..d95f0543b9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -45,8 +45,7 @@ public class BuyList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x00); // Type BUY + packet.writeD(0); // Type BUY packet.writeQ(_money); // current money packet.writeD(_listId); packet.writeD(_inventorySlots); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index cd25af908d..7cb2bf4425 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -50,36 +50,34 @@ public class BuyListSeed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BUY_LIST_SEED.writeId(packet); - packet.writeQ(_money); // current money - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeD(_manorId); // manor id - if (!_list.isEmpty()) { packet.writeH(_list.size()); // list length for (SeedProduction s : _list) { - packet.writeC(0x00); // mask item 0 to print minimal item information + packet.writeC(0); // mask item 0 to print minimal item information packet.writeD(s.getId()); // ObjectId packet.writeD(s.getId()); // ItemId packet.writeC(0xFF); // T1 packet.writeQ(s.getAmount()); // Quantity - packet.writeC(0x05); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item - packet.writeC(0x00); // Filler (always 0) - packet.writeH(0x00); // Equipped : 00-No, 01-yes - packet.writeQ(0x00); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand - packet.writeH(0x00); // Enchant level (pet level shown in control item) + packet.writeC(5); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item + packet.writeC(0); // Filler (always 0) + packet.writeH(0); // Equipped : 00-No, 01-yes + packet.writeQ(0); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand + packet.writeH(0); // Enchant level (pet level shown in control item) packet.writeD(-1); packet.writeD(-9999); - packet.writeC(0x01); // GOD Item enabled = 1 disabled (red) = 0 + packet.writeC(1); // GOD Item enabled = 1 disabled (red) = 0 packet.writeQ(s.getPrice()); // price } _list.clear(); } else { - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java index 3a7b67af23..f3dc872dca 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java @@ -32,8 +32,7 @@ public class CSShowComBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - - packet.writeC(0x01); // c4 1 to show community 00 to hide + packet.writeC(1); // c4 1 to show community 00 to hide packet.writeB(_html); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java index eacc27aa07..b18dac4cc3 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java @@ -36,7 +36,6 @@ public class CameraMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CAMERA_MODE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java index 1682f5bc62..adea754676 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java @@ -39,7 +39,6 @@ public class ChairSit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAIR_SIT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_staticObjectId); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java index 2bc31a285a..de141fa067 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java @@ -38,7 +38,6 @@ public class ChangeMoveType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_MOVE_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_running ? RUN : WALK); packet.writeD(0); // c2 diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index 73277d923d..fbe5e39e2e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -22,17 +22,17 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ChangeWaitType implements IClientOutgoingPacket { + public static final int WT_SITTING = 0; + public static final int WT_STANDING = 1; + public static final int WT_START_FAKEDEATH = 2; + public static final int WT_STOP_FAKEDEATH = 3; + private final int _objectId; private final int _moveType; private final int _x; private final int _y; private final int _z; - public static final int WT_SITTING = 0; - public static final int WT_STANDING = 1; - public static final int WT_START_FAKEDEATH = 2; - public static final int WT_STOP_FAKEDEATH = 3; - public ChangeWaitType(Creature creature, int newMoveType) { _objectId = creature.getObjectId(); @@ -46,7 +46,6 @@ public class ChangeWaitType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_WAIT_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_moveType); packet.writeD(_x); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index 41180bac50..aa2e7b2eaa 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -30,7 +30,6 @@ public class CharCreateFail implements IClientOutgoingPacket public static final int REASON_CREATE_NOT_ALLOWED = 0x05; // "Characters cannot be created from this server." public static final int REASON_CHOOSE_ANOTHER_SVR = 0x06; // "Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please // choose another server." - private final int _error; public CharCreateFail(int errorCode) @@ -42,7 +41,6 @@ public class CharCreateFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index f0e99885ad..768617e558 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -31,8 +31,7 @@ public class CharCreateOk implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_SUCCESS.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index bed289ca0a..1674eef343 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -33,7 +33,6 @@ public class CharDeleteFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_DELETE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 579aa3f0ff..a5d894a37b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -35,6 +35,22 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { + private static final int[] PAPERDOLL_ORDER = new int[] + { + Inventory.PAPERDOLL_UNDER, + Inventory.PAPERDOLL_HEAD, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_LHAND, + Inventory.PAPERDOLL_GLOVES, + Inventory.PAPERDOLL_CHEST, + Inventory.PAPERDOLL_LEGS, + Inventory.PAPERDOLL_FEET, + Inventory.PAPERDOLL_CLOAK, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_HAIR, + Inventory.PAPERDOLL_HAIR2 + }; + private final Player _player; private final Clan _clan; private int _objId; @@ -57,22 +73,6 @@ public class CharInfo implements IClientOutgoingPacket private int _vehicleId = 0; private final boolean _gmSeeInvis; - private static final int[] PAPERDOLL_ORDER = new int[] - { - Inventory.PAPERDOLL_UNDER, - Inventory.PAPERDOLL_HEAD, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_LHAND, - Inventory.PAPERDOLL_GLOVES, - Inventory.PAPERDOLL_CHEST, - Inventory.PAPERDOLL_LEGS, - Inventory.PAPERDOLL_FEET, - Inventory.PAPERDOLL_CLOAK, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_HAIR, - Inventory.PAPERDOLL_HAIR2 - }; - public CharInfo(Player player, boolean gmSeeInvis) { _player = player; @@ -121,17 +121,15 @@ public class CharInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); // Confirmed packet.writeD(_y); // Confirmed packet.writeD(_z); // Confirmed packet.writeD(_vehicleId); // Confirmed packet.writeD(_objId); // Confirmed packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed - packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) @@ -155,10 +153,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.getPvpFlag()); packet.writeD(_player.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -169,53 +165,40 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); - packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeS(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle()); - packet.writeD(_player.getAppearance().getVisibleClanId()); packet.writeD(_player.getAppearance().getVisibleClanCrestId()); packet.writeD(_player.getAppearance().getVisibleAllyId()); packet.writeD(_player.getAppearance().getVisibleAllyCrestId()); - - packet.writeC(_player.isSitting() ? 0x00 : 0x01); // Confirmed - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // Confirmed - packet.writeC(_player.isInCombat() ? 0x01 : 0x00); // Confirmed - - packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 0x01 : 0x00); // Confirmed - - packet.writeC(_player.isInvisible() ? 0x01 : 0x00); - + packet.writeC(_player.isSitting() ? 0 : 1); // Confirmed + packet.writeC(_player.isRunning() ? 1 : 0); // Confirmed + packet.writeC(_player.isInCombat() ? 1 : 0); // Confirmed + packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 1 : 0); // Confirmed + packet.writeC(_player.isInvisible() ? 1 : 0); packet.writeC(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount packet.writeC(_player.getPrivateStoreType().getId()); // Confirmed packet.writeH(_player.getCubics().size()); // Confirmed _player.getCubics().keySet().forEach(packet::writeH); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); // Confirmed packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); packet.writeH(_player.getRecomHave()); // Confirmed packet.writeD(_player.getMountNpcId() == 0 ? 0 : _player.getMountNpcId() + 1000000); - packet.writeD(_player.getClassId().getId()); // Confirmed - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeC(_player.isMounted() ? 0 : _enchantLevel); // Confirmed - packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeD(_player.getClanCrestLargeId()); packet.writeC(_player.getNobleLevel()); // Confirmed packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 2 : 0); // 152 - Value for enabled changed to 2? packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed - final ILocational baitLocation = _player.getFishing().getBaitLocation(); if (baitLocation != null) { @@ -231,29 +214,21 @@ public class CharInfo implements IClientOutgoingPacket } packet.writeD(_player.getAppearance().getNameColor()); // Confirmed - packet.writeD(_heading); // Confirmed - packet.writeC(_player.getPledgeClass()); packet.writeH(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); // Confirmed - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - - packet.writeC(0x00); // nPvPRestrainStatus - + packet.writeC(0); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentHp())); // Confirmed packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - - packet.writeC(0x00); // cBRLectureMark + packet.writeC(0); // cBRLectureMark final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed @@ -265,11 +240,11 @@ public class CharInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(_player.isTrueHero() ? 100 : 0); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); // Hair accessory - packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points - packet.writeD(0x00); // nCursedWeaponClassId + packet.writeC(_player.isTrueHero() ? 100 : 0); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); // Hair accessory + packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points + packet.writeD(0); // nCursedWeaponClassId // AFK animation. if ((_player.getClan() != null) && (CastleManager.getInstance().getCastleByOwner(_player.getClan()) != null)) @@ -278,19 +253,17 @@ public class CharInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); + packet.writeD(0); } // Rank. packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : RankManager.getInstance().getPlayerClassRank(_player) == 1 ? 4 : 0); - - packet.writeH(0x00); - packet.writeC(0x00); + packet.writeH(0); + packet.writeC(0); packet.writeD(_player.getClassId().getId()); - packet.writeC(0x00); + packet.writeC(0); packet.writeD(_player.getVisualHairColor() + 1); // 338 - DK color. - packet.writeD(0x00); - + packet.writeD(0); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 7187b73184..11f5f4df52 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -40,17 +40,16 @@ public class CharSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTED.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getTitle()); packet.writeD(_sessionId); packet.writeD(_player.getClanId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x01); // active ?? + packet.writeD(1); // active ?? packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -62,25 +61,20 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_player.getReputation()); packet.writeD(_player.getPkKills()); packet.writeD(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_player.getClassId().getId()); - packet.writeB(new byte[16]); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeB(new byte[28]); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 51230f82a4..46539aebde 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -47,10 +47,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { private static final Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); - private final String _loginName; - private final int _sessionId; - private int _activeId; - private final List _characterPackages; private static final int[] PAPERDOLL_ORDER = new int[] { @@ -115,7 +111,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_ARTIFACT20, // 152 Inventory.PAPERDOLL_ARTIFACT21 // 152 }; - private static final int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, @@ -129,6 +124,11 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_HAIR2, }; + private final String _loginName; + private final int _sessionId; + private int _activeId; + private final List _characterPackages; + /** * Constructor for CharSelectionInfo. * @param loginName @@ -159,16 +159,13 @@ public class CharSelectionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.size(); packet.writeD(size); // Created character count - packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) - packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 0x01 : 0x00); // if 1 can't create new char - packet.writeC(0x01); // 0=can't play, 1=can play free until level 85, 2=100% free play - packet.writeD(0x02); // if 1, Korean client - packet.writeC(0x00); // Gift message for inactive accounts // 152 - + packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 1 : 0); // if 1 can't create new char + packet.writeC(1); // 0=can't play, 1=can play free until level 85, 2=100% free play + packet.writeD(2); // if 1, Korean client + packet.writeC(0); // Gift message for inactive accounts // 152 // Balthus Knights if (Config.BALTHUS_KNIGHTS_ENABLED) { @@ -177,23 +174,22 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (Config.PREMIUM_SYSTEM_ENABLED) { PremiumManager.getInstance().loadPremiumData(_loginName); - packet.writeC(PremiumManager.getInstance().getPremiumExpiration(_loginName) > 0 ? 0x01 : 0x00); + packet.writeC(PremiumManager.getInstance().getPremiumExpiration(_loginName) > 0 ? 1 : 0); } else { - packet.writeC(0x00); + packet.writeC(0); } } else { - packet.writeC(0x01); + packet.writeC(1); } } else { - packet.writeC(0x00); + packet.writeC(0); } - long lastAccess = 0; if (_activeId == -1) { @@ -206,7 +202,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - for (int i = 0; i < size; i++) { final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); @@ -214,94 +209,75 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name packet.writeD(_sessionId); // Account ID - packet.writeD(0x00); // Clan ID - packet.writeD(0x00); // Builder level - + packet.writeD(0); // Clan ID + packet.writeD(0); // Builder level packet.writeD(charInfoPackage.getSex()); // Sex packet.writeD(charInfoPackage.getRace()); // Race packet.writeD(charInfoPackage.getBaseClassId()); - packet.writeD(Config.SERVER_ID); - packet.writeD(charInfoPackage.getX()); packet.writeD(charInfoPackage.getY()); packet.writeD(charInfoPackage.getZ()); packet.writeF(charInfoPackage.getCurrentHp()); packet.writeF(charInfoPackage.getCurrentMp()); - packet.writeQ(charInfoPackage.getSp()); packet.writeQ(charInfoPackage.getExp()); packet.writeF((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel()))); packet.writeD(charInfoPackage.getLevel()); - packet.writeD(charInfoPackage.getReputation()); packet.writeD(charInfoPackage.getPkKills()); packet.writeD(charInfoPackage.getPvPKills()); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); // Ertheia - packet.writeD(0x00); // Ertheia - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); // Ertheia + packet.writeD(0); // Ertheia for (int slot : getPaperdollOrder()) { packet.writeD(charInfoPackage.getPaperdollItemId(slot)); } - for (int slot : getPaperdollOrderVisualId()) { packet.writeD(charInfoPackage.getPaperdollItemVisualId(slot)); } - packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_CHEST)); // Upper Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_LEGS)); // Lower Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_HEAD)); // Headgear enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_GLOVES)); // Gloves enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_FEET)); // Boots enchant level - packet.writeD(charInfoPackage.getHairStyle()); packet.writeD(charInfoPackage.getHairColor()); packet.writeD(charInfoPackage.getFace()); - packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); - packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption1Id() : 0); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption2Id() : 0); - // packet.writeD(charInfoPackage.getTransformId()); // Used to display Transformations - packet.writeD(0x00); // Currently on retail when you are on character select you don't see your transformation. - - packet.writeD(0x00); // Pet NpcId - packet.writeD(0x00); // Pet level - packet.writeD(0x00); // Pet Food - packet.writeD(0x00); // Pet Food Level - packet.writeF(0x00); // Current pet HP - packet.writeF(0x00); // Current pet MP - + packet.writeD(0); // Currently on retail when you are on character select you don't see your transformation. + packet.writeD(0); // Pet NpcId + packet.writeD(0); // Pet level + packet.writeD(0); // Pet Food + packet.writeD(0); // Pet Food Level + packet.writeF(0); // Current pet HP + packet.writeF(0); // Current pet MP packet.writeD(charInfoPackage.getVitalityPoints()); // Vitality packet.writeD((int) Config.RATE_VITALITY_EXP_MULTIPLIER * 100); // Vitality Percent packet.writeD(charInfoPackage.getVitalityItemsUsed()); // Remaining vitality item uses - packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0x00 : 0x01); // Char is active or not - packet.writeC(charInfoPackage.isNoble() ? 0x01 : 0x00); - packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 0x02 : 0x00); // Hero glow - packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 0x01 : 0x00); // Show hair accessory if enabled - - packet.writeD(0x00); // 235 - ban time left + packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0 : 1); // Char is active or not + packet.writeC(charInfoPackage.isNoble() ? 1 : 0); + packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 2 : 0); // Hero glow + packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 1 : 0); // Show hair accessory if enabled + packet.writeD(0); // 235 - ban time left packet.writeD((int) (charInfoPackage.getLastAccess() / 1000)); // 235 - last play time - - packet.writeC(0x00); // 338 + packet.writeC(0); // 338 packet.writeD(charInfoPackage.getHairColor() + 1); // 338 - DK color. } return true; @@ -311,7 +287,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); - try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate")) { @@ -324,7 +299,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (charInfopackage != null) { characterList.add(charInfopackage); - final Player player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { @@ -338,7 +312,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return characterList; } @@ -380,7 +353,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { clan.removeClanMember(objectId, 0); } - GameClient.deleteCharByObjId(objectId); return null; } @@ -399,26 +371,21 @@ public class CharSelectionInfo implements IClientOutgoingPacket charInfopackage.setHairStyle(chardata.getInt("hairstyle")); charInfopackage.setHairColor(chardata.getInt("haircolor")); charInfopackage.setSex(chardata.getInt("sex")); - charInfopackage.setExp(chardata.getLong("exp")); charInfopackage.setSp(chardata.getLong("sp")); charInfopackage.setVitalityPoints(chardata.getInt("vitality_points")); charInfopackage.setClanId(chardata.getInt("clanid")); - charInfopackage.setRace(chardata.getInt("race")); - int baseClassId = chardata.getInt("base_class"); // Death Knight check. if (CategoryData.getInstance().isInCategory(CategoryType.DEATH_KNIGHT_ALL_CLASS, baseClassId)) { baseClassId = 212; } - final int activeClassId = chardata.getInt("classid"); charInfopackage.setX(chardata.getInt("x")); charInfopackage.setY(chardata.getInt("y")); charInfopackage.setZ(chardata.getInt("z")); - final int faction = chardata.getInt("faction"); if (faction == 1) { @@ -428,7 +395,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setEvil(); } - if (Config.MULTILANG_ENABLE) { String lang = chardata.getString("language"); @@ -438,22 +404,18 @@ public class CharSelectionInfo implements IClientOutgoingPacket } charInfopackage.setHtmlPrefix("data/lang/" + lang + "/"); } - // if is in subclass, load subclass exp, sp, level info if (baseClassId != activeClassId) { loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId); } - charInfopackage.setClassId(activeClassId); - // Get the augmentation id for equipped weapon int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); if (weaponObjId < 1) { weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); } - if (weaponObjId > 0) { try (Connection con = DatabaseFactory.getConnection(); @@ -479,7 +441,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } - // Check if the base class is set to zero and also doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly. if ((baseClassId == 0) && (activeClassId > 0)) { @@ -489,7 +450,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setBaseClassId(baseClassId); } - charInfopackage.setDeleteTimer(deletetime); charInfopackage.setLastAccess(chardata.getLong("lastAccess")); charInfopackage.setNoble(chardata.getInt("nobless") == 1); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java index 847e24db87..d59df7911a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java @@ -32,7 +32,6 @@ public class ChooseInventoryItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHOOSE_INVENTORY_ITEM.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java index 12a3940521..ac66c2fa0f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java @@ -32,7 +32,6 @@ public class ClientSetTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CLIENT_SET_TIME.writeId(packet); - packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // time in client minutes packet.writeD(6); // constant to match the server time( this determines the speed of the client clock) return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java index 195824578b..5fdb62f544 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java @@ -68,7 +68,6 @@ public class ConfirmDlg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CONFIRM_DLG.writeId(packet); - final SMParam[] params = _systemMessage.getParams(); packet.writeD(_systemMessage.getId()); packet.writeD(params.length); @@ -130,7 +129,6 @@ public class ConfirmDlg implements IClientOutgoingPacket } } } - packet.writeD(_time); packet.writeD(_requesterId); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index e11807bdba..63acd728ea 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -73,7 +73,6 @@ public class CreatureSay implements IClientOutgoingPacket _mask |= 0x08; } } - // Does not shows level if (sender.isGM()) { @@ -125,7 +124,6 @@ public class CreatureSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_sender == null ? 0 : _sender.getObjectId()); packet.writeD(_chatType.getClientId()); if (_senderName != null) @@ -156,7 +154,6 @@ public class CreatureSay implements IClientOutgoingPacket packet.writeS(s); } } - // Rank if ((_sender != null) && _sender.isPlayer()) { @@ -165,7 +162,6 @@ public class CreatureSay implements IClientOutgoingPacket { packet.writeC(0); // unknown clan byte } - final int rank = RankManager.getInstance().getPlayerGlobalRank(_sender.getActingPlayer()); if ((rank == 0) || (rank > 100)) { @@ -183,7 +179,6 @@ public class CreatureSay implements IClientOutgoingPacket { packet.writeC(3); } - if (clan != null) { packet.writeC(clan.getCastleId()); @@ -197,7 +192,6 @@ public class CreatureSay implements IClientOutgoingPacket { packet.writeC(0); } - return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index dfc40d995f..a307b06e4b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -38,9 +38,8 @@ public class DeleteObject implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DELETE_OBJECT.writeId(packet); - packet.writeD(_objectId); - packet.writeC(0x00); // c2 + packet.writeC(0); // c2 return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java index 982c8f3311..3b5917e55b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java @@ -50,7 +50,6 @@ public class Dice implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DICE.writeId(packet); - packet.writeD(_objectId); // object id of player packet.writeD(_itemId); // item id of dice (spade) 4625,4626,4627,4628 packet.writeD(_number); // number rolled diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 30bce18efa..3d20a7e921 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -57,7 +57,6 @@ public class Die implements IClientOutgoingPacket siegeClan = fort.getSiege().getAttackerClan(clan); isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan); } - // ClanHall check. if ((clan != null) && (clan.getHideoutId() > 0)) { @@ -92,12 +91,12 @@ public class Die implements IClientOutgoingPacket OutgoingPackets.DIE.writeId(packet); packet.writeD(_objectId); packet.writeQ(_flags); - packet.writeD(_isSweepable ? 0x01 : 0x00); - packet.writeD(0x00); // Feather item time. - packet.writeC(0x00); // Hide die animation. - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(_isSweepable ? 1 : 0); + packet.writeD(0); // Feather item time. + packet.writeC(0); // Hide die animation. + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java index 15404f9dee..5837faec19 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java @@ -33,7 +33,6 @@ public class DoorInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_INFO.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.getId()); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java index 54f8742a73..14d41afee7 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java @@ -33,7 +33,6 @@ public class DoorStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_STATUS_UPDATE.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.isOpen() ? 0 : 1); packet.writeD(_door.getDamage()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index b12458e719..3035890956 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -40,20 +40,17 @@ public class DropItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DROP_ITEM.writeId(packet); - packet.writeD(_objectId); packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeC(_item.isStackable() ? 0x01 : 0x00); + packet.writeC(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - - packet.writeC(0x00); - // packet.writeD(0x01); if above C == true (1) then packet.readD() + packet.writeC(0); + // packet.writeD(1); if above C == true (1) then packet.readD() packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java index 631c43ba0c..99bd80d97e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java @@ -62,13 +62,12 @@ public class Earthquake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EARTHQUAKE.writeId(packet); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_intensity); packet.writeD(_duration); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 6063a54535..1a8b8ddfbb 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -59,25 +59,20 @@ public class EnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_crystal); packet.writeQ(_count); - // Guessing. // With 166 options became 3x write integers instead of shorts and enchant level moved bellow. - // Commenting until actually knowing. // for (int option : _enchantOptions) // { // packet.writeD(option); // } - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_enchantLevel); // Confirmed. - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java index a12f0286f3..22648f887e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java @@ -41,7 +41,6 @@ public class EtcStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ETC_STATUS_UPDATE.writeId(packet); - packet.writeC(_player.getCharges()); // 1-7 increase force, level packet.writeD(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%) packet.writeC(0); // Weapon Grade Penalty [1-4] diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java index 5dca90f960..9f8d576148 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java @@ -24,13 +24,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class Ex2ndPasswordAck implements IClientOutgoingPacket { + // TODO: Enum + public static final int SUCCESS = 0; + public static final int WRONG_PATTERN = 1; + private final int _status; private final int _response; - // TODO: Enum - public static final int SUCCESS = 0x00; - public static final int WRONG_PATTERN = 0x01; - public Ex2ndPasswordAck(int status, int response) { _status = status; @@ -41,10 +41,9 @@ public class Ex2ndPasswordAck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_ACK.writeId(packet); - packet.writeC(_status); - packet.writeD(_response == WRONG_PATTERN ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(_response == WRONG_PATTERN ? 1 : 0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java index 48bde5161d..c86b5185d0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordCheck implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_NEW = 0x00; - public static final int PASSWORD_PROMPT = 0x01; - public static final int PASSWORD_OK = 0x02; + public static final int PASSWORD_NEW = 0; + public static final int PASSWORD_PROMPT = 1; + public static final int PASSWORD_OK = 2; private final int _windowType; @@ -40,9 +40,8 @@ public class Ex2ndPasswordCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_CHECK.writeId(packet); - packet.writeD(_windowType); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java index 1abf50ab01..f6731bf18f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordVerify implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_OK = 0x00; - public static final int PASSWORD_WRONG = 0x01; - public static final int PASSWORD_BAN = 0x02; + public static final int PASSWORD_OK = 0; + public static final int PASSWORD_WRONG = 1; + public static final int PASSWORD_BAN = 2; private final int _wrongTentatives; private final int _mode; @@ -42,7 +42,6 @@ public class Ex2ndPasswordVerify implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_VERIFY.writeId(packet); - packet.writeD(_mode); packet.writeD(_wrongTentatives); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java index 8f3d5ec764..528988ab5f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java @@ -45,10 +45,8 @@ public class ExAbnormalStatusUpdateFromTarget implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ABNORMAL_STATUS_UPDATE_FROM_TARGET.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeH(_effects.size()); - for (BuffInfo info : _effects) { packet.writeD(info.getSkill().getDisplayId()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java index c4b9cd8356..f3abd6ec5c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java @@ -41,7 +41,6 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRABLE_SKILL_LIST_BY_CLASS.writeId(packet); - packet.writeH(_type.getId()); packet.writeH(_learnable.size()); for (SkillLearn skill : _learnable) @@ -54,7 +53,7 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket packet.writeC(skill.getRequiredItems().size()); if (_type == AcquireSkillType.SUBPLEDGE) { - packet.writeH(0x00); + packet.writeH(0); } } return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java index fd0e2fc97c..8555bb6e86 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java @@ -61,7 +61,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_SKILL_INFO.writeId(packet); - packet.writeD(_id); packet.writeD(_level); packet.writeQ(_spCost); @@ -73,7 +72,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket packet.writeD(holder.getId()); packet.writeQ(holder.getCount()); } - packet.writeD(_skillRem.size()); for (Skill skill : _skillRem) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java index 29793f4d6c..ff8c526ec4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java @@ -36,7 +36,6 @@ public class ExAdenaInvenCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ADENA_INVEN_COUNT.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeH(_player.getInventory().getSize()); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java index 2aa2d85bc5..5ef11e0f1e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java @@ -50,13 +50,11 @@ public class ExAirShipInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_INFO.writeId(packet); - packet.writeD(_ship.getObjectId()); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(_captain); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); @@ -73,14 +71,13 @@ public class ExAirShipInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - packet.writeD(_ship.getFuel()); packet.writeD(_ship.getMaxFuel()); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java index 4cfc76bfba..8b37f4fc0a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java @@ -42,7 +42,6 @@ public class ExAirShipStopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_airShipId); packet.writeD(_playerId); packet.writeD(_x); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java index 33c57712da..52958f931b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java @@ -37,12 +37,10 @@ public class ExAirShipTeleportList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_TELEPORT_LIST.writeId(packet); - packet.writeD(_dockId); if (_teleports != null) { packet.writeD(_teleports.length); - for (int i = 0; i < _teleports.length; i++) { packet.writeD(i - 1); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java index 392b228f0d..7918022c72 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java @@ -50,13 +50,12 @@ public class ExAlchemySkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_SKILL_LIST.writeId(packet); - packet.writeD(_skills.size()); for (Skill skill : _skills) { packet.writeD(skill.getId()); packet.writeD(skill.getLevel()); - packet.writeQ(0x00); // Always 0 on Naia, SP i guess? + packet.writeQ(0); // Always 0 on Naia, SP i guess? packet.writeC(skill.getId() == CommonSkill.ALCHEMY_CUBE.getId() ? 0 : 1); // This is type in flash, visible or not } return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java index 3bfadd2650..ed7f8d4255 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAlterSkillRequest.java @@ -47,12 +47,10 @@ public class ExAlterSkillRequest implements IClientOutgoingPacket { return true; } - OutgoingPackets.EX_ALTER_SKILL_REQUEST.writeId(packet); packet.writeD(_nextSkillId); packet.writeD(_currentSkillId); packet.writeD(_alterTime); - if (_alterTime > 0) { _player.setAlterSkillActive(true); @@ -62,7 +60,6 @@ public class ExAlterSkillRequest implements IClientOutgoingPacket _player.setAlterSkillActive(false); }, _alterTime * 1000); } - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java index 3d7ee12a81..1990e1e701 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java @@ -37,7 +37,6 @@ public class ExAskCoupleAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_COUPLE_ACTION.writeId(packet); - packet.writeD(_actionId); packet.writeD(_objectId); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java index 61cabedd98..45615daf5a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java @@ -39,9 +39,8 @@ public class ExAskJoinMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_MPCC.writeId(packet); - packet.writeS(_requestorName); // name of CCLeader - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java index 17fa9d028f..908022ff7e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java @@ -38,7 +38,6 @@ public class ExAskJoinPartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_PARTY_ROOM.writeId(packet); - packet.writeS(_charName); packet.writeS(_roomName); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java index 2a6b958dc9..1551840013 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java @@ -38,7 +38,6 @@ public class ExAskModifyPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_MODIFY_PARTY_LOOTING.writeId(packet); - packet.writeS(_requestor); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java index 958e7c3d06..fa62c8a207 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java @@ -45,7 +45,6 @@ public class ExAttributeEnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ATTRIBUTE_ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeC(_isWeapon); packet.writeH(_type); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java index 1a3a1ef3fe..3d65055b3c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java @@ -41,9 +41,8 @@ public class ExAutoSoulShot implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AUTO_SOUL_SHOT.writeId(packet); - packet.writeD(_itemId); - packet.writeD(_enable ? 0x01 : 0x00); + packet.writeD(_enable ? 1 : 0); packet.writeD(_type); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java index 8680c6bd7a..a8137347ec 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java @@ -37,8 +37,7 @@ public class ExBaseAttributeCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASE_ATTRIBUTE_CANCEL_RESULT.writeId(packet); - - packet.writeD(0x01); // result + packet.writeD(1); // result packet.writeD(_objId); packet.writeD(_attribute); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java index 755fbc66c8..a454d136c6 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java @@ -75,7 +75,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 1149, 1150, 1151, 1152, 1153, 1154, 1155 }; - public static final int[] DEFAULT_ACTION_LIST = { 0, 1, 2, 3, @@ -147,7 +146,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 5012, 5013, 5014, 5015 }; //@formatter:on - public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST); private final int[] _actionIds; @@ -161,7 +159,6 @@ public class ExBasicActionList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASIC_ACTION_LIST.writeId(packet); - packet.writeD(_actionIds.length); for (int _actionId : _actionIds) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java index 4c4fac8c91..d32dca4d21 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java @@ -34,13 +34,14 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBeautyItemList implements IClientOutgoingPacket { - private int _colorCount; - private final BeautyData _beautyData; - private final Map> _colorData = new HashMap<>(); private static final int HAIR_TYPE = 0; private static final int FACE_TYPE = 1; private static final int COLOR_TYPE = 2; + private int _colorCount; + private final BeautyData _beautyData; + private final Map> _colorData = new HashMap<>(); + public ExBeautyItemList(Player player) { _beautyData = BeautyShopData.getInstance().getBeautyData(player.getRace(), player.getAppearance().getSexType()); @@ -60,7 +61,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BEAUTY_ITEM_LIST.writeId(packet); - packet.writeD(HAIR_TYPE); packet.writeD(_beautyData.getHairList().size()); for (BeautyItem hair : _beautyData.getHairList().values()) @@ -72,7 +72,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(hair.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(FACE_TYPE); packet.writeD(_beautyData.getFaceList().size()); for (BeautyItem face : _beautyData.getFaceList().values()) @@ -84,7 +83,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(face.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(COLOR_TYPE); packet.writeD(_colorCount); for (Entry> entry : _colorData.entrySet()) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java index 1825236886..6d4c45cb2b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java @@ -34,7 +34,6 @@ public class ExBirthdayPopup implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_BIRTH_DAY.writeId(packet); - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java index 7d2f17e697..43e525f05f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java @@ -26,6 +26,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBrBroadcastEventState implements IClientOutgoingPacket { + public static final int APRIL_FOOLS = 20090401; + public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) + public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) + public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) + public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) + private final int _eventId; private final int _eventState; private int _param0; @@ -36,12 +42,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket private String _param5; private String _param6; - public static final int APRIL_FOOLS = 20090401; - public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) - public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) - public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) - public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) - public ExBrBroadcastEventState(int eventId, int eventState) { _eventId = eventId; @@ -65,7 +65,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BROADCAST_EVENT_STATE.writeId(packet); - packet.writeD(_eventId); packet.writeD(_eventState); packet.writeD(_param0); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java index 1fd7ec663a..c0683c8797 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java @@ -44,7 +44,6 @@ public class ExBrBuffEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUFF_EVENT_STATE.writeId(packet); - packet.writeD(_type); packet.writeD(_value); packet.writeD(_state); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java index 943aae8a62..8e009d7b09 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java @@ -43,7 +43,6 @@ public class ExBrLoadEventTopRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_LOAD_EVENT_TOP_RANKERS.writeId(packet); - packet.writeD(_eventId); packet.writeD(_day); packet.writeD(_count); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java index 6a98c01654..9105e39efe 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java @@ -36,9 +36,8 @@ public class ExBrPremiumState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PREMIUM_STATE.writeId(packet); - packet.writeD(_player.getObjectId()); - packet.writeC(_player.hasPremiumStatus() ? 0x01 : 0x00); + packet.writeC(_player.hasPremiumStatus() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 381dd859ad..567cfc70f9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -59,10 +59,8 @@ public class ExBuySellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x01); // Type SELL + packet.writeD(1); // Type SELL packet.writeD(_inventorySlots); - if ((_sellList != null)) { packet.writeH(_sellList.size()); @@ -74,9 +72,8 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - if ((_refundList != null) && !_refundList.isEmpty()) { packet.writeH(_refundList.size()); @@ -90,10 +87,9 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - - packet.writeC(_done ? 0x01 : 0x00); + packet.writeC(_done ? 1 : 0); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java index 2b43c0ce4b..e0ec81e0e7 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java @@ -39,7 +39,6 @@ public class ExCastleState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CASTLE_STATE.writeId(packet); - packet.writeD(_castleId); packet.writeD(_castleSide.ordinal()); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java index b7f90d261b..a8196c7a83 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java @@ -52,7 +52,6 @@ public class ExChangeClientEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_CLIENT_EFFECT_INFO.writeId(packet); - packet.writeD(_type); packet.writeD(_key); packet.writeD(_value); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java index 472abc88df..eea59162ee 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java @@ -37,7 +37,6 @@ public class ExChangeNpcState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NPC_STATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java index 8cdcb4460d..45f2805517 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java @@ -49,7 +49,6 @@ public class ExChangePostState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_POST_STATE.writeId(packet); - packet.writeD(_receivedBoard ? 1 : 0); packet.writeD(_changedMsgIds.length); for (int postId : _changedMsgIds) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java index fc58ec9a2e..d765ab54e0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java @@ -35,7 +35,6 @@ public class ExChangeToAwakenedClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_TO_AWAKENED_CLASS.writeId(packet); - packet.writeD(_classId); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index 0fc5fb1c75..fec31d4775 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -47,7 +47,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket throw new IllegalArgumentException("Undefined Atribute item: " + stone); } _level = ElementalAttributeData.getInstance().getMaxElementLevel(_itemId); - // Register only items that can be put an attribute stone/crystal for (Item item : player.getInventory().getItems()) { @@ -62,7 +61,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_INVENTORY_ATTRIBUTE_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeQ(_count); packet.writeD(_atribute == AttributeType.FIRE ? 1 : 0); // Fire diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java index a272d85469..238882cd11 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java @@ -35,7 +35,6 @@ public class ExCloseMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java index d2ecd70952..877bca760a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java @@ -34,7 +34,6 @@ public class ExClosePartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_PARTY_ROOM.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java index 27c112776b..1d02c972b5 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java @@ -54,7 +54,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLOSSEUM_FENCE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_clientState); packet.writeD(_x); @@ -62,7 +61,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_width); packet.writeD(_length); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java index 766d3619ad..b72bef93e8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java @@ -37,9 +37,8 @@ public class ExConfirmAddingContact implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AGIT_AUCTION_CMD.writeId(packet); - packet.writeS(_charName); - packet.writeD(_added ? 0x01 : 0x00); + packet.writeD(_added ? 1 : 0); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java index beded32254..c832d507ed 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameAddPlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x01); - + packet.writeD(1); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java index 5f36f730d0..847ea93e6a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java @@ -45,9 +45,7 @@ public class ExCubeGameChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java index 66abbf4b75..a2f2e61ded 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java @@ -43,12 +43,10 @@ public class ExCubeGameChangeTeam implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x05); - + packet.writeD(5); packet.writeD(_player.getObjectId()); - packet.writeD(_fromRedTeam ? 0x01 : 0x00); - packet.writeD(_fromRedTeam ? 0x00 : 0x01); + packet.writeD(_fromRedTeam ? 1 : 0); + packet.writeD(_fromRedTeam ? 0 : 1); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java index 5273b2099a..136b439283 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java @@ -39,9 +39,7 @@ public class ExCubeGameChangeTimeToStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x03); - + packet.writeD(3); packet.writeD(_seconds); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java index f81a302941..9bdba49029 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java @@ -35,7 +35,6 @@ public class ExCubeGameCloseUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0xffffffff); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java index 259a0e9407..3177e7a488 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java @@ -40,11 +40,9 @@ public class ExCubeGameEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x01); - - packet.writeD(_isRedTeamWin ? 0x01 : 0x00); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(1); + packet.writeD(_isRedTeamWin ? 1 : 0); + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java index 4d89e621ce..8b96bb545f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java @@ -55,14 +55,11 @@ public class ExCubeGameExtendedChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeD(_playerPoints); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java index e5a00f1ab7..c084789f13 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameRemovePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java index 00be884d2f..35a3f289d1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java @@ -35,8 +35,7 @@ public class ExCubeGameRequestReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x04); + packet.writeD(4); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java index 1bc89e0c32..8b755dd3cc 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java @@ -30,7 +30,6 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket // Players Lists private final List _bluePlayers; private final List _redPlayers; - // Common Values private final int _roomNumber; @@ -51,12 +50,9 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_roomNumber); packet.writeD(0xffffffff); - packet.writeD(_bluePlayers.size()); for (Player player : _bluePlayers) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java index 2f2c092c08..d000112787 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java @@ -31,7 +31,6 @@ public class ExCursedWeaponList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet); - final Set ids = CursedWeaponsManager.getInstance().getCursedWeaponsIds(); packet.writeD(ids.size()); ids.forEach(packet::writeD); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java index 2f60a1b80c..5bc7ff3238 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java @@ -39,7 +39,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet); - if (!_cursedWeaponInfo.isEmpty()) { packet.writeD(_cursedWeaponInfo.size()); @@ -47,7 +46,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { packet.writeD(w.id); packet.writeD(w.activated); - packet.writeD(w.pos.getX()); packet.writeD(w.pos.getY()); packet.writeD(w.pos.getZ()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java index a0ba15da9f..8bee464fb0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java @@ -41,7 +41,6 @@ public class ExDieInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIE_INFO.writeId(packet); - packet.writeH(_droppedItems.size()); for (Item item : _droppedItems) { @@ -49,17 +48,15 @@ public class ExDieInfo implements IClientOutgoingPacket packet.writeD(item.getEnchantLevel()); packet.writeD((int) item.getCount()); } - packet.writeD(_lastDamageTaken.size()); for (DamageTakenHolder damageHolder : _lastDamageTaken) { packet.writeS(damageHolder.getCreature().getName()); - packet.writeH(0x00); + packet.writeH(0); packet.writeD(damageHolder.getSkillId()); packet.writeF(damageHolder.getDamage()); - packet.writeD(0x00); + packet.writeD(0); } - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java index f475a02b28..0456fb9dae 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java @@ -34,7 +34,6 @@ public class ExDissmissMPCCRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DISSMISS_MPCC_ROOM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java index 258010f717..c731b7c7a9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java @@ -37,7 +37,6 @@ public class ExDuelAskStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_ASK_START.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDuel); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java index 043c82c0db..e9a31bee57 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java @@ -38,7 +38,6 @@ public class ExDuelEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_END.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java index 264409b3d6..e1fa1cea88 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java @@ -38,7 +38,6 @@ public class ExDuelReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_READY.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java index 488aafcb7d..ecdd528a16 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java @@ -38,7 +38,6 @@ public class ExDuelStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_START.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java index 7df040c5e7..5ed0c09675 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java @@ -36,7 +36,6 @@ public class ExDuelUpdateUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_UPDATE_USER_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeD(_player.getClassId().getId()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 7ab055a3d8..f58c0573a8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExEnchantSkillInfo implements IClientOutgoingPacket { private final Set _routes; - private final int _skillId; private final int _skillLevel; private final int _skillSubLevel; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 41368a8efb..e4ee350e64 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -50,7 +50,6 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_INFO_DETAIL.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java index 5cedcd6284..1d32f0d725 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java @@ -43,7 +43,6 @@ public class ExEnchantSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_LIST.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skills.size()); for (Skill skill : _skills) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java index 6ab5e869f2..853d74039f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java @@ -38,7 +38,6 @@ public class ExEnchantSkillResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_RESULT.writeId(packet); - packet.writeD(_enchanted ? 1 : 0); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java index 7b7d2d008d..410bf16510 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java @@ -42,7 +42,6 @@ public class ExEventMatchMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_EVENT_MATCH_MESSAGE.writeId(packet); - packet.writeC(_type); packet.writeS(_message); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java index 7264e90233..1946758bf5 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java @@ -37,11 +37,9 @@ public class ExGetBookMarkInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOOK_MARK_INFO.writeId(packet); - - packet.writeD(0x00); // Dummy + packet.writeD(0); // Dummy packet.writeD(_player.getBookMarkSlot()); packet.writeD(_player.getTeleportBookmarks().size()); - for (TeleportBookmark tpbm : _player.getTeleportBookmarks()) { packet.writeD(tpbm.getId()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java index 36e7bb81af..201e8eb49b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java @@ -42,15 +42,14 @@ public class ExGetBossRecord implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOSS_RECORD.writeId(packet); - packet.writeD(_ranking); packet.writeD(_totalPoints); if (_bossRecordInfo == null) { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } else { @@ -59,7 +58,7 @@ public class ExGetBossRecord implements IClientOutgoingPacket { packet.writeD(entry.getKey()); packet.writeD(entry.getValue()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? } } return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java index ea0a5f8b18..85ccad0758 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java @@ -41,7 +41,6 @@ public class ExGetOffAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_OFF_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_x); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java index f8e16a4191..9a02e49223 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java @@ -39,7 +39,6 @@ public class ExGetOnAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_ON_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java index 51197344a5..704b3212a1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExGetPremiumItemList implements IClientOutgoingPacket { private final Player _player; - private final Map _map; public ExGetPremiumItemList(Player player) @@ -43,7 +42,6 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_PREMIUM_ITEM_LIST.writeId(packet); - packet.writeD(_map.size()); for (Entry entry : _map.entrySet()) { @@ -51,7 +49,7 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket packet.writeQ(entry.getKey()); packet.writeD(item.getItemId()); packet.writeQ(item.getCount()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeS(item.getSender()); } return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index 5f4810be42..34ef181b22 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -40,19 +40,18 @@ public class ExHeroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HERO_LIST.writeId(packet); - packet.writeD(_heroList.size()); for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); packet.writeD(hero.getInt(Olympiad.CLASS_ID)); packet.writeS(hero.getString(Hero.CLAN_NAME, "")); - packet.writeD(0x00); // hero.getInt(Hero.CLAN_CREST, 0) + packet.writeD(0); // hero.getInt(Hero.CLAN_CREST, 0) packet.writeS(hero.getString(Hero.ALLY_NAME, "")); - packet.writeD(0x00); // hero.getInt(Hero.ALLY_CREST, 0) + packet.writeD(0); // hero.getInt(Hero.ALLY_CREST, 0) packet.writeD(hero.getInt(Hero.COUNT)); - packet.writeD(0x00); - packet.writeC(0x00); // 272 + packet.writeD(0); + packet.writeC(0); // 272 } return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index d5b5430142..0baca7cd86 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -48,8 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); - - packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade + packet.writeC(_hide ? 0 : 1); // Grand Crusade packet.writeD(_currentTemplateId); packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java index 81db66b88f..323c0cdf1e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java @@ -35,7 +35,6 @@ public class ExIsCharNameCreatable implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_IS_CHAR_NAME_CREATABLE.writeId(packet); - packet.writeD(_allowed); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java index 2cea176d69..4eea62de37 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java @@ -39,11 +39,11 @@ public class ExItemAnnounce implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_ANNOUNCE.writeId(packet); - packet.writeC(0x00); // item icon + packet.writeC(0); // item icon packet.writeString(_player.getName()); // name of player packet.writeD(_item.getId()); // item id packet.writeD(_item.getEnchantLevel()); // enchant level - packet.writeC(0x00); // name of item + packet.writeC(0); // name of item return true; } } \ No newline at end of file diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java index ecc751eab3..45def9e0be 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java @@ -38,7 +38,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { throw new NullPointerException(); } - if (currentAuction.getAuctionState() != ItemAuctionState.STARTED) { _timeRemaining = 0; @@ -47,7 +46,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { _timeRemaining = (int) (currentAuction.getFinishingTimeRemaining() / 1000); // in seconds } - _refresh = refresh; _currentAuction = currentAuction; _nextAuction = nextAuction; @@ -57,16 +55,12 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_AUCTION_INFO.writeId(packet); - - packet.writeC(_refresh ? 0x00 : 0x01); + packet.writeC(_refresh ? 0 : 1); packet.writeD(_currentAuction.getInstanceId()); - final ItemAuctionBid highestBid = _currentAuction.getHighestBid(); packet.writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid()); - packet.writeD(_timeRemaining); writeItem(packet, _currentAuction.getItemInfo()); - if (_nextAuction != null) { packet.writeQ(_nextAuction.getAuctionInitBid()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java index f66c77509f..e40ebdb90b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionStatus.java @@ -44,7 +44,6 @@ public class ExItemAuctionStatus implements IClientOutgoingPacket _x = spawn.getX(); _y = spawn.getY(); _z = spawn.getZ(); - final ItemAuctionInstance manager = ItemAuctionManager.getInstance().getManagerInstance(AUCTION_MANAGER); if (manager != null) { @@ -64,7 +63,7 @@ public class ExItemAuctionStatus implements IClientOutgoingPacket packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); + packet.writeD(0); packet.writeH(_status); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExLetterCollectorUI.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExLetterCollectorUI.java index d03169fc4f..f67f38d912 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExLetterCollectorUI.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExLetterCollectorUI.java @@ -36,7 +36,7 @@ public class ExLetterCollectorUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LETTER_COLLECTOR_UI_LAUNCHER.writeId(packet); - packet.writeC(0x01); // enabled (0x00 - no, 0x01 -yes) + packet.writeC(1); // enabled (0x00 - no, 0x01 -yes) packet.writeD(LETTER_COLLECTOR_MIN_LEVEL); // Minimum Level return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java index 53ad8abd58..1c5e38cbab 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListMpccWaiting implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _rooms = new LinkedList<>(); @@ -53,7 +54,6 @@ public class ExListMpccWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_MPCC_WAITING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 78f2fec636..eafea24fa6 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _players = new LinkedList<>(); @@ -60,7 +61,6 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(packet); - packet.writeD(_size); packet.writeD(_players.size()); for (Player player : _players) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java index 786c616875..c8723a9fc0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java @@ -46,7 +46,6 @@ public class ExMPCCPartyInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCPARTY_INFO_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_LeaderOID); packet.writeD(_memberCount); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java index 4bf07f0133..08259e4e6c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java @@ -37,7 +37,6 @@ public class ExMPCCPartymasterList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_PARTYMASTER_LIST.writeId(packet); - packet.writeD(_leadersName.size()); _leadersName.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java index abbdc8fe76..f021ef5f1f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java @@ -36,7 +36,6 @@ public class ExMPCCRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java index 154e156270..2eec590cb4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java @@ -41,7 +41,6 @@ public class ExMPCCRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java index 06e3027bfc..a0e9d0a4b0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java @@ -37,7 +37,6 @@ public class ExMPCCShowPartyMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCSHOW_PARTY_MEMBER_INFO.writeId(packet); - packet.writeD(_party.getMemberCount()); for (Player pc : _party.getMembers()) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java index e454a746f3..771b2f22cb 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java @@ -49,7 +49,6 @@ public class ExMagicAttackInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAGIC_ATTACK_INFO.writeId(packet); - packet.writeD(_caster); packet.writeD(_target); packet.writeD(_type); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java index 9cfbeb5aee..1aaa5b6520 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java @@ -35,7 +35,6 @@ public class ExMailArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAIL_ARRIVED.writeId(packet); - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java index 983ff22b92..48156c0600 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java @@ -44,7 +44,6 @@ public class ExManageMpccRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MANAGE_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java index f710c006e8..9d7d14211e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java @@ -45,7 +45,6 @@ public class ExMoveToLocationAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_objId); packet.writeD(_tx); packet.writeD(_ty); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java index 3e3bdc9fed..87e44b51cd 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java @@ -43,7 +43,6 @@ public class ExMoveToLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java index 7ab0d1c7da..3c1902892a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java @@ -40,11 +40,9 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet); - packet.writeS(_channel.getLeader().getName()); - packet.writeD(0x00); // Channel loot 0 or 1 + packet.writeD(0); // Channel loot 0 or 1 packet.writeD(_channel.getMemberCount()); - packet.writeD(_channel.getParties().size()); for (Party p : _channel.getParties()) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java index 1536bd5f9b..f2a32bb6e8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java @@ -43,7 +43,6 @@ public class ExNeedToChangeName implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEED_TO_CHANGE_NAME.writeId(packet); - packet.writeD(_type); packet.writeD(_subType); packet.writeS(_name); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java index be9bec8559..d18b4606b3 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java @@ -35,7 +35,6 @@ public class ExNevitAdventEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CHANNELING_EFFECT.writeId(packet); - packet.writeD(_timeLeft); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java index 3a0367c178..09f6250f51 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java @@ -35,7 +35,6 @@ public class ExNevitAdventPointInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_AGATHION_ENERGY_INFO.writeId(packet); - packet.writeD(_points); // 72 = 1%, max 7200 = 100% return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java index 88fdaae499..ef220d86de 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java @@ -37,9 +37,8 @@ public class ExNevitAdventTimeChange implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - // state 0 - pause 1 - started - packet.writeC(_paused ? 0x00 : 0x01); + packet.writeC(_paused ? 0 : 1); // left time in ms max is 16000 its 4m and state is automatically changed to quit packet.writeD(_time); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java index fccdf510cc..4025bf78fa 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java @@ -34,7 +34,6 @@ public class ExNewSkillToLearnByLevelUp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEW_SKILL_TO_LEARN_BY_LEVEL_UP.writeId(packet); - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java index 324c18a517..f2ce8614dc 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java @@ -43,8 +43,7 @@ public class ExNoticePostArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTICE_POST_ARRIVED.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java index afe3719d9b..050c7ccea5 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java @@ -43,8 +43,7 @@ public class ExNoticePostSent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_WRITE_POST.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java index 5d98c20b09..e0bd08d39a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java @@ -30,7 +30,6 @@ public class ExNotifyPremiumItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_PREMIUM_ITEM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java index 6cb3724448..ba3c0cfeaa 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java @@ -34,7 +34,6 @@ public class ExOlympiadMatchEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MATCH_END.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java index 264d5aa484..7ffd5ed3bd 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java @@ -55,19 +55,15 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x00); // Type 0 = Match List, 1 = Match Result - + packet.writeD(0); // Type 0 = Match List, 1 = Match Result packet.writeD(_games.size()); - packet.writeD(0x00); - + packet.writeD(0); for (OlympiadGameTask curGame : _games) { final AbstractOlympiadGame game = curGame.getGame(); if (game != null) { packet.writeD(game.getStadiumId()); // Stadium Id (Arena 1 = 0) - if (game instanceof OlympiadGameNonClassed) { packet.writeD(1); @@ -80,8 +76,7 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket { packet.writeD(0); } - - packet.writeD(curGame.isRunning() ? 0x02 : 0x01); // (1 = Standby, 2 = Playing) + packet.writeD(curGame.isRunning() ? 2 : 1); // (1 = Standby, 2 = Playing) packet.writeS(game.getPlayerNames()[0]); // Player 1 Name packet.writeS(game.getPlayerNames()[1]); // Player 2 Name } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java index 712651603d..b387271fba 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java @@ -53,9 +53,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x01); // Type 0 = Match List, 1 = Match Result - + packet.writeD(1); // Type 0 = Match List, 1 = Match Result packet.writeD(_tie ? 1 : 0); // 0 - win, 1 - tie packet.writeS(_winnerList.get(0).getName()); packet.writeD(_winTeam); @@ -69,9 +67,8 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } - packet.writeD(_loseTeam); packet.writeD(_loserList.size()); for (OlympiadInfo info : _loserList) @@ -83,7 +80,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java index 34d81d1f53..712b9e06c6 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java @@ -38,7 +38,6 @@ public class ExOlympiadMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MODE.writeId(packet); - packet.writeC(_mode); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java index ebea6c56f3..5b4f2c2523 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java @@ -53,7 +53,6 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_SPELLED_INFO.writeId(packet); - packet.writeD(_playerId); packet.writeD(_effects.size() + _effects2.size()); for (BuffInfo info : _effects) @@ -62,7 +61,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(info.getSkill().getDisplayId()); packet.writeH(info.getSkill().getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(info.getSkill().getAbnormalType().getClientId()); writeOptionalD(packet, info.getSkill().isAura() ? -1 : info.getTime()); } @@ -73,7 +72,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(skill.getDisplayId()); packet.writeH(skill.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(skill.getAbnormalType().getClientId()); packet.writeH(-1); } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java index 18c34fe9de..ca473edfcf 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java @@ -76,7 +76,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_USER_INFO.writeId(packet); - if (_player != null) { packet.writeC(_player.getOlympiadSide()); @@ -91,7 +90,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket packet.writeS(_par.getName()); packet.writeD(_par.getBaseClass()); } - packet.writeD(_curHp); packet.writeD(_maxHp); packet.writeD(_curCp); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java index e84d0251bd..7ec64cc8c3 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java @@ -35,7 +35,6 @@ public class ExOpenMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OPEN_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java index 90349cc1a2..5661dc9f57 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java @@ -56,7 +56,6 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PCCAFE_POINT_INFO.writeId(packet); - packet.writeD(_points); // num points packet.writeD(_mAddPoint); // points inc display packet.writeC(_mPeriodType); // period(0=don't show window,1=acquisition,2=use points) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java index f7e8b4a99a..248a2f7d98 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_ADD.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java index 832bee0012..1f452f4bae 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_DELETE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_summon.getSummonType()); packet.writeD(_summon.getOwner().getObjectId()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java index 0646a67001..703694fa2f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_UPDATE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 0e3edb3ea7..e4c6b79ae0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -47,7 +47,6 @@ public class ExPartyRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index dec8a55f3b..c1272bd98c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -43,10 +43,8 @@ public class ExPetInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class ExPetInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class ExPetInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,9 +154,8 @@ public class ExPetInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -227,28 +205,24 @@ public class ExPetInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PET_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0x00); + packet.writeQ(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -267,7 +241,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -283,19 +257,19 @@ public class ExPetInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -307,20 +281,20 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -344,12 +318,12 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -379,12 +353,10 @@ public class ExPetInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java index 082f4c7662..0f72c05a3a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java @@ -34,7 +34,6 @@ public class ExPlayScene implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLAY_SCENE.writeId(packet); - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java index e98d317e14..7e3803bdaa 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java @@ -36,7 +36,6 @@ public class ExPledgeCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_COUNT.writeId(packet); - packet.writeD(_count); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java index 838029e284..4084de3481 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java @@ -38,7 +38,6 @@ public class ExPledgeDraftListSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_DRAFT_LIST_SEARCH.writeId(packet); - packet.writeD(_pledgeRecruitList.size()); for (PledgeWaitingInfo prl : _pledgeRecruitList) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java index fb956e9996..44e34004ea 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java @@ -25,11 +25,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExPledgeEmblem implements IClientOutgoingPacket { + private static final int TOTAL_SIZE = 65664; + private final int _crestId; private final int _clanId; private final byte[] _data; private final int _chunkId; - private static final int TOTAL_SIZE = 65664; public ExPledgeEmblem(int crestId, byte[] chunkedData, int clanId, int chunkId) { @@ -43,7 +44,6 @@ public class ExPledgeEmblem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clanId); packet.writeD(_crestId); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java index ed19bf976b..b32f8c0645 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitApplyInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_APPLY_INFO.writeId(packet); - packet.writeD(_status.ordinal()); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java index fc98b7b6f7..af4af9c9c1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitBoardDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_DETAIL.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClanId()); packet.writeD(_pledgeRecruitInfo.getKarma()); packet.writeS(_pledgeRecruitInfo.getInformation()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index b4d48373a6..eda808e754 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -34,7 +34,6 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket private final int _clanOnCurrentPage; private final int _startIndex; private final int _endIndex; - static final int CLAN_PER_PAGE = 12; public ExPledgeRecruitBoardSearch(List clanList, int currentPage) @@ -51,11 +50,9 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_SEARCH.writeId(packet); - packet.writeD(_currentPage); packet.writeD(_totalNumberOfPage); packet.writeD(_clanOnCurrentPage); - for (int i = _startIndex; i < _endIndex; i++) { packet.writeD(_clanList.get(i).getClanId()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 4ae5ffe316..b1f139226d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -40,7 +40,6 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java index 77080a3820..5844f220ec 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java @@ -39,7 +39,6 @@ public class ExPledgeWaitingList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST.writeId(packet); - packet.writeD(pledgePlayerRecruitInfos.size()); for (PledgeApplicantInfo recruitInfo : pledgePlayerRecruitInfos.values()) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java index a9245c1309..6b88572057 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java @@ -30,7 +30,6 @@ public class ExPledgeWaitingListAlarm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_ALARM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java index 60997b3da0..28c3967119 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java @@ -40,7 +40,6 @@ public class ExPledgeWaitingListApplied implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_APPLIED.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClan().getId()); packet.writeS(_pledgeRecruitInfo.getClan().getName()); packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java index 66a06892c2..1f53d1bb38 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java @@ -36,7 +36,6 @@ public class ExPledgeWaitingUser implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_USER.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getPlayerId()); packet.writeS(_pledgeRecruitInfo.getMessage()); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java index 49bc9b0995..5f404779f5 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java @@ -43,7 +43,6 @@ public class ExPrivateStoreSetWholeMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_objectId); packet.writeS(_msg); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java index cb5e8fbce9..ff996b5d0c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutCommissionResultForVariationMake implements IClientOutgoingPac public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_COMMISSION_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_gemstoneObjId); packet.writeD(_itemId); packet.writeQ(_gemstoneCount); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java index 81721e921f..098472b7ae 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantScrollItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SCROLL_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java index 871f377db2..ffea182a49 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java index c47a4bcff4..8016e128f4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java index c8b46be499..95c0c0e4e1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_INTENSIVE_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_refinerItemObjId); packet.writeD(_lifestoneItemId); packet.writeD(_gemstoneItemId); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 2128b2b19f..2970ca00a2 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -41,13 +41,12 @@ public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_CANCEL.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); packet.writeD(_itemAug1); packet.writeD(_itemAug2); packet.writeQ(_price); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java index 80541e65cd..c25dd16b01 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java @@ -34,10 +34,9 @@ public class ExPutItemResultForVariationMake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java index fe5eb74eb0..bc8896164d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java @@ -56,13 +56,12 @@ public class ExQuestNpcLogList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_NPC_LOG_LIST.writeId(packet); - packet.writeD(_questId); packet.writeC(_npcLogList.size()); for (NpcLogListHolder holder : _npcLogList) { packet.writeD(holder.isNpcString() ? holder.getId() : holder.getId() + 1000000); - packet.writeC(holder.isNpcString() ? 0x01 : 0x00); + packet.writeC(holder.isNpcString() ? 1 : 0); packet.writeD(holder.getCount()); } return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java index 62d622caff..60616b256d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java @@ -35,7 +35,6 @@ public class ExRedSky implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RED_SKY.writeId(packet); - packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java index ce40b1a792..163faff855 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java @@ -36,7 +36,6 @@ public class ExRegenMax implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REGEN_MAX.writeId(packet); - packet.writeD(1); packet.writeD(_time); packet.writeD(_tickInterval); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java index d864795cd6..a17525576b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java @@ -34,7 +34,6 @@ public class ExRemoveEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REMOVE_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 57ed88ac29..4e479e75a6 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -56,7 +56,6 @@ public class ExReplyReceivedPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_RECEIVED_POST.writeId(packet); - packet.writeD(_msg.getMailType().ordinal()); // GOD if (_msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED) { @@ -76,11 +75,10 @@ public class ExReplyReceivedPost extends AbstractItemPacket } packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown packet.writeS(_msg.getSenderName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -92,9 +90,8 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeQ(_msg.getReqAdena()); packet.writeD(_msg.hasAttachments() ? 1 : 0); packet.writeD(_msg.isReturned() ? 1 : 0); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 75f6596194..ed490eae91 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -54,14 +54,12 @@ public class ExReplySentPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_SENT_POST.writeId(packet); - - packet.writeD(0x00); // GOD + packet.writeD(0); // GOD packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); packet.writeS(_msg.getReceiverName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -73,11 +71,11 @@ public class ExReplySentPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeQ(_msg.getReqAdena()); - packet.writeD(_msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(_msg.isReturned() ? 0x01 : 00); + packet.writeD(_msg.hasAttachments() ? 1 : 0); + packet.writeD(_msg.isReturned() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index cc4f7ce1d8..e6a3f9bca2 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -35,7 +35,6 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java index 2634aa1cdd..60201b177f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java @@ -35,7 +35,6 @@ public class ExRequestHackShield implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REQUEST_HACK_SHIELD.writeId(packet); - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java index c51ff31d0b..75e3b3a945 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java @@ -29,13 +29,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyList implements IClientOutgoingPacket { + public static final int SHOW_FACESHAPE = 1; + public static final int SHOW_HAIRSTYLE = 0; + private final Player _player; private final int _type; private final Map _beautyItem; - public static final int SHOW_FACESHAPE = 1; - public static final int SHOW_HAIRSTYLE = 0; - public ExResponseBeautyList(Player player, int type) { _player = player; @@ -54,7 +54,6 @@ public class ExResponseBeautyList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java index ca2ed360ab..4b19201833 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java @@ -25,16 +25,15 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket { + public static final int FAILURE = 0; + public static final int SUCCESS = 1; + public static final int CHANGE = 0; + public static final int RESTORE = 1; + private final Player _player; private final int _type; private final int _result; - public static final int FAILURE = 0; - public static final int SUCCESS = 1; - - public static final int CHANGE = 0; - public static final int RESTORE = 1; - public ExResponseBeautyRegistReset(Player player, int type, int result) { _player = player; @@ -46,7 +45,6 @@ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_REGIST_RESET.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java index 0e313ef3b7..c0922cfb04 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java @@ -36,10 +36,8 @@ public class ExResponseResetList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_RESET_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); - packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java index 01fe1945ef..a230033d67 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java @@ -37,7 +37,6 @@ public class ExRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ROTATION.writeId(packet); - packet.writeD(_charId); packet.writeD(_heading); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index c58ccfc233..2646a71e77 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -36,7 +36,6 @@ public class ExRpItemLink extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RP_ITEM_LINK.writeId(packet); - writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java index 04556bbed2..f0c6eba8e9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java @@ -34,7 +34,6 @@ public class ExSearchOrc implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEARCH_ORC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index 1e06cc2a3f..7a4dced122 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -38,7 +38,6 @@ public class ExSendManorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_MANOR_LIST.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java index 1cf12b0ad1..095307c9c8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java @@ -125,7 +125,6 @@ public class ExSendUIEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_UIEVENT.writeId(packet); - packet.writeD(_objectId); packet.writeD(_type); // 0 = show, 1 = hide (there is 2 = pause and 3 = resume also but they don't work well you can only pause count down and you cannot resume it because resume hides the counter). packet.writeD(0); // unknown diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java index 4378479707..716a3e8623 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java @@ -385,16 +385,13 @@ public class ExServerPrimitive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SERVER_PRIMITIVE.writeId(packet); - packet.writeS(_name); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(65535); // has to do something with display range and angle packet.writeD(65535); // has to do something with display range and angle - packet.writeD(_points.size() + _lines.size()); - for (Point point : _points) { packet.writeC(1); // Its the type in this case Point @@ -408,7 +405,6 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(point.getY()); packet.writeD(point.getZ()); } - for (Line line : _lines) { packet.writeC(2); // Its the type in this case Line diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java index 5187833002..627d61cd05 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java @@ -43,7 +43,6 @@ public class ExSetCompassZoneCode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_COMPASS_ZONE_CODE.writeId(packet); - packet.writeD(_zoneType); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java index 1d0fbae3a4..34dee8bda0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java @@ -38,7 +38,6 @@ public class ExSetPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_PARTY_LOOTING.writeId(packet); - packet.writeD(_result); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java index 7b14ec8412..4e491af9d1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java @@ -34,7 +34,6 @@ public class ExShowAdventurerGuideBook implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_ADVENTURER_GUIDE_BOOK.writeId(packet); - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index 82554fdc5f..1f8df76083 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -39,7 +39,6 @@ public class ExShowAgitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AGIT_INFO.writeId(packet); - final Collection clanHalls = ClanHallData.getInstance().getClanHalls(); packet.writeD(clanHalls.size()); clanHalls.forEach(clanHall -> diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index dd11ee0150..51e6646ff5 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -44,7 +44,6 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BASE_ATTRIBUTE_CANCEL_WINDOW.writeId(packet); - packet.writeD(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java index 14e55d39f3..e22345c4fd 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java @@ -25,13 +25,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExShowBeautyMenu implements IClientOutgoingPacket { - private final Player _player; - private final int _type; - // TODO: Enum public static final int MODIFY_APPEARANCE = 0; public static final int RESTORE_APPEARANCE = 1; + private final Player _player; + private final int _type; + public ExShowBeautyMenu(Player player, int type) { _player = player; @@ -42,7 +42,6 @@ public class ExShowBeautyMenu implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BEAUTY_MENU.writeId(packet); - packet.writeD(_type); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 15d011befc..b0d2b90494 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -41,7 +41,6 @@ public class ExShowCastleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CASTLE_INFO.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) @@ -65,8 +64,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } packet.writeD(castle.getTaxPercent(TaxType.BUY)); packet.writeD((int) (castle.getSiege().getSiegeDate().getTimeInMillis() / 1000)); - - packet.writeC(castle.getSiege().isInProgress() ? 0x01 : 0x00); // Grand Crusade + packet.writeC(castle.getSiege().isInProgress() ? 1 : 0); // Grand Crusade packet.writeC(castle.getSide().ordinal()); // Grand Crusade } return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java index aeb4079f3a..f9a6ebe0e7 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java @@ -38,7 +38,6 @@ public class ExShowContactList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_SHOW_POST_FRIEND.writeId(packet); - packet.writeD(_contacts.size()); _contacts.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index a079ea3129..94b989b583 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -37,7 +37,6 @@ public class ExShowCropInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _crops = (nextPeriod && !manor.isManorApproved()) ? null : manor.getCropProcure(manorId, nextPeriod); } @@ -46,10 +45,9 @@ public class ExShowCropInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Crop Sales" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Crop Sales" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); + packet.writeD(0); if (_crops != null) { packet.writeD(_crops.size()); @@ -64,17 +62,17 @@ public class ExShowCropInfo implements IClientOutgoingPacket if (seed == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(seed.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(seed.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(seed.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index a1e06eb2bf..1c65dde1a6 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -62,10 +62,8 @@ public class ExShowCropSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getCropId()); // crop id diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index ee9fa9fd37..b625a1e4e7 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -39,7 +39,6 @@ public class ExShowFortressInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_INFO.writeId(packet); - final Collection forts = FortManager.getInstance().getForts(); packet.writeD(forts.size()); for (Fort fort : forts) @@ -47,7 +46,7 @@ public class ExShowFortressInfo implements IClientOutgoingPacket final Clan clan = fort.getOwnerClan(); packet.writeD(fort.getResidenceId()); packet.writeS(clan != null ? clan.getName() : ""); - packet.writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00); + packet.writeD(fort.getSiege().isInProgress() ? 1 : 0); // Time of possession packet.writeD(fort.getOwnedTime()); } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index f389b26ed5..678ab43e96 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -42,11 +42,9 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_MAP_INFO.writeId(packet); - packet.writeD(_fortress.getResidenceId()); packet.writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status packet.writeD(_fortress.getFortSize()); // barracks count - final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId()); if ((commanders != null) && !commanders.isEmpty() && _fortress.getSiege().isInProgress()) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 27da99cf41..da186103ae 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -51,7 +51,6 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_SIEGE_INFO.writeId(packet); - packet.writeD(_fortId); // Fortress Id packet.writeD(_size); // Total Barracks Count if (_csize > 0) @@ -64,22 +63,22 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { case 0: { - packet.writeD(0x03); + packet.writeD(3); break; } case 1: { - packet.writeD(0x02); + packet.writeD(2); break; } case 2: { - packet.writeD(0x01); + packet.writeD(1); break; } case 3: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -92,27 +91,27 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket // TODO: once control room supported, update packet.writeD(0x0x) to support 5th room case 0: { - packet.writeD(0x05); + packet.writeD(5); break; } case 1: { - packet.writeD(0x04); + packet.writeD(4); break; } case 2: { - packet.writeD(0x03); + packet.writeD(3); break; } case 3: { - packet.writeD(0x02); + packet.writeD(2); break; } case 4: { - packet.writeD(0x01); + packet.writeD(1); break; } } @@ -124,7 +123,7 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { for (int i = 0; i < _size; i++) { - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java index 8bb38fd28c..bc1e679418 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java @@ -41,8 +41,7 @@ public class ExShowManorDefaultInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_MANOR_DEFAULT_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" and "Crop Sales" buttons + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" and "Crop Sales" buttons packet.writeD(_crops.size()); for (Seed crop : _crops) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 1d3312d668..d03ce2a5fd 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -52,10 +52,8 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet); - packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java index cf38d18c1c..f41999329f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java @@ -34,7 +34,6 @@ public class ExShowQuestInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_INFO.writeId(packet); - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java index 70f31e318f..0fa64c401d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java @@ -37,7 +37,6 @@ public class ExShowQuestMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_MARK.writeId(packet); - packet.writeD(_questId); packet.writeD(_questState); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index ab85228caf..1a6ee00a10 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ExShowReceivedPostList implements IClientOutgoingPacket { - private final List _inbox; - private static final int MESSAGE_FEE = 100; private static final int MESSAGE_FEE_PER_SLOT = 1000; + private final List _inbox; + public ExShowReceivedPostList(int objectId) { _inbox = MailManager.getInstance().getInbox(objectId); @@ -45,7 +45,6 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { @@ -64,18 +63,18 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getSenderName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); + packet.writeD(msg.isUnread() ? 1 : 0); packet.writeD(((msg.getMailType() == MailType.COMMISSION_ITEM_SOLD) || (msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED)) ? 0 : 1); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(msg.isReturned() ? 0x01 : 0x00); - packet.writeD(0x00); // SysString in some case it seems + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(msg.isReturned() ? 1 : 0); + packet.writeD(0); // SysString in some case it seems } } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(MESSAGE_FEE); packet.writeD(MESSAGE_FEE_PER_SLOT); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java index 9679468789..deebb99c8f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java @@ -33,6 +33,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; */ public class ExShowScreenMessage implements IClientOutgoingPacket { + // Positions + public static final byte TOP_LEFT = 1; + public static final byte TOP_CENTER = 2; + public static final byte TOP_RIGHT = 3; + public static final byte MIDDLE_LEFT = 4; + public static final byte MIDDLE_CENTER = 5; + public static final byte MIDDLE_RIGHT = 6; + public static final byte BOTTOM_CENTER = 7; + public static final byte BOTTOM_RIGHT = 8; + private final int _type; private final int _sysMessageId; private final int _unk1; @@ -48,15 +58,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket private List _parameters; // Localisation related. private String _lang; - // Positions - public static final byte TOP_LEFT = 0x01; - public static final byte TOP_CENTER = 0x02; - public static final byte TOP_RIGHT = 0x03; - public static final byte MIDDLE_LEFT = 0x04; - public static final byte MIDDLE_CENTER = 0x05; - public static final byte MIDDLE_RIGHT = 0x06; - public static final byte BOTTOM_CENTER = 0x07; - public static final byte BOTTOM_RIGHT = 0x08; public void setLang(String lang) { @@ -265,7 +266,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SCREEN_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -284,9 +284,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(sml.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -308,9 +308,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -318,7 +318,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket } } } - packet.writeD(_type); packet.writeD(_sysMessageId); packet.writeD(_position); @@ -326,9 +325,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java index 29ab5d355f..6123b08991 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java @@ -37,7 +37,6 @@ public class ExShowSeedInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _seeds = (nextPeriod && !manor.isManorApproved()) ? null : manor.getSeedProduction(manorId, nextPeriod); } @@ -46,16 +45,14 @@ public class ExShowSeedInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown if (_seeds == null) { packet.writeD(0); return true; } - packet.writeD(_seeds.size()); for (SeedProduction seed : _seeds) { @@ -67,17 +64,17 @@ public class ExShowSeedInfo implements IClientOutgoingPacket if (s == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(s.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(s.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(s.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java index e628099700..eb6e686e10 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java @@ -32,13 +32,10 @@ public class ExShowSeedMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_MAP_INFO.writeId(packet); - packet.writeD(2); // seed count - // Seed of Destruction packet.writeD(1); // id 1? Grand Crusade packet.writeD(2770 + GraciaSeedsManager.getInstance().getSoDState()); // sys msg id - // Seed of Infinity packet.writeD(2); // id 2? Grand Crusade // Manager not implemented yet diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index c9bf485ee2..05c0401a7c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -62,10 +62,8 @@ public class ExShowSeedSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getSeedId()); // seed id diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 1994402da2..269bec5b97 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -47,7 +47,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _cropsItems.put(cropId, item); } } - for (CropProcure crop : CastleManorManager.getInstance().getCropProcure(_manorId, false)) { if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) @@ -61,7 +60,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_cropsItems.size()); // size for (Item item : _cropsItems.values()) @@ -70,9 +68,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket packet.writeD(item.getObjectId()); // Object id packet.writeD(item.getId()); // crop id packet.writeD(seed.getLevel()); // seed level - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(1)); // reward 1 id - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(2)); // reward 2 id if (_castleCrops.containsKey(item.getId())) { @@ -85,9 +83,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket else { packet.writeD(0xFFFFFFFF); // manor - packet.writeQ(0x00); // buy residual - packet.writeQ(0x00); // buy price - packet.writeC(0x00); // reward + packet.writeQ(0); // buy residual + packet.writeQ(0); // buy price + packet.writeC(0); // reward } packet.writeQ(item.getCount()); // my crops } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index db4bccc928..b61d5b2301 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -40,7 +40,6 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { @@ -50,17 +49,17 @@ public class ExShowSentPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getReceiverName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); - packet.writeD(0x01); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(msg.isUnread() ? 1 : 0); + packet.writeD(1); + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(0); } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java index 0e4e9fd2ef..0dca57f2f8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java @@ -48,7 +48,6 @@ public class ExShowTerritory implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TERRITORY.writeId(packet); - packet.writeD(_vertices.size()); packet.writeD(_minZ); packet.writeD(_maxZ); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java index 4e284f82c5..86e1009bbf 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java @@ -46,7 +46,6 @@ public class ExShowTrace implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TRACE.writeId(packet); - packet.writeH(0); // type broken in H5 packet.writeD(0); // time broken in H5 packet.writeH(_locations.size()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java index 3245767ed7..836a5c9624 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java @@ -44,7 +44,6 @@ public class ExShowUsm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_USM.writeId(packet); - packet.writeD(_videoId); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java index 4acdffa842..1f1a14c31b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java @@ -34,7 +34,6 @@ public class ExShowVariationCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_CANCEL_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java index 3a2298019e..9870424e26 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java @@ -35,7 +35,6 @@ public class ExShowVariationMakeWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_MAKE_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java index 169827bab3..86211c8d97 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java @@ -44,10 +44,9 @@ public class ExSpawnEmitter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SPAWN_EMITTER.writeId(packet); - packet.writeD(_npcObjectId); packet.writeD(_playerObjectId); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java index 620800c1c4..534549b4fe 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java @@ -36,7 +36,6 @@ public class ExStartScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_START_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java index 0bd990cf34..babac59129 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java index 0e2689d598..d3e67afe99 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipObjId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java index 44b064113f..f5b3e1340f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java @@ -36,7 +36,6 @@ public class ExStopScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index 8029930c9a..367ac79be4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -66,7 +66,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket } OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet); - packet.writeD(_inventory); packet.writeD(_warehouse); // packet.writeD(_freight); // Removed with 152. diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java index 3293a5b557..57563ca2f9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java @@ -39,7 +39,6 @@ public class ExSubPledgeSkillAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUB_PLEDGET_SKILL_ADD.writeId(packet); - packet.writeD(_type); packet.writeD(_skillId); packet.writeD(_skillLevel); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java index d61dfa20ab..816d6f16a6 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java @@ -97,7 +97,6 @@ public class ExSubjobInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUBJOB_INFO.writeId(packet); - packet.writeC(_type); packet.writeD(_currClassId); packet.writeD(_currRace); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java index 85616016c7..b7a152629d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java @@ -38,7 +38,6 @@ public class ExTacticalSign implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TACTICAL_SIGN.writeId(packet); - packet.writeD(_target.getObjectId()); packet.writeD(_tokenId); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java index 8a1f520529..397e185fdd 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java @@ -39,7 +39,6 @@ public class ExTeleportToLocationActivate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_TO_LOCATION_ACTIVATE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java index f860c2a40f..aab66c2e48 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExTryEnchantArtifactResult.java @@ -44,7 +44,6 @@ public class ExTryEnchantArtifactResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TRY_ENCHANT_ARTIFACT_RESULT.writeId(packet); - packet.writeD(_state); packet.writeD(_enchant); packet.writeD(0); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java index a214c53a0f..7bcddd964d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java @@ -27,6 +27,7 @@ public class ExUISetting implements IClientOutgoingPacket { public static final String UI_KEY_MAPPING_VAR = "UI_KEY_MAPPING"; public static final String SPLIT_VAR = " "; + private final byte[] _uiKeyMapping; public ExUISetting(Player player) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java index 187770cfc8..eff4285a8b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java @@ -37,7 +37,6 @@ public class ExUnReadMailCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_UN_READ_MAIL_COUNT.writeId(packet); - packet.writeD(_mailUnreadCount); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java index f992b3c937..e59c651371 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java @@ -41,7 +41,6 @@ public class ExUseSharedGroupItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USE_SHARED_GROUP_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeD(_grpId); packet.writeD(_remainingTime); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java index 66fa7d87db..97ceb8aa15 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java @@ -40,7 +40,6 @@ public class ExUserBoostStat implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_BOOST_STAT.writeId(packet); - int count = 0; int bonus = 0; switch (_type) @@ -68,7 +67,6 @@ public class ExUserBoostStat implements IClientOutgoingPacket count = 1; bonus = 100; } - if (bonus > 0) { count += (int) _player.getStat().getValue(Stat.VITALITY_SKILLS, 0); @@ -89,11 +87,9 @@ public class ExUserBoostStat implements IClientOutgoingPacket break; } } - packet.writeC(_type.getId()); packet.writeC(count); packet.writeH(bonus); - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java index 474fcc5208..f49d451587 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class ExUserInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getTransformationId()); - final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); final boolean isInvisible = _player.isInvisible(); packet.writeD(abnormalVisualEffects.size() + (isInvisible ? 1 : 0)); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java index b841449ab3..1069a64e3e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java @@ -36,12 +36,9 @@ public class ExUserInfoCubic implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_CUBIC.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(_player.getCubics().size()); - _player.getCubics().keySet().forEach(packet::writeH); - packet.writeD(_player.getAgathionId()); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java index 3e4afb995b..6ef31d6117 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java @@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExUserInfoEquipSlot extends AbstractMaskPacket { private final Player _player; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -66,11 +65,9 @@ public class ExUserInfoEquipSlot extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_EQUIP_SLOT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(InventorySlot.values().length); // 152 packet.writeB(_masks); - final PlayerInventory inventory = _player.getInventory(); for (InventorySlot slot : InventorySlot.values()) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java index 3eb1cf9578..d655e48843 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java @@ -36,7 +36,6 @@ public class ExUserInfoInvenWeight implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_INVEN_WEIGHT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java index 91e0e92338..16aa81e9c0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java @@ -44,7 +44,6 @@ public class ExValidateLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java index 727267c9d5..50cb4025e4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java @@ -35,7 +35,6 @@ public class ExVariationCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_CANCEL_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java index 5cdc1b8d0e..4fde190ae2 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java @@ -32,14 +32,13 @@ public class ExVariationResult implements IClientOutgoingPacket { _option1 = option1; _option2 = option2; - _success = success ? 0x01 : 0x00; + _success = success ? 1 : 0; } @Override public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_RESULT.writeId(packet); - packet.writeD(_option1); packet.writeD(_option2); packet.writeD(_success); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java index db0acfd5ff..60fb57c0b3 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java @@ -41,10 +41,9 @@ public class ExVitalityEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_EFFECT_INFO.writeId(packet); - packet.writeD(_points); packet.writeD(_vitalityBonus); // Vitality Bonus - packet.writeH(0x00); // Vitality additional bonus in % + packet.writeH(0); // Vitality additional bonus in % packet.writeH(_vitalityItemsRemaining); // How much vitality items remaining for use packet.writeH(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java index 3cd9d26602..9a401c2321 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java @@ -35,7 +35,6 @@ public class ExVitalityPointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_POINT_INFO.writeId(packet); - packet.writeD(_vitalityPoints); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java index 71baff96ea..c4c5539ca4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java @@ -45,7 +45,6 @@ public class ExVoteSystemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VOTE_SYSTEM_INFO.writeId(packet); - packet.writeD(_recomLeft); packet.writeD(_recomHave); packet.writeD(_bonusTime); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java index 21411f5abc..452b0dc43a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java @@ -37,7 +37,6 @@ public class ExWorldChatCnt implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_WORLD_CHAT_CNT.writeId(packet); - packet.writeD(_points); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java index 5f935fe0dc..dc9c2288f8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java @@ -79,19 +79,17 @@ public class FakePlayerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // vehicleId + packet.writeD(0); // vehicleId packet.writeD(_objId); packet.writeS(_npc.getName()); - packet.writeH(_npc.getRace().ordinal()); - packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 0x01 : 0x00); + packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 1 : 0); packet.writeD(_fpcHolder.getClassId()); - - packet.writeD(0x00); // Inventory.PAPERDOLL_UNDER + packet.writeD(0); // Inventory.PAPERDOLL_UNDER packet.writeD(_fpcHolder.getEquipHead()); packet.writeD(_fpcHolder.getEquipRHand()); packet.writeD(_fpcHolder.getEquipLHand()); @@ -103,28 +101,22 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_fpcHolder.getEquipRHand()); // dual hand packet.writeD(_fpcHolder.getEquipHair()); packet.writeD(_fpcHolder.getEquipHair2()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderAugument()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } - packet.writeC(_fpcHolder.getArmorEnchantLevel()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderVisualId()) { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeC(_npc.getScriptValue()); // getPvpFlag() packet.writeD(_npc.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -135,16 +127,12 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_npc.getCollisionRadius()); packet.writeF(_npc.getCollisionHeight()); - packet.writeD(_fpcHolder.getHair()); packet.writeD(_fpcHolder.getHairColor()); packet.writeD(_fpcHolder.getFace()); - packet.writeS(_npc.getTemplate().getTitle()); - if (_clan != null) { packet.writeD(_clan.getId()); @@ -154,71 +142,51 @@ public class FakePlayerInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - - packet.writeC(0x01); // isSitting() ? 0x00 : 0x01 (at some initial tests it worked) - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); - packet.writeC(_npc.isInCombat() ? 0x01 : 0x00); - - packet.writeC(_npc.isAlikeDead() ? 0x01 : 0x00); - - packet.writeC(_npc.isInvisible() ? 0x01 : 0x00); - - packet.writeC(0x00); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount - packet.writeC(0x00); // getPrivateStoreType().getId() - - packet.writeH(0x00); // getCubics().size() + packet.writeC(1); // isSitting() ? 0 : 1 (at some initial tests it worked) + packet.writeC(_npc.isRunning() ? 1 : 0); + packet.writeC(_npc.isInCombat() ? 1 : 0); + packet.writeC(_npc.isAlikeDead() ? 1 : 0); + packet.writeC(_npc.isInvisible() ? 1 : 0); + packet.writeC(0); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount + packet.writeC(0); // getPrivateStoreType().getId() + packet.writeH(0); // getCubics().size() // getCubics().keySet().forEach(packet::writeH); - packet.writeC(0x00); - + packet.writeC(0); packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : 0); packet.writeH(_fpcHolder.getRecommends()); - packet.writeD(0x00); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 - + packet.writeD(0); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 packet.writeD(_fpcHolder.getClassId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(_fpcHolder.getWeaponEnchantLevel()); // isMounted() ? 0 : _enchantLevel - packet.writeC(_npc.getTeam().getId()); - - packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0x00); + packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0); packet.writeC(_fpcHolder.getNobleLevel()); - packet.writeC(_fpcHolder.isHero() ? 0x01 : 0x00); - - packet.writeC(_fpcHolder.isFishing() ? 0x01 : 0x00); - + packet.writeC(_fpcHolder.isHero() ? 1 : 0); + packet.writeC(_fpcHolder.isFishing() ? 1 : 0); packet.writeD(_fpcHolder.getBaitLocationX()); packet.writeD(_fpcHolder.getBaitLocationY()); packet.writeD(_fpcHolder.getBaitLocationZ()); - packet.writeD(_fpcHolder.getNameColor()); - packet.writeD(_heading); - packet.writeC(_fpcHolder.getPledgeStatus()); - packet.writeH(0x00); // getPledgeType() - + packet.writeH(0); // getPledgeType() packet.writeD(_fpcHolder.getTitleColor()); - - packet.writeC(0x00); // isCursedWeaponEquipped - - packet.writeD(0x00); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 - packet.writeD(0x00); // getTransformationDisplayId() + packet.writeC(0); // isCursedWeaponEquipped + packet.writeD(0); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 + packet.writeD(0); // getTransformationDisplayId() packet.writeD(_fpcHolder.getAgathionId()); - - packet.writeC(0x00); - - packet.writeD(0x00); // getCurrentCp() + packet.writeC(0); + packet.writeD(0); // getCurrentCp() packet.writeD(_npc.getMaxHp()); packet.writeD((int) Math.round(_npc.getCurrentHp())); packet.writeD(_npc.getMaxMp()); packet.writeD((int) Math.round(_npc.getCurrentMp())); - - packet.writeC(0x00); + packet.writeC(0); final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) @@ -229,9 +197,9 @@ public class FakePlayerInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(0x00); // cocPlayer.getPosition() - packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 0x01 : 0x00); - packet.writeC(0x00); // Used Ability Points + packet.writeC(0); // cocPlayer.getPosition() + packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 1 : 0); + packet.writeC(0); // Used Ability Points return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java index ae088538da..03223c8a3e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java @@ -62,7 +62,6 @@ public class FlyToLocation implements IClientOutgoingPacket _destY = destY; _destZ = destZ; _type = type; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -82,7 +81,6 @@ public class FlyToLocation implements IClientOutgoingPacket _flySpeed = flySpeed; _flyDelay = flyDelay; _animationSpeed = animationSpeed; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -103,7 +101,6 @@ public class FlyToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FLY_TO_LOCATION.writeId(packet); - packet.writeD(_chaObjId); packet.writeD(_destX); packet.writeD(_destY); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java index 1e52b0ef72..471d70f791 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java @@ -35,8 +35,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x01); + packet.writeC(1); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index 81a384642c..fb7572fc5d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -50,7 +50,6 @@ public class GMHennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GMHENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON @@ -64,19 +63,19 @@ public class GMHennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(0x01); + packet.writeD(1); } if (_player.getHenna(4) != null) { packet.writeD(_player.getHenna(4).getDyeId()); - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(_player.getHenna(4).isAllowedClass(_player.getClassId()) ? 1 : 0); } else { - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid } return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java index 38ca4c7be0..59bf0d9d93 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java @@ -38,7 +38,6 @@ public class GMHide implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_HIDE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index a828a26584..117f9cf67d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -50,7 +50,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -79,28 +78,24 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); packet.writeD(_player.getPkKills()); - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollObjectId(slot)); } - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); } - for (int slot = 0; slot < 11; slot++) { final VariationInstance augment = _player.getInventory().getPaperdollAugmentation(slot); packet.writeD(augment != null ? augment.getOption1Id() : 0); // Confirmed packet.writeD(augment != null ? augment.getOption2Id() : 0); // Confirmed } - packet.writeC(_player.getInventory().getTalismanSlots()); // CT2.3 packet.writeC(_player.getInventory().canEquipCloak() ? 1 : 0); // CT2.3 - packet.writeD(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeH(0); packet.writeD(_player.getPAtk()); packet.writeD(_player.getPAtkSpd()); packet.writeD(_player.getPDef()); @@ -108,18 +103,14 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAccuracy()); packet.writeD(_player.getCriticalHit()); packet.writeD(_player.getMAtk()); - packet.writeD(_player.getMAtkSpd()); packet.writeD(_player.getPAtkSpd()); - packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicEvasionRate()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name packet.writeD(_player.getReputation()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -135,8 +126,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeD(_player.isGM() ? 0x01 : 0x00); // builder level - + packet.writeD(_player.isGM() ? 1 : 0); // builder level packet.writeS(_player.getTitle()); packet.writeD(_player.getClanId()); // pledge id packet.writeD(_player.getClanCrestId()); // pledge crest id @@ -146,26 +136,19 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeC(_player.getCreateItemLevel() > 0 ? 1 : 0); packet.writeD(_player.getPkKills()); packet.writeD(_player.getPvpKills()); - packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); - - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeC(321); - packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window - packet.writeC(_player.getNobleLevel()); - packet.writeC(_player.isHero() ? 0x01 : 0x00); - + packet.writeC(_player.isHero() ? 1 : 0); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); - final AttributeType attackAttribute = _player.getAttackElement(); packet.writeH(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); @@ -175,8 +158,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket } packet.writeD(_player.getFame()); packet.writeD(_player.getVitalityPoints()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index 1d88596096..552b6e6168 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -37,14 +37,12 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_player.getName()); packet.writeD(_clan.getId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); @@ -52,15 +50,14 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 packet.writeD(_clan.getAllyCrestId()); // c2 packet.writeD(_clan.isAtWar() ? 1 : 0); // c3 - packet.writeD(0x00); // T3 Unknown - + packet.writeD(0); // T3 Unknown packet.writeD(_clan.getMembers().size()); for (ClanMember member : _clan.getMembers()) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java index 93af10e254..3c155ff816 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -38,10 +38,8 @@ public class GMViewSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_SKILL_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_skills.size()); - final boolean isDisabled = (_player.getClan() != null) && (_player.getClan().getReputationScore() < 0); for (Skill skill : _skills) { @@ -49,7 +47,7 @@ public class GMViewSkillInfo implements IClientOutgoingPacket packet.writeH(skill.getDisplayLevel()); packet.writeH(skill.getSubLevel()); packet.writeD(skill.getDisplayId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(isDisabled && skill.isClanSkill() ? 1 : 0); packet.writeC(skill.isEnchantable() ? 1 : 0); } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index f49138fafe..c909d5e6e1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -51,7 +51,6 @@ public class GMViewWarehouseWithdrawList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_WAREHOUSE_WITHDRAW_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java index d8c273f914..449271993b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java @@ -35,7 +35,6 @@ public class GameGuardQuery implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GAME_GUARD_QUERY.writeId(packet); - packet.writeD(0x27533DD9); packet.writeD(0x2E72A51D); packet.writeD(0x2017038B); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index b0c011b696..037b2e6b6b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -35,10 +35,8 @@ public class GetItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ITEM.writeId(packet); - packet.writeD(_playerId); packet.writeD(_item.getObjectId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java index f8c6126c87..5f4d7bf3ca 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java @@ -50,7 +50,6 @@ public class GetOffVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_OFF_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_x); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java index ffa8d5f310..77d1e6ba28 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java @@ -45,7 +45,6 @@ public class GetOnVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ON_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java index e5dcb9ded6..b1f5b588f9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java @@ -44,14 +44,13 @@ public class GmViewQuestInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_QUEST_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeH(_questList.size()); // quest count - for (Quest quest : _questList) { final QuestState qs = _player.getQuestState(quest.getName()); packet.writeD(quest.getId()); packet.writeD(qs == null ? 0 : qs.getCond()); } - packet.writeH(0x00); // some size + packet.writeH(0); // some size // for size; ddQQ return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 395487097c..4309e2d74f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -51,7 +51,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeQ(_player.getAdena()); // activeChar current amount of Adena packet.writeD(3); // available equip slot packet.writeD(_hennaEquipList.size()); - for (Henna henna : _hennaEquipList) { // Player must have at least one dye in inventory @@ -62,8 +61,8 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); // item Id of the dye packet.writeQ(henna.getWearCount()); // amount of dyes required packet.writeQ(henna.getWearFee()); // amount of Adena required - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not - packet.writeD(0x00); // TODO: Find me! + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // meet the requirement or not + packet.writeD(0); // TODO: Find me! } } return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 30dc837721..b84d2283e8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -51,7 +51,6 @@ public class HennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON @@ -65,9 +64,8 @@ public class HennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); } - final Henna premium = _player.getHenna(4); if (premium != null) { @@ -77,16 +75,15 @@ public class HennaInfo implements IClientOutgoingPacket final long currentTime = Chronos.currentTimeMillis(); duration = (int) Math.max(0, _player.getVariables().getLong("HennaDuration4", currentTime) - currentTime) / 1000; } - packet.writeD(premium.getDyeId()); packet.writeD(duration); // Premium Slot Dye Time Left - packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(premium.isAllowedClass(_player.getClassId()) ? 1 : 0); } else { - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid } return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index cf3d83263f..5b77709720 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -40,12 +40,11 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_ITEM_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getWearCount()); // total amount of dye require packet.writeQ(_henna.getWearFee()); // total amount of Adena require to draw symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to draw or not 0 is false and 1 is true + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to draw or not 0 is false and 1 is true packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() + _player.getHennaValue(BaseStat.INT)); // equip INT @@ -63,7 +62,7 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket packet.writeH(_player.getLUC() + _player.getHennaValue(BaseStat.LUC)); // equip LUC packet.writeD(_player.getCHA()); // current CHA packet.writeH(_player.getCHA() + _player.getHennaValue(BaseStat.CHA)); // equip CHA - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index cb1379ac29..fc93d02a73 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -40,12 +40,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getCancelCount()); // total amount of dye require packet.writeQ(_henna.getCancelFee()); // total amount of Adena require to remove symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to remove or not + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to remove or not packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() - _player.getHennaValue(BaseStat.INT)); // equip INT @@ -63,7 +62,7 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket packet.writeH(_player.getLUC() - _player.getHennaValue(BaseStat.LUC)); // equip LUC packet.writeD(_player.getCHA()); // current CHA packet.writeH(_player.getCHA() - _player.getHennaValue(BaseStat.CHA)); // equip CHA - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 844fad86c7..452d354ac4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -39,7 +39,7 @@ public class HennaRemoveList implements IClientOutgoingPacket OutgoingPackets.HENNA_UNEQUIP_LIST.writeId(packet); packet.writeQ(_player.getAdena()); final boolean premiumSlotEnabled = _player.getHenna(4) != null; - packet.writeD(premiumSlotEnabled ? 0x04 : 0x03); // seems to be max size + packet.writeD(premiumSlotEnabled ? 4 : 3); // seems to be max size packet.writeD((premiumSlotEnabled ? 4 : 3) - _player.getHennaEmptySlots()); // slots used for (Henna henna : _player.getHennaList()) { @@ -49,8 +49,8 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); packet.writeQ(henna.getCancelCount()); packet.writeQ(henna.getCancelFee()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index b5c8628b50..f2a9cf1822 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -89,14 +89,12 @@ public interface IClientOutgoingPacket extends IOutgoingPacket Inventory.PAPERDOLL_ARTIFACT20, Inventory.PAPERDOLL_ARTIFACT21, }; - int[] PAPERDOLL_ORDER_AUGMENT = new int[] { Inventory.PAPERDOLL_RHAND, Inventory.PAPERDOLL_LHAND, Inventory.PAPERDOLL_RHAND }; - int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 0c54e810f0..3378827f34 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -46,7 +46,6 @@ public class InventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index c4598a72e6..cef69ecb6f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -59,8 +59,8 @@ public class ItemList extends AbstractItemPacket } else { - packet.writeC(0x01); // _showWindow ? 0x01 : 0x00 - packet.writeD(0x00); + packet.writeC(1); // _showWindow ? 1 : 0 + packet.writeD(0); packet.writeD(_items.size()); } writeInventoryBlock(packet, _player.getInventory()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java index b32b4df4a3..c3b9918230 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java @@ -32,9 +32,8 @@ public class JoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PARTY.writeId(packet); - packet.writeD(_response); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java index 65e06efeb7..f347f7efcd 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java @@ -32,7 +32,6 @@ public class JoinPledge implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PLEDGE.writeId(packet); - packet.writeD(_pledgeId); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index 96f6d7c34d..996622b9e9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -35,17 +35,16 @@ public class KeyPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VERSION_CHECK.writeId(packet); - packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok for (int i = 0; i < 8; i++) { packet.writeC(_key[i]); // key } - packet.writeD(0x01); + packet.writeD(1); packet.writeD(Config.SERVER_ID); // server id - packet.writeC(0x01); - packet.writeD(0x00); // obfuscation key - packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 0x01 : 0x00); // isClassic + packet.writeC(1); + packet.writeD(0); // obfuscation key + packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 1 : 0); // isClassic return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java index 484c10f0c4..62424fd03a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java @@ -40,7 +40,6 @@ public class L2FriendSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_SAY.writeId(packet); - packet.writeD(0); // ?? packet.writeS(_receiver); packet.writeS(_sender); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java index b875edb772..790d599b5b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java @@ -32,11 +32,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ListPartyWaiting implements IClientOutgoingPacket { + private static final int NUM_PER_PAGE = 64; + private final List _rooms = new LinkedList<>(); private final int _size; - private static final int NUM_PER_PAGE = 64; - public ListPartyWaiting(PartyMatchingRoomLevelType type, int location, int page, int requestorLevel) { final List rooms = MatchingRoomManager.getInstance().getPartyMathchingRooms(location, type, requestorLevel); @@ -57,7 +57,6 @@ public class ListPartyWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_PARTY_WATING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java index 4f8f9adc64..bb0ac61dbd 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java @@ -54,7 +54,6 @@ public class LoginFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LOGIN_FAIL.writeId(packet); - packet.writeD(_success); packet.writeD(_reason); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java index 18a522c315..6743e3e66f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java @@ -32,7 +32,6 @@ public class MagicSkillCanceld implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_CANCELED.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java index d56de10079..7ab29cc1a8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java @@ -66,7 +66,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // MagicSkillUse castingType packet.writeD(_objectId); packet.writeD(_skillId); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java index 1dbf929e1c..37ad6bd5cc 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java @@ -84,7 +84,6 @@ public class MagicSkillUse implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_USE.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // Casting bar type: 0 - default, 1 - default up, 2 - blue, 3 - green, 4 - red. packet.writeD(_creature.getObjectId()); packet.writeD(_target.getObjectId()); @@ -111,7 +110,7 @@ public class MagicSkillUse implements IClientOutgoingPacket packet.writeD(_target.getX()); packet.writeD(_target.getY()); packet.writeD(_target.getZ()); - packet.writeD(_actionId >= 0 ? 0x01 : 0x00); // 1 when ID from RequestActionUse is used + packet.writeD(_actionId >= 0 ? 1 : 0); // 1 when ID from RequestActionUse is used packet.writeD(_actionId >= 0 ? _actionId : 0); // ID from RequestActionUse. Used to set cooldown on summon skills. packet.writeD(-1); // 306 return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java index 6b710c692e..12e2488f24 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java @@ -37,11 +37,9 @@ public class ManagePledgePower implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet); - packet.writeD(_rank); packet.writeD(_action); packet.writeD(_clan.getRankPrivs(_rank).getBitmask()); - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 95f4b6f201..4e2ab3f00b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -42,11 +42,9 @@ public class MonRaceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MON_RACE_INFO.writeId(packet); - packet.writeD(_unknown1); packet.writeD(_unknown2); - packet.writeD(0x08); - + packet.writeD(8); for (int i = 0; i < 8; i++) { packet.writeD(_monsters[i].getObjectId()); // npcObjectID @@ -68,7 +66,7 @@ public class MonRaceInfo implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java index 0093b3edc9..e6386921ff 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java @@ -45,13 +45,10 @@ public class MoveToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_xDst); packet.writeD(_yDst); packet.writeD(_zDst); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java index b1fb3ea003..59103c6c4c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java @@ -48,7 +48,6 @@ public class MoveToLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java index 30ff3c96af..aa261f924f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java @@ -50,11 +50,9 @@ public class MoveToPawn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_PAWN.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetId); packet.writeD(_distance); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index 00d7618d34..f94917d93d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -58,18 +58,16 @@ public class MultiSellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.MULTI_SELL_LIST.writeId(packet); - - packet.writeC(0x00); // Helios + packet.writeC(0); // Helios packet.writeD(_list.getId()); // list id - packet.writeC(0x00); // GOD Unknown + packet.writeC(0); // GOD Unknown packet.writeD(1 + (_index / PAGE_SIZE)); // page started from 1 - packet.writeD(_finished ? 0x01 : 0x00); // finished + packet.writeD(_finished ? 1 : 0); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - packet.writeC(0x00); // Grand Crusade - packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window - packet.writeD(0x20); // Helios - Always 32 - + packet.writeC(0); // Grand Crusade + packet.writeC(_list.isChanceMultisell() ? 1 : 0); // new multisell window + packet.writeD(32); // Helios - Always 32 while (_size-- > 0) { ItemInfo itemEnchantment = _list.getItemEnchantment(_index); @@ -86,20 +84,16 @@ public class MultiSellList extends AbstractItemPacket } } } - packet.writeD(_index); // Entry ID. Start from 1. packet.writeC(entry.isStackable() ? 1 : 0); - // Those values will be passed down to MultiSellChoose packet. packet.writeH(itemEnchantment != null ? itemEnchantment.getEnchantLevel() : 0); // enchant level writeItemAugment(packet, itemEnchantment); writeItemElemental(packet, itemEnchantment); writeItemEnsoulOptions(packet, itemEnchantment); - packet.writeC(0x00); // 286 - + packet.writeC(0); // 286 packet.writeH(entry.getProducts().size()); packet.writeH(entry.getIngredients().size()); - for (ItemChanceHolder product : entry.getProducts()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(product.getId()); @@ -122,9 +116,8 @@ public class MultiSellList extends AbstractItemPacket writeItemAugment(packet, displayItemEnchantment); writeItemElemental(packet, displayItemEnchantment); writeItemEnsoulOptions(packet, displayItemEnchantment); - packet.writeC(0x00); // 286 + packet.writeC(0); // 286 } - for (ItemChanceHolder ingredient : entry.getIngredients()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(ingredient.getId()); @@ -144,7 +137,7 @@ public class MultiSellList extends AbstractItemPacket writeItemAugment(packet, displayItemEnchantment); writeItemElemental(packet, displayItemEnchantment); writeItemEnsoulOptions(packet, displayItemEnchantment); - packet.writeC(0x00); // 286 + packet.writeC(0); // 286 } } return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java index 6e85f5348c..cd46aac3aa 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java @@ -45,11 +45,10 @@ public class MyTargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MY_TARGET_SELECTED.writeId(packet); - - packet.writeD(0x01); // Grand Crusade + packet.writeD(1); // Grand Crusade packet.writeD(_objectId); packet.writeH(_color); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java index 1901ad1297..166c5c1e00 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java @@ -36,7 +36,6 @@ public class NewCharacterSuccess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NEW_CHARACTER_SUCCESS.writeId(packet); - packet.writeD(_chars.size()); for (PlayerTemplate chr : _chars) { @@ -44,31 +43,24 @@ public class NewCharacterSuccess implements IClientOutgoingPacket { continue; } - // TODO: Unhardcode these packet.writeD(chr.getRace().ordinal()); packet.writeD(chr.getClassId().getId()); - packet.writeD(99); packet.writeD(chr.getBaseSTR()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseDEX()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseCON()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseINT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseWIT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseMEN()); packet.writeD(1); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java index be1605f679..6061ea26ef 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java @@ -38,7 +38,6 @@ public class NicknameChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NICK_NAME_CHANGED.writeId(packet); - packet.writeD(_objectId); packet.writeS(_title); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index f9cd107e2c..3e4837b4a4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -54,24 +54,20 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public NpcHtmlMessage(int npcObjId, int itemId) { super(npcObjId); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } public NpcHtmlMessage(int npcObjId, int itemId, String html) { super(npcObjId, html); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } @@ -79,11 +75,10 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java index 931ce79a60..d657021cad 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java @@ -47,10 +47,8 @@ public class NpcInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -58,7 +56,6 @@ public class NpcInfo extends AbstractMaskPacket private int _clanId = 0; private int _statusMask = 0; private final Set _abnormalVisualEffects; - private String[] _localisation; public void setLang(String lang) @@ -101,112 +98,90 @@ public class NpcInfo extends AbstractMaskPacket { addComponentType(NpcInfoType.HEADING); } - if ((npc.getStat().getPAtkSpd() > 0) || (npc.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (npc.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((npc.getLeftHandItem() > 0) || (npc.getRightHandItem() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (npc.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (npc.getDisplayEffect() > 0) { addComponentType(NpcInfoType.DISPLAY_EFFECT); } - if (npc.isInsideZone(ZoneId.WATER) || npc.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (npc.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (npc.getCloneObjId() > 0) { addComponentType(NpcInfoType.CLONE); } - if (npc.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (npc.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (npc.getCurrentHp() <= npc.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (npc.getCurrentMp() <= npc.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (npc.getTemplate().isUsingServerSideName()) { addComponentType(NpcInfoType.NAME); } - if (npc.getTemplate().isUsingServerSideTitle() || (npc.isMonster() && (Config.SHOW_NPC_LEVEL || Config.SHOW_NPC_AGGRESSION)) || npc.isChampion() || npc.isTrap()) { addComponentType(NpcInfoType.TITLE); } - if (npc.getNameString() != null) { addComponentType(NpcInfoType.NAME_NPCSTRINGID); } - if (npc.getTitleString() != null) { addComponentType(NpcInfoType.TITLE_NPCSTRINGID); } - if (_npc.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (!_abnormalVisualEffects.isEmpty() || npc.isInvisible()) { addComponentType(NpcInfoType.ABNORMALS); } - if (npc.getEnchantEffect() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (npc.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (npc.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (npc.getClanId() > 0) { final Clan clan = ClanTable.getInstance().getClan(npc.getClanId()); @@ -220,14 +195,11 @@ public class NpcInfo extends AbstractMaskPacket addComponentType(NpcInfoType.CLAN); } } - addComponentType(NpcInfoType.COLOR_EFFECT); - if (npc.getPvpFlag() > 0) { addComponentType(NpcInfoType.PVP_FLAG); } - // TODO: Confirm me if (npc.isInCombat()) { @@ -245,8 +217,7 @@ public class NpcInfo extends AbstractMaskPacket { _statusMask |= 0x08; } - - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -296,27 +267,23 @@ public class NpcInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO.writeId(packet); - packet.writeD(_npc.getObjectId()); - packet.writeC(_npc.isShowSummonAnimation() ? 0x02 : 0x00); // // 0=teleported 1=default 2=summoned + packet.writeC(_npc.isShowSummonAnimation() ? 2 : 0); // // 0=teleported 1=default 2=summoned packet.writeH(38); // 338 - mask_bits_38 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 0x01 : 0x00); + packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0x00); + packet.writeQ(0); } if (containsMask(NpcInfoType.TITLE)) { String title = _npc.getTitle(); - // Localisation related. if ((_localisation != null) && !_localisation[1].equals("")) { @@ -329,10 +296,8 @@ public class NpcInfo extends AbstractMaskPacket title = title.replace(NpcData.getInstance().getTemplate(_npc.getId()).getTitle(), _localisation[1]); } } - packet.writeS(title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -351,7 +316,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -366,20 +331,20 @@ public class NpcInfo extends AbstractMaskPacket if (containsMask(NpcInfoType.EQUIPPED)) { packet.writeD(_npc.getRightHandItem()); - packet.writeD(0x00); // Armor id? + packet.writeD(0); // Armor id? packet.writeD(_npc.getLeftHandItem()); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_npc.isDead() ? 0x00 : 0x01); + packet.writeC(_npc.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); + packet.writeC(_npc.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 0x01 : _npc.isFlying() ? 0x02 : 0x00); + packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -391,7 +356,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_npc.isFlying() ? 0x01 : 0x00); + packet.writeD(_npc.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { @@ -427,12 +392,12 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(0x00); // 2 - do some animation on spawn + packet.writeC(0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -464,12 +429,10 @@ public class NpcInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java index c95a8e5274..923e9cebad 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class NpcInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_npc.getObjectId()); packet.writeD(_npc.getTransformationDisplayId()); - final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size()); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java index a294edc57a..2a0ba41eeb 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java @@ -38,7 +38,6 @@ public class NpcQuestHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NPC_QUEST_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_questId); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java index d3328ade97..fc6d0d4a3a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java @@ -106,7 +106,6 @@ public class NpcSay implements IClientOutgoingPacket { _parameters = new ArrayList<>(); } - for (String item : params) { if ((item != null) && (item.length() > 0)) @@ -127,11 +126,9 @@ public class NpcSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_SAY.writeId(packet); - packet.writeD(_objectId); packet.writeD(_textType.getClientId()); packet.writeD(_npcId); - // Localisation related. if (_lang != null) { @@ -147,7 +144,6 @@ public class NpcSay implements IClientOutgoingPacket } } } - packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java index 356e3f48a9..ac61f9d247 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java @@ -33,11 +33,10 @@ public class ObservationMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_START.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me packet.writeD(0xc0); // TODO: Find me return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java index 5c0a0766b3..896ccea02b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java @@ -33,7 +33,6 @@ public class ObservationReturn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_END.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java index c2f7ab404f..173772c870 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java @@ -37,7 +37,6 @@ public class OnEventTrigger implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EVENT_TRIGGER.writeId(packet); - packet.writeD(_emitterId); packet.writeC(_enabled); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index fbb5c84dfe..37d4fea9cf 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -45,7 +45,6 @@ public class PackageSendableList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java index a53f589386..e24d63f717 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java @@ -39,7 +39,6 @@ public class PackageToList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_TO_LIST.writeId(packet); - packet.writeD(_players.size()); for (Entry entry : _players.entrySet()) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 655c7abcd1..44b23b37f4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -55,7 +55,6 @@ public class PartyMemberPosition implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); - packet.writeD(locations.size()); for (Entry entry : locations.entrySet()) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java index 9e275ec246..c9d3595037 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java @@ -36,7 +36,6 @@ public class PartyRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java index 2233054c14..76c4555d3b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java @@ -36,12 +36,10 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ADD.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); // c3 packet.writeD(_party.getDistributionType().getId()); // c3 packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); - packet.writeD((int) _member.getCurrentCp()); // c4 packet.writeD(_member.getMaxCp()); // c4 packet.writeD((int) _member.getCurrentHp()); @@ -51,9 +49,9 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket packet.writeD(_member.getVitalityPoints()); packet.writeC(_member.getLevel()); packet.writeH(_member.getClassId().getId()); - packet.writeC(0x00); + packet.writeC(0); packet.writeH(_member.getRace().ordinal()); - packet.writeD(0x00); // 228 + packet.writeD(0); // 228 return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java index e806018375..3a47801de1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java @@ -37,21 +37,17 @@ public class PartySmallWindowAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ALL.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); packet.writeC(_party.getDistributionType().getId()); packet.writeC(_party.getMemberCount() - 1); - for (Player member : _party.getMembers()) { if ((member != null) && (member != _exclude)) { packet.writeD(member.getObjectId()); packet.writeS(member.getName()); - packet.writeD((int) member.getCurrentCp()); // c4 packet.writeD(member.getMaxCp()); // c4 - packet.writeD((int) member.getCurrentHp()); packet.writeD(member.getMaxHp()); packet.writeD((int) member.getCurrentMp()); @@ -59,10 +55,9 @@ public class PartySmallWindowAll implements IClientOutgoingPacket packet.writeD(member.getVitalityPoints()); packet.writeC(member.getLevel()); packet.writeH(member.getClassId().getId()); - packet.writeC(0x01); // Unk + packet.writeC(1); // Unk packet.writeH(member.getRace().ordinal()); - packet.writeD(0x00); // 228 - + packet.writeD(0); // 228 final Summon pet = member.getPet(); packet.writeD(member.getServitors().size() + (pet != null ? 1 : 0)); // Summon size, one only atm if (pet != null) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java index 94a8a5a2ce..09ce132af4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java @@ -33,7 +33,6 @@ public class PartySmallWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_DELETE.writeId(packet); - packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java index c53c6c7779..e9ea2efbbe 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java @@ -42,7 +42,6 @@ public class PartySmallWindowUpdate extends AbstractMaskPacket _summon.getStat().getExp()) { packet.writeQ(_summon.getStat().getExp()); // 0% absolute value @@ -160,11 +148,8 @@ public class PetInfo implements IClientOutgoingPacket { packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value } - packet.writeQ(_summon.getExpForNextLevel()); // 100% absoulte value - - packet.writeC(0x00); // 286 - + packet.writeC(0); // 286 packet.writeD(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight packet.writeD(_summon.getMaxLoad()); // max weight it can carry packet.writeD(_summon.getPAtk()); // patk @@ -180,25 +165,20 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD((int) _summon.getStat().getMoveSpeed()); // speed packet.writeD(_summon.getPAtkSpd()); // atkspeed packet.writeD(_summon.getMAtkSpd()); // casting speed - packet.writeC(0); // TODO: Check me, might be ride status packet.writeC(_summon.getTeam().getId()); // Confirmed packet.writeC(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed packet.writeC(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed - - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. - + packet.writeD(0); // TODO: Find me + packet.writeD(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. packet.writeC(_summon.getOwner().getSummonPoints()); // Used Summon Points packet.writeC(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points - final Set aves = _summon.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeH(aves.size()); // Confirmed for (AbnormalVisualEffect ave : aves) { packet.writeH(ave.getClientId()); // Confirmed } - packet.writeC(_statusMask); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 5b43daa74b..1f60ec39d1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -46,7 +46,6 @@ public class PetInventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.PET_INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index e4cf35779f..16dc83b7ed 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -35,7 +35,6 @@ public class PetItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java index fdb00ddbb1..913f65d470 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java @@ -38,7 +38,6 @@ public class PetStatusShow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_SHOW.writeId(packet); - packet.writeD(_summonType); packet.writeD(_summonObjectId); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 25c2c74292..823a8c405a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -52,7 +52,6 @@ public class PetStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_UPDATE.writeId(packet); - packet.writeD(_summon.getSummonType()); packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getX()); @@ -69,7 +68,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket packet.writeQ(_summon.getStat().getExp()); packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value packet.writeQ(_summon.getExpForNextLevel()); // 100% absolute value - packet.writeD(0x01); // TODO: Find me! + packet.writeD(1); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java index 4bc3570779..0898b01f67 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java @@ -63,7 +63,6 @@ public class PlaySound implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLAY_SOUND.writeId(packet); - packet.writeD(_unknown1); // unknown 0 for quest and ship; packet.writeS(_soundFile); packet.writeD(_unknown3); // unknown 0 for quest; 1 for ship; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java index aa11b1213e..6805f64d7c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java @@ -34,7 +34,6 @@ public class PledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_INFO.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getId()); packet.writeS(_clan.getName()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java index 7ae6a0d284..b28dbf33c3 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java @@ -36,7 +36,6 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_MEMBER_INFO.writeId(packet); - packet.writeD(_member.getPledgeType()); packet.writeS(_member.getName()); packet.writeS(_member.getTitle()); // title diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java index eefd482979..6aa5067c8f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java @@ -36,7 +36,6 @@ public class PledgeReceivePowerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_POWER_INFO.writeId(packet); - packet.writeD(_member.getPowerGrade()); // power grade packet.writeS(_member.getName()); packet.writeD(_member.getClan().getRankPrivs(_member.getPowerGrade()).getBitmask()); // privileges diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 79d478aff9..f9387ea1d8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -40,8 +40,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_SUB_PLEDGE_CREATED.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); packet.writeD(_subPledge.getId()); packet.writeS(_subPledge.getName()); packet.writeS(getLeaderName()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java index 4d0efeb82a..7649947064 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java @@ -43,7 +43,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(packet); - packet.writeD(_tab); // page packet.writeD(_clanList.size()); for (ClanWar clanWar : _clanList) @@ -53,7 +52,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket { continue; } - packet.writeS(clan.getName()); packet.writeD(clanWar.getState().ordinal()); // type: 0 = Declaration, 1 = Blood Declaration, 2 = In War, 3 = Victory, 4 = Defeat, 5 = Tie, 6 = Error packet.writeD(clanWar.getRemainingTime()); // Time if friends to start remaining diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java index 2cbbdbf046..80d10fcb66 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java @@ -34,26 +34,25 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_INFO_UPDATE.writeId(packet); - // sending empty data so client will ask all the info in response ;) packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getLevel()); // clan level packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); // castle state ? + packet.writeD(0); // castle state ? packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); // clan reputation score - packet.writeD(0x00); // ? - packet.writeD(0x00); // ? + packet.writeD(0); // ? + packet.writeD(0); // ? packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); // c5 packet.writeD(_clan.getAllyCrestId()); // c5 packet.writeD(_clan.isAtWar() ? 1 : 0); // c5 - packet.writeD(0x00); // TODO: Find me! - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java index ae26e50dbb..2fa9f26d4a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java @@ -51,12 +51,11 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ADD.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); - packet.writeD(0x00); - packet.writeD(0x01); + packet.writeD(0); + packet.writeD(1); packet.writeD(_isOnline); // 1 = online 0 = offline packet.writeD(_pledgeType); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index 971d88c53d..8880e7853d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -57,30 +57,27 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(packet); - - packet.writeD(0x00); // _isSubPledge + packet.writeD(0); // _isSubPledge packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_name); packet.writeS(_leaderName); - packet.writeD(_clan.getCrestId()); // crest id .. is used again packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); // 0 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(0); // 0 packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.isAtWar() ? 1 : 0); // new c3 - packet.writeD(0x00); // Territory castle ID - + packet.writeD(0); // Territory castle ID packet.writeD(_members.size()); for (ClanMember m : _members) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java index 0fd387e419..154bcc610d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java @@ -32,7 +32,6 @@ public class PledgeShowMemberListDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_DELETE.writeId(packet); - packet.writeS(_player); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java index 9789e1e951..beefd2b6bd 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java @@ -50,7 +50,6 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index 4e89797e45..09f70ea024 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -62,14 +62,14 @@ public class PledgeSkillList implements IClientOutgoingPacket { packet.writeD(sk.getDisplayId()); packet.writeH(sk.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } for (SubPledgeSkill sk : _subSkills) { packet.writeD(sk._subType); // Clan Sub-unit types packet.writeD(sk._skillId); packet.writeH(sk._skillLevel); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java index f3b8d4c26c..a94601294f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java @@ -37,7 +37,6 @@ public class PledgeSkillListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST_ADD.writeId(packet); - packet.writeD(_id); packet.writeD(_level); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java index 9e1b4843ac..5f32f2bf54 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java @@ -33,15 +33,14 @@ public class PledgeStatusChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_STATUS_CHANGED.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getLeaderId()); packet.writeD(_clan.getId()); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getAllyId()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.getCrestLargeId()); - packet.writeD(0x00); // pledge type ? + packet.writeD(0); // pledge type ? return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java index 5b56d0b28d..41d0f9f7d8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java @@ -44,12 +44,10 @@ public class PrivateStoreListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_LIST.writeId(packet); - packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); // Viewer's item count? + packet.writeD(0); // Viewer's item count? packet.writeD(_items.size()); - int slotNumber = 0; for (TradeItem item : _items) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 67b6ba8d94..d72050283e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -43,11 +43,10 @@ public class PrivateStoreListSell extends AbstractItemPacket else { OutgoingPackets.PRIVATE_STORE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index d05590cbde..df056c2e43 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -60,13 +60,13 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket { packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); + packet.writeD(0); for (Item item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item2 : _buyList) { writeItem(packet, item2); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index d8768104a4..6bbabb282b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -63,13 +63,13 @@ public class PrivateStoreManageListSell extends AbstractItemPacket packet.writeD(_objId); packet.writeD(_packageSale ? 1 : 0); packet.writeQ(_playerAdena); - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item2 : _sellList) { writeItem(packet, item2); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java index 8a5b9eef92..0d7bcbea16 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgBuy implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java index b00bd2add2..8fdb5701b8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgSell implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PvpBookList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PvpBookList.java index ac5e01a6a3..5d84e6471a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PvpBookList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PvpBookList.java @@ -32,7 +32,6 @@ public class PvpBookList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PVPBOOK_LIST.writeId(packet); - final int size = 1; packet.writeD(4); // show killer's location count packet.writeD(5); // teleport count diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java index c3958367e8..5ddaa46ba0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java @@ -40,7 +40,6 @@ public class RadarControl implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RADAR_CONTROL.writeId(packet); - packet.writeD(_showRadar); packet.writeD(_type); // maybe type packet.writeD(_x); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java index c7e4525bf2..bcfd911f58 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java @@ -40,10 +40,8 @@ public class RecipeBookItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_BOOK_ITEM_LIST.writeId(packet); - - packet.writeD(_isDwarvenCraft ? 0x00 : 0x01); // 0 = Dwarven - 1 = Common + packet.writeD(_isDwarvenCraft ? 0 : 1); // 0 = Dwarven - 1 = Common packet.writeD(_maxMp); - if (_recipes == null) { packet.writeD(0); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index d9c2621c84..a4e4641944 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -78,7 +78,6 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeQ(_offeringMaximumAdena); // Adena worth of items for maximum offering. return true; } - PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java index a24ba356ef..ab67f9bff3 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java @@ -50,7 +50,6 @@ public class RecipeShopItemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_ITEM_INFO.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD(_recipeId); packet.writeD((int) _manufacturer.getCurrentMp()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java index aac30faf53..ec67224b1e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java @@ -57,11 +57,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MANAGE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD((int) _seller.getAdena()); - packet.writeD(_isDwarven ? 0x00 : 0x01); - + packet.writeD(_isDwarven ? 0 : 1); if ((_recipes == null) || _recipes.isEmpty()) { packet.writeD(0); @@ -69,7 +67,6 @@ public class RecipeShopManageList implements IClientOutgoingPacket else { packet.writeD(_recipes.size()); // number of items in recipe book - int i = 1; for (RecipeHolder recipe : _recipes) { @@ -77,10 +74,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket packet.writeD(i++); } } - if ((_manufacture == null) || _manufacture.isEmpty()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -88,7 +84,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket for (Entry item : _manufacture) { packet.writeD(item.getKey()); - packet.writeD(0x00); // CanCraft? + packet.writeD(0); // CanCraft? packet.writeQ(item.getValue()); } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java index c025b5e4ed..2b9bc5b6e7 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java @@ -33,7 +33,6 @@ public class RecipeShopMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MSG.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeS(_player.getStoreName()); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java index 07ba331de9..8f504ce103 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java @@ -37,14 +37,13 @@ public class RecipeShopSellList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_SELL_LIST.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD((int) _manufacturer.getCurrentMp()); // Creator's MP packet.writeD(_manufacturer.getMaxMp()); // Creator's MP packet.writeQ(_buyer.getAdena()); // Buyer Adena if (!_manufacturer.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -52,7 +51,7 @@ public class RecipeShopSellList implements IClientOutgoingPacket for (Entry item : _manufacturer.getManufactureItems().entrySet()) { packet.writeD(item.getKey()); - packet.writeD(0x00); // CanCreate? + packet.writeD(0); // CanCreate? packet.writeQ(item.getValue()); } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 1f19ffc899..393947e0bd 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -88,7 +88,6 @@ public class RelationChanged implements IClientOutgoingPacket { return; } - final Relation r = new Relation(); r._objId = activeChar.getObjectId(); r._relation = relation; @@ -102,7 +101,6 @@ public class RelationChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RELATION_CHANGED.writeId(packet); - packet.writeC(_mask); if (_multi == null) { @@ -122,7 +120,6 @@ public class RelationChanged implements IClientOutgoingPacket private void writeRelation(PacketWriter packet, Relation relation) { packet.writeD(relation._objId); - if ((_mask & SEND_DEFAULT) != SEND_DEFAULT) { packet.writeQ(relation._relation); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java index b4e9dc25c5..4477cfb705 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java @@ -35,7 +35,6 @@ public class RequestEnchant implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java index 4ef15fb74c..7a0a6cbe58 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java @@ -33,7 +33,6 @@ public class Revive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.REVIVE.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java index 9c409601e3..b9ddf7733f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java @@ -42,7 +42,6 @@ public class Ride implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RIDE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_mounted); packet.writeD(_rideType); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 813ce03f4d..13ef62f55f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -49,11 +49,9 @@ public class SellListProcure implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SELL_LIST_PROCURE.writeId(packet); - packet.writeQ(_money); // money - packet.writeD(0x00); // lease ? + packet.writeD(0); // lease ? packet.writeH(_sellList.size()); // list size - for (Entry entry : _sellList.entrySet()) { final Item item = entry.getKey(); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java index baa37a8507..75b5b07854 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java @@ -39,12 +39,10 @@ public class SendMacroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MACRO_LIST.writeId(packet); - packet.writeC(_updateType.getId()); - packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0x00); // modified, created or deleted macro's id + packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0); // modified, created or deleted macro's id packet.writeC(_count); // count of Macros packet.writeC(_macro != null ? 1 : 0); // unknown - if ((_macro != null) && (_updateType != MacroUpdateType.DELETE)) { packet.writeD(_macro.getId()); // Macro ID @@ -52,9 +50,7 @@ public class SendMacroList implements IClientOutgoingPacket packet.writeS(_macro.getDescr()); // Desc packet.writeS(_macro.getAcronym()); // acronym packet.writeD(_macro.getIcon()); // icon - packet.writeC(_macro.getCommands().size()); // count - int i = 1; for (MacroCmd cmd : _macro.getCommands()) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java index 47fada25be..21622b5f19 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java @@ -32,7 +32,6 @@ public class SendTradeRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_REQUEST.writeId(packet); - packet.writeD(_senderId); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java index 69aa749406..1513a0e3d1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java @@ -55,7 +55,6 @@ public class ServerObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SERVER_OBJECT_INFO.writeId(packet); - packet.writeD(_activeChar.getObjectId()); packet.writeD(_displayId + 1000000); packet.writeS(_name); // name @@ -70,8 +69,8 @@ public class ServerObjectInfo implements IClientOutgoingPacket packet.writeF(_collisionHeight); packet.writeD((int) (_isAttackable ? _activeChar.getCurrentHp() : 0)); packet.writeD(_isAttackable ? _activeChar.getMaxHp() : 0); - packet.writeD(0x01); // object type - packet.writeD(0x00); // special effects + packet.writeD(1); // object type + packet.writeD(0); // special effects return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java index 88b370ad8b..0164e5c4a2 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java @@ -34,7 +34,6 @@ public class SetSummonRemainTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SET_SUMMON_REMAIN_TIME.writeId(packet); - packet.writeD(_maxTime); packet.writeD(_remainingTime); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java index db28b72acf..016f5a0c9a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java @@ -38,7 +38,6 @@ public class ShopPreviewInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_INFO.writeId(packet); - packet.writeD(Inventory.PAPERDOLL_TOTALSLOTS); // Slots packet.writeD(getFromList(Inventory.PAPERDOLL_UNDER)); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index 358ee2361b..3e7efda220 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -49,11 +49,9 @@ public class ShopPreviewList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_LIST.writeId(packet); - packet.writeD(5056); packet.writeQ(_money); // current money packet.writeD(_listId); - int newlength = 0; for (Product product : _list) { @@ -63,23 +61,20 @@ public class ShopPreviewList implements IClientOutgoingPacket } } packet.writeH(newlength); - for (Product product : _list) { if (product.getItem().isEquipable()) { packet.writeD(product.getItemId()); packet.writeH(product.getItem().getType2()); // item type2 - if (product.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { packet.writeQ(product.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } else { - packet.writeQ(0x00); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand + packet.writeQ(0); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } - packet.writeQ(Config.WEAR_PRICE); } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 298301ed0d..b13080ff28 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -40,7 +40,6 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_BUFF_STATUS_UPDATE.writeId(packet); - packet.writeD(_skillId); packet.writeH(_skillLevel); packet.writeH(_skillSubLevel); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index 33d36611b8..be5e1fadab 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -33,7 +33,6 @@ public class ShortCutInit implements IClientOutgoingPacket { return; } - _shortCuts = player.getAllShortCuts(); } @@ -41,26 +40,23 @@ public class ShortCutInit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); packet.writeD(sc.getSlot() + (sc.getPage() * 12)); - - packet.writeC(0x00); // 228 - + packet.writeC(0); // 228 switch (sc.getType()) { case ITEM: { packet.writeD(sc.getId()); - packet.writeD(0x01); // Enabled or not + packet.writeD(1); // Enabled or not packet.writeD(sc.getSharedReuseGroup()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeQ(0x00); // Augment id - packet.writeD(0x00); // Visual id + packet.writeD(0); + packet.writeD(0); + packet.writeQ(0); // Augment id + packet.writeD(0); // Visual id break; } case SKILL: @@ -69,8 +65,8 @@ public class ShortCutInit implements IClientOutgoingPacket packet.writeH(sc.getLevel()); packet.writeH(sc.getSubLevel()); packet.writeD(sc.getSharedReuseGroup()); - packet.writeC(0x00); // C5 - packet.writeD(0x01); // C6 + packet.writeC(0); // C5 + packet.writeD(1); // C6 break; } case ACTION: @@ -79,7 +75,7 @@ public class ShortCutInit implements IClientOutgoingPacket case BOOKMARK: { packet.writeD(sc.getId()); - packet.writeD(0x01); // C6 + packet.writeD(1); // C6 } } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java index 7f584f966f..f85ada83c7 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java @@ -37,12 +37,9 @@ public class ShortCutRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_REGISTER.writeId(packet); - packet.writeD(_shortcut.getType().ordinal()); packet.writeD(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client - - packet.writeC(0x00); // 228 - + packet.writeC(0); // 228 switch (_shortcut.getType()) { case ITEM: @@ -50,10 +47,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeD(_shortcut.getId()); packet.writeD(_shortcut.getCharacterType()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeD(0x00); // unknown - packet.writeD(0x00); // unknown - packet.writeD(0x00); // item augment id - packet.writeD(0x00); // TODO: Find me, item visual id ? + packet.writeD(0); // unknown + packet.writeD(0); // unknown + packet.writeD(0); // item augment id + packet.writeD(0); // TODO: Find me, item visual id ? break; } case SKILL: @@ -62,10 +59,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeH(_shortcut.getLevel()); packet.writeH(_shortcut.getSubLevel()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeC(0x00); // C5 + packet.writeC(0); // C5 packet.writeD(_shortcut.getCharacterType()); - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me + packet.writeD(0); // TODO: Find me break; } case ACTION: diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java index d6f71b5f70..cfae3b3fad 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java @@ -54,7 +54,6 @@ public class ShowBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - packet.writeC(_showBoard); // c4 1 to show community 00 to hide packet.writeS("bypass _bbshome"); // top packet.writeS("bypass _bbsgetfav"); // favorite diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java index 4b62a7001b..4d62e99d7a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java @@ -32,7 +32,6 @@ public class ShowCalculator implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_CALC.writeId(packet); - packet.writeD(_calculatorId); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java index 55f58d5375..4574762467 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java @@ -32,9 +32,8 @@ public class ShowMiniMap implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_MINIMAP.writeId(packet); - packet.writeD(_mapId); - packet.writeC(0x00); // Seven Signs state + packet.writeC(0); // Seven Signs state return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java index 303eab4e8a..97100d09d2 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java @@ -34,7 +34,6 @@ public class ShowPCCafeCouponShowUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_PCCAFE_COUPON_SHOW_UI.writeId(packet); - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java index d86958e586..0a0f3ae861 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java @@ -35,7 +35,6 @@ public class ShowXMasSeal implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_XMAS_SEAL.writeId(packet); - packet.writeD(_item); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java index 66eccc7fbf..1baa030c4d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java @@ -28,9 +28,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = ca
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Attackers Clans?
* d = Number of Attackers Clans
* { //repeats
@@ -58,11 +58,10 @@ public class SiegeAttackerList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _castle.getSiege().getAttackerClans().size(); if (size > 0) { @@ -76,12 +75,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -90,8 +88,8 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index 5d5c831f14..8afd1f38ce 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -29,9 +29,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = 0xcb
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Defending Clans?
* d = Number of Defending Clans
* { //repeats
@@ -60,16 +60,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // Unknown - packet.writeD(0x01); // Unknown - packet.writeD(0x00); // Unknown - + packet.writeD(0); // Unknown + packet.writeD(1); // Unknown + packet.writeD(0); // Unknown final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0); packet.writeD(size); packet.writeD(size); - // Add owners final Clan ownerClan = _castle.getOwner(); if (ownerClan != null) @@ -78,14 +75,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket packet.writeS(ownerClan.getName()); packet.writeS(ownerClan.getLeaderName()); packet.writeD(ownerClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.OWNER.ordinal()); packet.writeD(ownerClan.getAllyId()); packet.writeS(ownerClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(ownerClan.getAllyCrestId()); } - // List of confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans()) { @@ -94,19 +90,17 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(defendingClan.getAllyCrestId()); } - // List of not confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans()) { @@ -115,12 +109,11 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER_PENDING.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 0a3fe46cb7..dfeefdaecf 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -59,13 +59,11 @@ public class SiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_INFO.writeId(packet); - if (_castle != null) { packet.writeD(_castle.getResidenceId()); - final int ownerId = _castle.getOwnerId(); - packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 0x01 : 0x00); + packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0); packet.writeD(ownerId); if (ownerId > 0) { @@ -89,7 +87,6 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { @@ -97,7 +94,7 @@ public class SiegeInfo implements IClientOutgoingPacket cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis()); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(Config.SIEGE_HOUR_LIST.size()); for (int hour : Config.SIEGE_HOUR_LIST) { @@ -108,7 +105,7 @@ public class SiegeInfo implements IClientOutgoingPacket else { packet.writeD((int) (_castle.getSiegeDate().getTimeInMillis() / 1000)); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index d11b3817c0..3c4c475339 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -51,12 +51,11 @@ public class SkillCoolTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SKILL_COOL_TIME.writeId(packet); - packet.writeD(_skillReuseTimeStamps.size()); for (TimeStamp ts : _skillReuseTimeStamps) { packet.writeD(ts.getSkillId()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD((int) ts.getReuse() / 1000); packet.writeD((int) Math.max(ts.getStamp() - _currentTime, 0) / 1000); } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index de54232b51..ed4615c403 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -41,10 +41,9 @@ public class Snoop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SNOOP.writeId(packet); - packet.writeD(_convoId); packet.writeS(_name); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_type.getClientId()); packet.writeS(_speaker); packet.writeS(_msg); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java index 37827bdf6c..52f15519a5 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java @@ -37,10 +37,9 @@ public class SocialAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SOCIAL_ACTION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_actionId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index fd7e43a153..19066f5f85 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -33,16 +33,15 @@ public class SpawnItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPAWN_ITEM.writeId(packet); - packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeD(_item.isStackable() ? 0x01 : 0x00); + packet.writeD(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java index ccae75b850..04f3ad716c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java @@ -110,7 +110,6 @@ public class SpecialCamera implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPECIAL_CAMERA.writeId(packet); - packet.writeD(_id); packet.writeD(_force); packet.writeD(_angle1); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java index cdd3821740..281756e793 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java @@ -34,7 +34,6 @@ public class StartPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_PLEDGE_WAR.writeId(packet); - packet.writeS(_playerName); packet.writeS(_pledgeName); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java index 48b4238eea..27fb4f606b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java @@ -38,7 +38,6 @@ public class StartRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_side); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java index b4f421df36..067bdeb082 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java @@ -72,7 +72,6 @@ public class StaticObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATIC_OBJECT.writeId(packet); - packet.writeD(_staticObjectId); packet.writeD(_objectId); packet.writeD(_type); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index 928b54aa48..40836e4af8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -46,7 +46,6 @@ public class StatusUpdate implements IClientOutgoingPacket public void addUpdate(StatusUpdateType type, int level) { _updates.put(type, level); - if (_isPlayable) { switch (type) @@ -75,10 +74,9 @@ public class StatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATUS_UPDATE.writeId(packet); - packet.writeD(_objectId); // casterId - packet.writeD(_isVisible ? _casterObjectId : 0x00); - packet.writeC(_isVisible ? 0x01 : 0x00); + packet.writeD(_isVisible ? _casterObjectId : 0); + packet.writeC(_isVisible ? 1 : 0); packet.writeC(_updates.size()); for (Entry entry : _updates.entrySet()) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java index 9919307366..cf2b71df5a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java @@ -53,7 +53,6 @@ public class StopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java index 50fdc3fe4c..78fdb5d70c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java @@ -43,7 +43,6 @@ public class StopMoveInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java index 9c828c3962..b254cad8b1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java @@ -34,7 +34,6 @@ public class StopPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java index b0392de226..ca69cd5346 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java @@ -36,7 +36,6 @@ public class StopRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FINISH_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_speed); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index 4b332d0467..377301825d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -43,10 +43,8 @@ public class SummonInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class SummonInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class SummonInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,11 +154,9 @@ public class SummonInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - // Show red aura? - // if (_statusMask != 0) + // if (_statusMask != 0x00) // { // addComponentType(NpcInfoType.VISUAL_STATE); // } @@ -229,28 +206,24 @@ public class SummonInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.SUMMON_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0x00); + packet.writeQ(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -269,7 +242,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -285,19 +258,19 @@ public class SummonInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -309,20 +282,20 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -346,12 +319,12 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -381,12 +354,10 @@ public class SummonInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java index 864462f76f..6f88551204 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java @@ -34,7 +34,6 @@ public class SurrenderPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SURRENDER_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 746b2da3f7..b509d599db 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -161,7 +161,6 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } - _params[_paramIndex++] = param; } @@ -267,7 +266,6 @@ public class SystemMessage implements IClientOutgoingPacket { return addString(item.getName()); } - append(new SMParam(TYPE_ITEM_NAME, id)); return this; } @@ -389,7 +387,6 @@ public class SystemMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SYSTEM_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -402,13 +399,12 @@ public class SystemMessage implements IClientOutgoingPacket params[i] = _params[i].getValue(); } packet.writeH(SystemMessageId.S1_2.getId()); - packet.writeC(0x01); + packet.writeC(1); packet.writeC(TYPE_TEXT); packet.writeS(sml.getLocalisation(params)); return true; } } - packet.writeH(getId()); packet.writeC(_params.length); for (SMParam param : _params) @@ -418,9 +414,7 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } - packet.writeC(param.getType()); - switch (param.getType()) { case TYPE_ELEMENT_NAME: diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java index a91da07e77..d357efbb0e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java @@ -47,13 +47,12 @@ public class TargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_SELECTED.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java index 3dadd249f6..3d7208c06f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java @@ -42,12 +42,11 @@ public class TargetUnselected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_UNSELECTED.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index 943b5078b6..13f9b9565a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -41,14 +41,13 @@ public class TeleportToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TELEPORT_TO_LOCATION.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // Fade 0, Instant 1. + packet.writeD(0); // Fade 0, Instant 1. packet.writeD(_heading); - packet.writeD(0x00); // Unknown. + packet.writeD(0); // Unknown. return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java index cb82f2da59..8d09576d9d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java @@ -32,7 +32,6 @@ public class TradeDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_DONE.writeId(packet); - packet.writeD(_num); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java index 716ed2a099..6a94d2463f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java @@ -41,9 +41,9 @@ public class TradeOtherAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java index 3d0ef0b501..7907f3d498 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java @@ -41,9 +41,9 @@ public class TradeOwnAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c59568bf1d..3822108c5a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -58,7 +58,6 @@ public class TradeStart extends AbstractItemPacket { _mask |= 0x08; } - // Does not shows level if (_partner.isGM()) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java index f8e2a191de..e5ec2376cc 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java @@ -44,10 +44,10 @@ public class TradeUpdate extends AbstractItemPacket { OutgoingPackets.TRADE_UPDATE.writeId(packet); packet.writeC(_sendType); - packet.writeD(0x01); + packet.writeD(1); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2); writeItem(packet, _item, _count); } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java index c7102ca385..728020c0b1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java @@ -32,7 +32,6 @@ public class TutorialEnableClientEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_ENABLE_CLIENT_EVENT.writeId(packet); - packet.writeD(_eventId); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java index 92ac75afcf..7cc33a0f80 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java @@ -48,7 +48,6 @@ public class TutorialShowHtml extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_HTML.writeId(packet); - packet.writeD(_type); packet.writeS(getHtml()); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java index 75a57be38b..2ee62835db 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java @@ -37,7 +37,6 @@ public class TutorialShowQuestionMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_QUESTION_MARK.writeId(packet); - packet.writeC(_markType); packet.writeD(_markId); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index c07c64d9c1..c78b903aba 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -38,7 +38,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class UserInfo extends AbstractMaskPacket { private Player _player; - private int _relation; private int _runSpd; private int _walkSpd; @@ -52,7 +51,6 @@ public class UserInfo extends AbstractMaskPacket private int _enchantLevel; private int _armorEnchant; private String _title; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -60,7 +58,6 @@ public class UserInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 5; public UserInfo(Player player) @@ -84,6 +81,7 @@ public class UserInfo extends AbstractMaskPacket _enchantLevel = player.getInventory().getWeaponEnchant(); _armorEnchant = player.getInventory().getArmorMinEnchant(); _title = player.getTitle(); + if (player.isGM() && player.isInvisible()) { _title = "[Invisible]"; @@ -139,30 +137,26 @@ public class UserInfo extends AbstractMaskPacket } OutgoingPackets.USER_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_initSize); packet.writeH(28); // 286 - 28 packet.writeB(_masks); - if (containsMask(UserInfoType.RELATION)) { packet.writeD(_relation); } - if (containsMask(UserInfoType.BASIC_INFO)) { packet.writeH(23 + (_player.getAppearance().getVisibleName().length() * 2)); packet.writeString(_player.getName()); - packet.writeC(_player.isGM() ? 0x01 : 0x00); + packet.writeC(_player.isGM() ? 1 : 0); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeD(_player.getLevel()); // 270 packet.writeD(_player.getClassId().getId()); // 286 } - if (containsMask(UserInfoType.BASE_STATS)) { packet.writeH(18); @@ -175,7 +169,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getLUC()); packet.writeH(_player.getCHA()); } - if (containsMask(UserInfoType.MAX_HPCPMP)) { packet.writeH(14); @@ -183,7 +176,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMaxMp()); packet.writeD(_player.getMaxCp()); } - if (containsMask(UserInfoType.CURRENT_HPMPCP_EXP_SP)) { packet.writeH(38); @@ -194,25 +186,22 @@ public class UserInfo extends AbstractMaskPacket packet.writeQ(_player.getExp()); packet.writeF((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel()))); } - if (containsMask(UserInfoType.ENCHANTLEVEL)) { packet.writeH(5); // 338 packet.writeC(_enchantLevel); packet.writeC(_armorEnchant); - packet.writeC(0x00); // 338 - cBackEnchant? + packet.writeC(0); // 338 - cBackEnchant? } - if (containsMask(UserInfoType.APPAREANCE)) { packet.writeH(19); // 338 packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); packet.writeD(_player.getVisualHairColor() + 1); // 338 - DK color. } - if (containsMask(UserInfoType.STATUS)) { packet.writeH(6); @@ -221,7 +210,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.getCrystallizeGrade() != ItemGrade.NONE ? 1 : 0); packet.writeC(_player.getAbilityPoints() - _player.getAbilityPointsUsed()); } - if (containsMask(UserInfoType.STATS)) { packet.writeH(64); // 270 @@ -239,10 +227,9 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(0x00); // 270 - packet.writeD(0x00); // 270 + packet.writeD(0); // 270 + packet.writeD(0); // 270 } - if (containsMask(UserInfoType.ELEMENTALS)) { packet.writeH(14); @@ -253,7 +240,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getDefenseElementValue(AttributeType.HOLY)); packet.writeH(_player.getDefenseElementValue(AttributeType.DARK)); } - if (containsMask(UserInfoType.POSITION)) { packet.writeH(18); @@ -262,7 +248,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getZ()); packet.writeD(_player.isInVehicle() ? _player.getVehicle().getObjectId() : 0); } - if (containsMask(UserInfoType.SPEED)) { packet.writeH(18); @@ -275,21 +260,18 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_flyRunSpd); packet.writeH(_flyWalkSpd); } - if (containsMask(UserInfoType.MULTIPLIER)) { packet.writeH(18); packet.writeF(_moveMultiplier); packet.writeF(_player.getAttackSpeedMultiplier()); } - if (containsMask(UserInfoType.COL_RADIUS_HEIGHT)) { packet.writeH(18); packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); } - if (containsMask(UserInfoType.ATK_ELEMENTAL)) { packet.writeH(5); @@ -297,7 +279,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); } - if (containsMask(UserInfoType.CLAN)) { packet.writeH(32 + (_title.length() * 2)); @@ -307,12 +288,11 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getClanCrestLargeId()); packet.writeD(_player.getClanCrestId()); packet.writeD(_player.getClanPrivileges().getBitmask()); - packet.writeC(_player.isClanLeader() ? 0x01 : 0x00); + packet.writeC(_player.isClanLeader() ? 1 : 0); packet.writeD(_player.getAllyId()); packet.writeD(_player.getAllyCrestId()); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); } - if (containsMask(UserInfoType.SOCIAL)) { packet.writeH(30); // 228 @@ -332,130 +312,115 @@ public class UserInfo extends AbstractMaskPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeD(0x00); // 228 + packet.writeD(0); // 228 } - if (containsMask(UserInfoType.VITA_FAME)) { packet.writeH(19); // 196 packet.writeD(_player.getVitalityPoints()); - packet.writeC(0x00); // Vita Bonus + packet.writeC(0); // Vita Bonus packet.writeD(_player.getFame()); packet.writeD(_player.getRaidbossPoints()); - packet.writeC(0x00); // 196 + packet.writeC(0); // 196 packet.writeH(_player.getSymbolSealPoints()); // Henna Seal Engraving Gauge - packet.writeC(0x00); // 196 + packet.writeC(0); // 196 } - if (containsMask(UserInfoType.SLOTS)) { packet.writeH(12); // 152 packet.writeC(_player.getInventory().getTalismanSlots()); packet.writeC(_player.getInventory().getBroochJewelSlots()); packet.writeC(_player.getTeam().getId()); - packet.writeD(0x00); - + packet.writeD(0); if (_player.getInventory().getAgathionSlots() > 0) { - packet.writeC(0x01); // Charm slots + packet.writeC(1); // Charm slots packet.writeC(_player.getInventory().getAgathionSlots() - 1); packet.writeC(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152 } else { - packet.writeC(0x00); // Charm slots - packet.writeC(0x00); + packet.writeC(0); // Charm slots + packet.writeC(0); packet.writeC(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152 } } - if (containsMask(UserInfoType.MOVEMENTS)) { packet.writeH(4); packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); - packet.writeC(_player.isRunning() ? 0x01 : 0x00); + packet.writeC(_player.isRunning() ? 1 : 0); } - if (containsMask(UserInfoType.COLOR)) { packet.writeH(10); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); } - if (containsMask(UserInfoType.INVENTORY_LIMIT)) { packet.writeH(13); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); packet.writeH(_player.getInventoryLimit()); - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 } - if (containsMask(UserInfoType.TRUE_HERO)) { packet.writeH(9); - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeC(_player.isTrueHero() ? 100 : 0x00); + packet.writeD(0); + packet.writeH(0); + packet.writeC(_player.isTrueHero() ? 100 : 0); } - if (containsMask(UserInfoType.ATT_SPIRITS)) // 152 { packet.writeH(26); packet.writeD(-1); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - if (containsMask(UserInfoType.RANKING)) // 196 { packet.writeH(6); packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : RankManager.getInstance().getPlayerClassRank(_player) == 1 ? 4 : 0); } - if (containsMask(UserInfoType.STAT_POINTS)) // 235 { packet.writeH(16); - packet.writeH(0x00); // Usable points? - packet.writeH(0x00); // STR points - packet.writeH(0x00); // DEX points - packet.writeH(0x00); // CON points - packet.writeH(0x00); // INT points - packet.writeH(0x00); // WIT points - packet.writeH(0x00); // MEN points + packet.writeH(0); // Usable points? + packet.writeH(0); // STR points + packet.writeH(0); // DEX points + packet.writeH(0); // CON points + packet.writeH(0); // INT points + packet.writeH(0); // WIT points + packet.writeH(0); // MEN points } - if (containsMask(UserInfoType.STAT_ABILITIES)) // 235 { packet.writeH(18); - packet.writeH(0x00); // STR additional - packet.writeH(0x00); // DEX additional - packet.writeH(0x00); // CON additional - packet.writeH(0x00); // INT additional - packet.writeH(0x00); // WIT additional - packet.writeH(0x00); // MEN additional - packet.writeH(0x00); // ? - packet.writeH(0x00); // ? + packet.writeH(0); // STR additional + packet.writeH(0); // DEX additional + packet.writeH(0); // CON additional + packet.writeH(0); // INT additional + packet.writeH(0); // WIT additional + packet.writeH(0); // MEN additional + packet.writeH(0); // ? + packet.writeH(0); // ? } - if (containsMask(UserInfoType.ELIXIR_USED)) // 286 { packet.writeH(1); - packet.writeD(0x00); + packet.writeD(0); } - // Send exp bonus change. if (containsMask(UserInfoType.VITA_FAME)) { @@ -463,7 +428,6 @@ public class UserInfo extends AbstractMaskPacket _player.sendPacket(new ExUserBoostStat(_player, BonusExpType.BUFFS)); _player.sendPacket(new ExUserBoostStat(_player, BonusExpType.PASSIVE)); } - return true; } @@ -480,7 +444,6 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x10; // Party leader } } - if (clan != null) { relation |= 0x20; // Clan member @@ -489,12 +452,10 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x40; // Clan leader } } - if (player.isInSiege()) { relation |= 0x80; // In siege } - return relation; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java index 283bcf1614..90c416726a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java @@ -36,7 +36,6 @@ public class ValidateLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java index 4d8f9683d0..83f72bf981 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java @@ -40,7 +40,6 @@ public class ValidateLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java index b684e70bdc..71367cd26d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java @@ -36,7 +36,6 @@ public class VehicleCheckLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_CHECK_LOCATION.writeId(packet); - packet.writeD(_boat.getObjectId()); packet.writeD(_boat.getX()); packet.writeD(_boat.getY()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java index a4a5780f30..5b565c08b7 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java @@ -46,7 +46,6 @@ public class VehicleDeparture implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_DEPARTURE.writeId(packet); - packet.writeD(_objId); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java index ec611028bf..4a995a6352 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java @@ -44,7 +44,6 @@ public class VehicleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java index 207a6fd899..bf629dcbbc 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java @@ -42,7 +42,6 @@ public class VehicleStarted implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_START.writeId(packet); - packet.writeD(_objectId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 35ca986d35..5eb9eb7ab9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -30,6 +30,7 @@ public class WareHouseDepositList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; public static final int FREIGHT = 1; + private final int _sendType; private final long _playerAdena; private final List _items = new ArrayList<>(); @@ -49,7 +50,6 @@ public class WareHouseDepositList extends AbstractItemPacket _sendType = sendType; _whType = type; _playerAdena = player.getAdena(); - final boolean isPrivate = _whType == PRIVATE; for (Item temp : player.getInventory().getAvailableItems(true, isPrivate, false)) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 7af1cd273c..5ece99310a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -32,6 +32,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private final int _sendType; private Player _player; private long _playerAdena; @@ -60,7 +61,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } - _items = _player.getActiveWarehouse().getItems(); for (Item item : _items) { @@ -78,15 +78,15 @@ public class WareHouseWithdrawalList extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeH(0x00); + packet.writeH(0); packet.writeD(_invSize); packet.writeD(_items.size()); for (Item item : _items) { writeItem(packet, item); packet.writeD(item.getObjectId()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } else diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java index 7442882a70..bd10e174c6 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java @@ -59,7 +59,6 @@ public class ExAcquireAPSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_AP_SKILL_LIST.writeId(packet); - packet.writeD(_enable ? 1 : 0); packet.writeQ(Config.ABILITY_POINTS_RESET_SP); // Changed to from Adena to SP on Grand Crusade // packet.writeQ(_price); Removed on Grand Crusade diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java index f9af89e4db..ff296bf632 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExCloseAPListWnd.java @@ -35,7 +35,6 @@ public class ExCloseAPListWnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_AP_LIST_WND.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java index d72baf2a44..69c47ce99f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ability/ExShowAPListWnd.java @@ -35,7 +35,6 @@ public class ExShowAPListWnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AP_LIST_WND.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java index 5f2dd05f3b..aea1476fb2 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java @@ -35,8 +35,7 @@ public class ExDivideAdenaCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_CANCEL.writeId(packet); - - packet.writeC(0x00); // TODO: Find me + packet.writeC(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java index 6af912cebf..de4e955aba 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java @@ -46,9 +46,8 @@ public class ExDivideAdenaDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_DONE.writeId(packet); - - packet.writeC(_isPartyLeader ? 0x01 : 0x00); - packet.writeC(_isCCLeader ? 0x01 : 0x00); + packet.writeC(_isPartyLeader ? 1 : 0); + packet.writeC(_isCCLeader ? 1 : 0); packet.writeD(_memberCount); packet.writeQ(_distributedAdenaCount); packet.writeQ(_adenaCount); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java index ab8a7471d6..32f99abfdc 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemyConversion.java @@ -38,8 +38,7 @@ public class ExAlchemyConversion implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_CONVERSION.writeId(packet); - - packet.writeC((_successCount == 0) && (_failureCount == 0) ? 0x01 : 0x00); + packet.writeC((_successCount == 0) && (_failureCount == 0) ? 1 : 0); packet.writeD(_successCount); packet.writeD(_failureCount); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java index be4a2a57e6..cb3cf4b3e0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/alchemy/ExTryMixCube.java @@ -47,7 +47,6 @@ public class ExTryMixCube implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TRY_MIX_CUBE.writeId(packet); - packet.writeC(_type.ordinal()); packet.writeD(_items.size()); for (AlchemyResult holder : _items) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index 549def456e..84b5fead76 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -43,7 +43,6 @@ public class ExChooseShapeShiftingItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_SHAPE_SHIFTING_ITEM.writeId(packet); - packet.writeD(_targetType != null ? _targetType.ordinal() : 0); packet.writeD(_type != null ? _type.ordinal() : 0); packet.writeD(_itemId); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java index 33fb439aa5..ba55887a1a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java @@ -45,7 +45,6 @@ public class ExCuriousHouseMemberUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_UPDATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_maxHp); packet.writeD(_maxCp); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java index 8ad3659725..be2d29d864 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPacket { - public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0x00); - public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(0x01); + public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0); + public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(1); private final int _result; @@ -39,7 +39,6 @@ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPa public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_EXTRACTION_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java index ec82cc14f3..e84d7a7255 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; public static final ExPutShapeShiftingTargetItemResult FAILED = new ExPutShapeShiftingTargetItemResult(RESULT_FAILED, 0); @@ -43,7 +43,6 @@ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_resultId); packet.writeQ(_price); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java index f4d3118cc4..038eae0042 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExShapeShiftingResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; - public static final int RESULT_CLOSE = 0x02; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; + public static final int RESULT_CLOSE = 2; public static final ExShapeShiftingResult FAILED = new ExShapeShiftingResult(RESULT_FAILED, 0, 0); public static final ExShapeShiftingResult CLOSE = new ExShapeShiftingResult(RESULT_CLOSE, 0, 0); @@ -47,7 +47,6 @@ public class ExShapeShiftingResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHAPE_SHIFTING_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_targetItemId); packet.writeD(_extractItemId); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java index eaf0d209fd..4b48b09002 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java @@ -38,7 +38,7 @@ public class ExConfirmVipAttendanceCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CONFIRM_VIP_ATTENDANCE_CHECK.writeId(packet); - packet.writeC(_available ? 0x01 : 0x00); // can receive reward today? 1 else 0 + packet.writeC(_available ? 1 : 0); // can receive reward today? 1 else 0 packet.writeC(_index); // active reward index packet.writeD(0); packet.writeD(0); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java index 9d61fe68d6..dd94df023f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java @@ -45,10 +45,10 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket OutgoingPackets.EX_VIP_ATTENDANCE_ITEM_LIST.writeId(packet); packet.writeC(_available ? _index + 1 : _index); // index to receive? packet.writeC(_index); // last received index? - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeC(0x01); - packet.writeC(_available ? 0x01 : 0x00); // player can receive reward today? + packet.writeD(0); + packet.writeD(0); + packet.writeC(1); + packet.writeC(_available ? 1 : 0); // player can receive reward today? packet.writeC(250); packet.writeC(AttendanceRewardData.getInstance().getRewardsCount()); // reward size int rewardCounter = 0; @@ -57,11 +57,11 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket rewardCounter++; packet.writeD(reward.getId()); packet.writeQ(reward.getCount()); - packet.writeC(0x01); // is unknown? - packet.writeC((rewardCounter % 7) == 0 ? 0x01 : 0x00); // is last in row? + packet.writeC(1); // is unknown? + packet.writeC((rewardCounter % 7) == 0 ? 1 : 0); // is last in row? } - packet.writeC(0x00); - packet.writeD(0x00); + packet.writeC(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java index 0282966053..9963a080c6 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java @@ -41,7 +41,7 @@ public class ExActivateAutoShortcut implements IClientOutgoingPacket { OutgoingPackets.EX_ACTIVATE_AUTO_SHORTCUT.writeId(packet); packet.writeH(_position); - packet.writeC(_active ? 0x01 : 0x00); + packet.writeC(_active ? 1 : 0); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java index 7f1d6d60d1..73f93335ef 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseMemberList.java @@ -43,7 +43,6 @@ public class ExCuriousHouseMemberList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_LIST.writeId(packet); - packet.writeD(_id); packet.writeD(_maxPlayers); packet.writeD(_players.size()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java index b71caa5f14..5d9b34db61 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ceremonyofchaos/ExCuriousHouseRemainTime.java @@ -37,7 +37,6 @@ public class ExCuriousHouseRemainTime implements IClientOutgoingPacket { OutgoingPackets.EX_CURIOUS_HOUSE_REMAIN_TIME.writeId(packet); packet.writeD(_time); - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionCloseUI.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionCloseUI.java index 494a5464a2..6a9a1ae36a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionCloseUI.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionCloseUI.java @@ -29,7 +29,7 @@ public class ExCollectionCloseUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLLECTION_CLOSE_UI.writeId(packet); - packet.writeC(0x00); + packet.writeC(0); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionFavoriteList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionFavoriteList.java index 7c441b7681..92ae04b2ba 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionFavoriteList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionFavoriteList.java @@ -29,7 +29,7 @@ public class ExCollectionFavoriteList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLLECTION_FAVORITE_LIST.writeId(packet); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java index 4c3ae253ea..c79b68becc 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java @@ -39,7 +39,6 @@ public class ExResponseCommissionBuyInfo extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_INFO.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java index ddfa8b6db1..c1d29735b8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java @@ -40,7 +40,6 @@ public class ExResponseCommissionBuyItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_ITEM.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java index aa4bbbde24..01e4782408 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java @@ -39,7 +39,6 @@ public class ExResponseCommissionDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_DELETE.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java index e7e3c39816..b915574175 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java @@ -55,7 +55,6 @@ public class ExResponseCommissionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_INFO.writeId(packet); - packet.writeD(_result); packet.writeD(_itemId); packet.writeQ(_presetPricePerUnit); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java index 4963393b42..a012b3ab30 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java @@ -64,7 +64,6 @@ public class ExResponseCommissionList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_LIST.writeId(packet); - packet.writeD(_replyType.getClientId()); switch (_replyType) { @@ -73,13 +72,11 @@ public class ExResponseCommissionList extends AbstractItemPacket { packet.writeD((int) Instant.now().getEpochSecond()); packet.writeD(_chunkId); - int chunkSize = _items.size() - _listIndexStart; if (chunkSize > MAX_CHUNK_SIZE) { chunkSize = MAX_CHUNK_SIZE; } - packet.writeD(chunkSize); for (int i = _listIndexStart; i < (_listIndexStart + chunkSize); i++) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java index b1b0a97d7a..183547af06 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java @@ -39,7 +39,6 @@ public class ExResponseCommissionRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_REGISTER.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java index 74d8a95587..b68386e4ed 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java @@ -35,8 +35,7 @@ public class ExShowCommission implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_COMMISSION.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java index 0c267ecf34..11b1ff1e0a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExEnchantFail implements IClientOutgoingPacket { public static final ExEnchantFail STATIC_PACKET = new ExEnchantFail(0, 0); + private final int _itemOne; private final int _itemTwo; @@ -39,7 +40,6 @@ public class ExEnchantFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_FAIL.writeId(packet); - packet.writeD(_itemOne); packet.writeD(_itemTwo); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java index 71ba811ed5..87d29a8e7c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java @@ -36,7 +36,6 @@ public class ExEnchantSucess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SUCESS.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java index eb4eb8b26c..ec67d50fb6 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java @@ -39,7 +39,6 @@ public class ExGetCrystalizingEstimation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - packet.writeD(_items.size()); for (ItemChanceHolder holder : _items) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java index 23b770e406..ebe77fa654 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java @@ -29,7 +29,7 @@ public class ExShowUpgradeSystem extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_UPGRADE_SYSTEM.writeId(packet); - packet.writeH(0x01); + packet.writeH(1); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java index 586d77c13f..2fb9bb65a1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/faction/ExFactionInfo.java @@ -40,11 +40,9 @@ public class ExFactionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FACTION_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_openDialog ? 1 : 0); packet.writeD(Faction.values().length); - for (Faction faction : Faction.values()) { packet.writeC(faction.getId()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java index fa605b548a..a99ad7f4e3 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java @@ -52,7 +52,7 @@ public class ExFishingStart implements IClientOutgoingPacket packet.writeD(_baitLocation.getX()); packet.writeD(_baitLocation.getY()); packet.writeD(_baitLocation.getZ()); - packet.writeC(0x01); // 0 = newbie, 1 = normal, 2 = night + packet.writeC(1); // 0 = newbie, 1 = normal, 2 = night return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java index 046ad04cb6..74501fe7ff 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java @@ -49,7 +49,6 @@ public class ExUserInfoFishing implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_FISHING.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_isFishing ? 1 : 0); if (_baitLocation == null) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index dc0e3e05bc..336a384bcc 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -47,9 +47,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FRIEND_DETAIL_INFO.writeId(packet); - packet.writeD(_objectId); - if (_friend == null) { packet.writeS(_name); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java index 0d4bb47ff0..a90b7b6083 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java @@ -33,8 +33,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x00); + packet.writeC(0); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java index 9add9c9caa..d24139644c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java @@ -49,7 +49,6 @@ public class FriendAddRequestResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_charId); packet.writeS(_charName); @@ -57,7 +56,7 @@ public class FriendAddRequestResult implements IClientOutgoingPacket packet.writeD(_charObjectId); packet.writeD(_charLevel); packet.writeD(_charClassId); - packet.writeH(0x00); // Always 0 on retail + packet.writeH(0); // Always 0 on retail return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java index a135944662..13a7d01967 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java @@ -86,12 +86,10 @@ public class FriendList implements IClientOutgoingPacket } continue; } - if (player1.isOnline()) { online = true; } - classid = player1.getClassId().getId(); level = player1.getLevel(); _info.add(new FriendInfo(objId, name, online, classid, level)); @@ -102,14 +100,13 @@ public class FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._classid); packet.writeD(info._level); } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java index 07c23f9fd2..1bb4142e34 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java @@ -38,7 +38,6 @@ public class FriendRemove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_REMOVE.writeId(packet); - packet.writeD(_responce); packet.writeS(_charName); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java index e8dbddcd63..a3990c0879 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java @@ -52,7 +52,6 @@ public class FriendStatus implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_STATUS.writeId(packet); - packet.writeD(_type); packet.writeS(_name); switch (_type) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java index 8752104e06..78da5850b8 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java @@ -50,7 +50,6 @@ public class L2Friend implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND.writeId(packet); - packet.writeD(_action ? 1 : 3); // 1-add 3-remove packet.writeD(_objid); packet.writeS(_name); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java index b69a253635..e50693cb11 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java @@ -81,17 +81,16 @@ public class L2FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._level); packet.writeD(info._classId); - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExActivateHomunculusResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExActivateHomunculusResult.java index 1f0161916f..600cd7e3c6 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExActivateHomunculusResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExActivateHomunculusResult.java @@ -37,7 +37,6 @@ public class ExActivateHomunculusResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACTIVATE_HOMUNCULUS_RESULT.writeId(packet); - packet.writeD(1); // success if (_activate) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExEnchantHomunculusSkillResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExEnchantHomunculusSkillResult.java index 96d9d9c491..1001fd2f94 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExEnchantHomunculusSkillResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExEnchantHomunculusSkillResult.java @@ -43,11 +43,9 @@ public class ExEnchantHomunculusSkillResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_HOMUNCULUS_SKILL_RESULT.writeId(packet); - final int playerNumber = Rnd.get(1, 6); final int homunculusNumber = Rnd.get(1, 6); final int systemNumber = Rnd.get(1, 6); - final Homunculus homunculus = _player.getHomunculusList().get(_slot); int boundLevel = 1; if ((playerNumber == homunculusNumber) && (playerNumber == systemNumber)) @@ -58,7 +56,6 @@ public class ExEnchantHomunculusSkillResult implements IClientOutgoingPacket { boundLevel = 2; } - switch (_skillNumber) { case 1: @@ -89,7 +86,6 @@ public class ExEnchantHomunculusSkillResult implements IClientOutgoingPacket } _player.getHomunculusList().update(homunculus); _player.getHomunculusList().refreshStats(true); - packet.writeD(boundLevel); // skill bound level result packet.writeD(homunculus.getId()); // homunculus id? random value on JP packet.writeD(_slot); // slot @@ -97,7 +93,6 @@ public class ExEnchantHomunculusSkillResult implements IClientOutgoingPacket packet.writeD(playerNumber); // player number packet.writeD(homunculusNumber); // homunculus number packet.writeD(systemNumber); // system number - return true; } } \ No newline at end of file diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusHPSPVP.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusHPSPVP.java index fc014757c1..142c6180d5 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusHPSPVP.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusHPSPVP.java @@ -41,11 +41,9 @@ public class ExHomunculusHPSPVP implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HOMUNCULUS_HPSPVP.writeId(packet); - packet.writeD(_hp); packet.writeQ(_sp); packet.writeD(_vp); - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusInsertResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusInsertResult.java index 55e879fde7..678c865f06 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusInsertResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusInsertResult.java @@ -37,7 +37,6 @@ public class ExHomunculusInsertResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HOMUNCULUS_INSERT_RESULT.writeId(packet); - packet.writeD(1); // 1 - success if (_type == 0) { @@ -51,7 +50,6 @@ public class ExHomunculusInsertResult implements IClientOutgoingPacket { packet.writeD(SystemMessageId.THE_HOMUNCULUS_TAKES_YOUR_TEARS_VP.getId()); } - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java index 400dda6bd7..f52a9c1d38 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java @@ -31,10 +31,8 @@ public class ExHomunculusSummonResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HOMUNCULUS_SUMMON_RESULT.writeId(packet); - packet.writeD(1); // 1 - success packet.writeD(SystemMessageId.A_NEW_HOMUNCULUS_IS_CREATED.getId()); - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusBirthInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusBirthInfo.java index c42a0cd6ca..cdc24a4c11 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusBirthInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusBirthInfo.java @@ -44,7 +44,6 @@ public class ExShowHomunculusBirthInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_HOMUNCULUS_BIRTH_INFO.writeId(packet); - int creationStage = 0; if (_homunculusCreateTime > 0) { @@ -63,7 +62,6 @@ public class ExShowHomunculusBirthInfo implements IClientOutgoingPacket packet.writeD(_vpPoints); // vp points packet.writeD(_homunculusCreateTime); // finish time packet.writeD(0); // JP = 0. ? - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusCouponUi.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusCouponUi.java index 2dc15a3e77..3c288d09c7 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusCouponUi.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusCouponUi.java @@ -29,7 +29,7 @@ public class ExShowHomunculusCouponUi implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_HOMUNCULUS_COUPON_UI.writeId(packet); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusList.java index 2af4d1b996..74372f0878 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExShowHomunculusList.java @@ -39,7 +39,6 @@ public class ExShowHomunculusList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_HOMUNCULUS_LIST.writeId(packet); - if (_player.getHomunculusList().size() > 0) { packet.writeD(_player.getHomunculusList().size()); // homunculus count @@ -51,7 +50,6 @@ public class ExShowHomunculusList implements IClientOutgoingPacket { continue; } - packet.writeD(counter); // slot packet.writeD(homunculus.getId()); // homunculus id packet.writeD(homunculus.getType()); @@ -81,7 +79,6 @@ public class ExShowHomunculusList implements IClientOutgoingPacket { packet.writeD(0); } - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExSummonHomunculusCouponResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExSummonHomunculusCouponResult.java index 4ae3e05b36..28c7d148e2 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExSummonHomunculusCouponResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExSummonHomunculusCouponResult.java @@ -36,11 +36,9 @@ public class ExSummonHomunculusCouponResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUMMON_HOMUNCULUS_COUPON_RESULT.writeId(packet); - packet.writeD(1); // 1 - success packet.writeD(_slot); // homunculus slot packet.writeD(0); // keep or delete - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java index 0d4fa5cb5d..d0b92dbd1d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java @@ -40,7 +40,7 @@ public class TimedHuntingZoneEnter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); - packet.writeC(0x01); // bEnterSuccess + packet.writeC(1); // bEnterSuccess packet.writeD(_zoneId); packet.writeD((int) ((Chronos.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) packet.writeD(_player.getTimedHuntingZoneRemainingTime(_zoneId) / 1000); // nRemainTime (zone left time) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java index 2c93f25c76..c80dbcfa6a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java @@ -35,7 +35,7 @@ public class TimedHuntingZoneExit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); - packet.writeC(0x00); // bEnterSuccess + packet.writeC(0); // bEnterSuccess return true; } } \ No newline at end of file diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java index 291e1fc93f..ecf0dbd8bf 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java @@ -42,7 +42,6 @@ public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket { _shopType = shopType; _player = player; - switch (shopType) { case 3: // Normal Lcoin Shop @@ -66,10 +65,9 @@ public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PURCHASE_LIMIT_SHOP_ITEM_LIST_NEW.writeId(packet); - packet.writeC(_shopType); - packet.writeC(0x01); // Page. (311) - packet.writeC(0x01); // MaxPage. (311) + packet.writeC(1); // Page. (311) + packet.writeC(1); // MaxPage. (311) packet.writeD(_products.size()); for (LimitShopProductHolder product : _products) { @@ -90,7 +88,6 @@ public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket packet.writeH(product.getIngredientEnchants()[2]); packet.writeH(product.getIngredientEnchants()[3]); // 306 packet.writeH(product.getIngredientEnchants()[4]); // 306 - // Check limits. if (product.getAccountDailyLimit() > 0) // Sale period. { @@ -98,7 +95,7 @@ public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket { if ((_player.getAccountVariables().getLong(AccountVariables.LCOIN_SHOP_PRODUCT_TIME + product.getProductionId(), 0) + 86400000) > Chronos.currentTimeMillis()) { - packet.writeD(0x00); + packet.writeD(0); } else // Reset limit. { @@ -115,7 +112,7 @@ public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket { if (_player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_COUNT + product.getProductionId(), 0) >= product.getAccountBuyLimit()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -124,13 +121,12 @@ public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket } else // No account limits. { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x00); // nRemainSec - packet.writeD(0x00); // nRemainServerItemAmount - packet.writeH(0x00); // sCircleNum (311) + packet.writeD(0); // nRemainSec + packet.writeD(0); // nRemainServerItemAmount + packet.writeH(0); // sCircleNum (311) } - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemResult.java index e4ee346643..0bf970f724 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemResult.java @@ -42,7 +42,6 @@ public class ExPurchaseLimitShopItemResult implements IClientOutgoingPacket _category = category; _productId = productId; _rewards = rewards; - switch (_category) { case 3: // Normal Lcoin Shop diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java index 677c09091f..706c179a9c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java @@ -37,7 +37,6 @@ public class ExMentorAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_ADD.writeId(packet); - packet.writeS(_mentor.getName()); packet.writeD(_mentor.getActiveClass()); packet.writeD(_mentor.getLevel()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java index 4722a9cab3..18c1cdeedf 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java @@ -64,9 +64,8 @@ public class ExMentorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_LIST.writeId(packet); - packet.writeD(_type); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mentees.size()); for (Mentee mentee : _mentees) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java index d739dd94b7..2283920b98 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ListMenteeWaiting implements IClientOutgoingPacket { private static final int PLAYERS_PER_PAGE = 64; + private final List _possibleCandiates = new ArrayList<>(); private final int _page; @@ -51,18 +52,15 @@ public class ListMenteeWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_MENTEE_WAITING.writeId(packet); - - packet.writeD(0x01); // always 1 in retail + packet.writeD(1); // always 1 in retail if (_possibleCandiates.isEmpty()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } - packet.writeD(_possibleCandiates.size()); packet.writeD(_possibleCandiates.size() % PLAYERS_PER_PAGE); - for (Player player : _possibleCandiates) { if ((1 <= (PLAYERS_PER_PAGE * _page)) && (1 > (PLAYERS_PER_PAGE * (_page - 1)))) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pk/ExPkPenaltyList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pk/ExPkPenaltyList.java index f292e1e19f..cc0522fecb 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pk/ExPkPenaltyList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pk/ExPkPenaltyList.java @@ -37,7 +37,6 @@ public class ExPkPenaltyList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PK_PENALTY_LIST.writeId(packet); - final Set players = World.getInstance().getPkPlayers(); packet.writeD(World.getInstance().getLastPkTime()); packet.writeD(players.size()); @@ -48,7 +47,6 @@ public class ExPkPenaltyList implements IClientOutgoingPacket packet.writeD(player.getLevel()); packet.writeD(player.getClassId().getId()); } - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pk/ExPkPenaltyListOnlyLoc.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pk/ExPkPenaltyListOnlyLoc.java index 66b8ef6664..82934b1535 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pk/ExPkPenaltyListOnlyLoc.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pk/ExPkPenaltyListOnlyLoc.java @@ -37,7 +37,6 @@ public class ExPkPenaltyListOnlyLoc implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PK_PENALTY_LIST_ONLY_LOC.writeId(packet); - final Set players = World.getInstance().getPkPlayers(); packet.writeD(World.getInstance().getLastPkTime()); packet.writeD(players.size()); @@ -48,7 +47,6 @@ public class ExPkPenaltyListOnlyLoc implements IClientOutgoingPacket packet.writeD(player.getY()); packet.writeD(player.getZ()); } - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java index e33e29a487..fc80b0a6c0 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionInfo.java @@ -41,7 +41,6 @@ public class ExPledgeContributionInfo implements IClientOutgoingPacket { return false; } - OutgoingPackets.EX_PLEDGE_CONTRIBUTION_INFO.writeId(packet); packet.writeD(_player.getClanContribution()); packet.writeD(_player.getClanContribution()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java index e65c0ced20..64b1bfd2e6 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeContributionRank.java @@ -44,10 +44,8 @@ public class ExPledgeContributionRank implements IClientOutgoingPacket { return false; } - OutgoingPackets.EX_PLEDGE_CONTRIBUTION_RANK.writeId(packet); packet.writeC(_cycle); - packet.writeD(_clan.getMembersCount()); int order = 1; for (ClanMember member : _clan.getMembers()) @@ -70,7 +68,6 @@ public class ExPledgeContributionRank implements IClientOutgoingPacket packet.writeD(member.getClanContributionTotal()); } } - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java index c235245d89..e66b814d06 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeItemList.java @@ -42,9 +42,7 @@ public class ExPledgeItemList extends AbstractItemPacket { return false; } - OutgoingPackets.EX_PLEDGE_ITEM_LIST.writeId(packet); - packet.writeH(ClanShopData.getInstance().getProducts().size()); // Product count. for (ClanShopProductHolder product : ClanShopData.getInstance().getProducts()) { @@ -61,7 +59,6 @@ public class ExPledgeItemList extends AbstractItemPacket packet.writeH(0); // Current stock packet.writeH(0); // Total stock } - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java index e4df4b523e..21c5ba1724 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java @@ -44,9 +44,7 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket { return false; } - OutgoingPackets.EX_PLEDGE_MASTERY_INFO.writeId(packet); - packet.writeD(clan.getUsedDevelopmentPoints()); // Consumed development points packet.writeD(clan.getTotalDevelopmentPoints()); // Total development points packet.writeD(16); // Mastery count @@ -56,8 +54,7 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket { final int id = mastery.getId(); packet.writeD(id); // Mastery - packet.writeD(0x00); // ? - + packet.writeD(0); // ? boolean available = true; if (clan.getLevel() < mastery.getClanLevel()) { @@ -76,11 +73,9 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket available = clan.hasMastery(previous); } } - - packet.writeC(clan.hasMastery(id) ? 0x02 : available ? 0x01 : 0x00); // Availability. + packet.writeC(clan.hasMastery(id) ? 2 : available ? 1 : 0); // Availability. } } - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java index d31a014aea..568aa70f70 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java @@ -46,15 +46,12 @@ public class ExPledgeMissionInfo implements IClientOutgoingPacket { return true; } - OutgoingPackets.EX_PLEDGE_MISSION_INFO.writeId(packet); - packet.writeD(_rewards.size()); for (DailyMissionDataHolder reward : _rewards) { int progress = reward.getProgress(_player); int status = reward.getStatus(_player); - // TODO: Figure out this. if (reward.isLevelUpMission()) { @@ -76,12 +73,10 @@ public class ExPledgeMissionInfo implements IClientOutgoingPacket { status = 2; } - packet.writeD(reward.getId()); packet.writeD(progress); packet.writeC(status); } - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java index ce1d6327e7..604181c6ed 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java @@ -41,10 +41,8 @@ public class ExPledgeMissionRewardCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_MISSION_REWARD_COUNT.writeId(packet); - packet.writeD(Math.min(_availableMissionsCount, _doneMissionsCount)); // Received missions rewards. packet.writeD(_availableMissionsCount); // Available missions rewards. 18 - for noble, 20 - for honnorable noble. - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java index e59ebcfaab..22cf060348 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeShowInfoUpdate.java @@ -43,7 +43,6 @@ public class ExPledgeShowInfoUpdate extends AbstractItemPacket { return false; } - OutgoingPackets.EX_PLEDGE_SHOW_INFO_UPDATE.writeId(packet); packet.writeD(clan.getId()); // Clan ID packet.writeD(ClanLevelData.getLevelRequirement(clan.getLevel())); // Next level cost diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index fb735b8925..e75426e598 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -69,7 +69,6 @@ public class ExBRBuyProduct implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUY_PRODUCT.writeId(packet); - packet.writeD(_reply); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java index 742b3eba9d..91a186b81d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java @@ -39,10 +39,9 @@ public class ExBRGamePoint implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_GAME_POINT.writeId(packet); - packet.writeD(_charId); packet.writeQ(_charPoints); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java index 50f21df46a..e36f2ff502 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java @@ -45,7 +45,6 @@ public class ExBRProductInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_INFO.writeId(packet); - packet.writeD(_item.getBrId()); packet.writeD(_item.getPrice()); packet.writeD(_item.getItems().size()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java index dc851ffd43..0f042ba043 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java @@ -45,9 +45,8 @@ public class ExBRProductList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); // Adena - packet.writeQ(0x00); // Hero coins + packet.writeQ(0); // Hero coins packet.writeC(_type); // Type 0 - Home, 1 - History, 2 - Favorites packet.writeD(_primeList.size()); for (PrimeShopGroup brItem : _primeList) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java index 320140ace6..bf67164bfe 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java @@ -39,7 +39,6 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RAID_BOSS_SPAWN_INFO.writeId(packet); - packet.writeD(_statuses.size()); // count for (Entry entry : _statuses.entrySet()) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java index d1896f32a7..5c835c1dea 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java @@ -47,7 +47,6 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_HERO_AND_LEGEND_INFO.writeId(packet); - if (!Hero.getInstance().getHeroes().isEmpty()) { try (Connection con = DatabaseFactory.getConnection(); @@ -63,7 +62,6 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket { packet.writeC(1); // ?? shows 78 on JP packet.writeC(1); // ?? shows 0 on JP - packet.writeString(rset.getString("char_name")); final int clanId = rset.getInt("clanid"); if (clanId > 0) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java index b7395dee4e..3e7261542a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java @@ -55,7 +55,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MY_RANKING_INFO.writeId(packet); - final Date date = new Date(); final Calendar calendar = new GregorianCalendar(); calendar.setTime(date); @@ -99,7 +98,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket { PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } - int previousPlace = 0; int previousWins = 0; int previousLoses = 0; @@ -128,7 +126,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket { PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } - int heroCount = 0; int legendCount = 0; if (Hero.getInstance().getCompleteHeroes().containsKey(_player.getObjectId())) @@ -137,7 +134,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket heroCount = hero.getInt("count", 0); legendCount = hero.getInt("legend_count", 0); } - packet.writeD(year); // Year packet.writeD(month); // Month packet.writeD(Math.min(Olympiad.getInstance().getCurrentCycle() - 1, 0)); // cycle ? diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java index bad88659b0..db5efac89a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java @@ -64,20 +64,17 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_RANKING_INFO.writeId(packet); - packet.writeC(_tabId); // Tab id packet.writeC(_rankingType); // ranking type packet.writeC(_unk); // unk, shows 1 all time packet.writeD(_classId); // class id (default 148) or caller class id for personal rank packet.writeD(_serverId); // 0 - all servers, server id - for caller server packet.writeD(933); // unk, 933 all time - if (!_playerList.isEmpty()) { final RankingOlympiadCategory category = RankingOlympiadCategory.values()[_tabId]; writeFilteredRankingData(packet, category, category.getScopeByGroup(_rankingType), ClassId.getClassId(_classId)); } - return true; } @@ -100,10 +97,8 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket private void writeScopeData(PacketWriter packet, RankingOlympiadScope scope, List> list, List> snapshot) { - Entry playerData = list.stream().filter(it -> it.getValue().getInt("charId", 0) == _player.getObjectId()).findFirst().orElse(null); final int indexOf = list.indexOf(playerData); - final List> limited; switch (scope) { @@ -132,9 +127,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket limited = Collections.emptyList(); } } - packet.writeD(limited.size()); - int rank = 1; for (Entry data : limited.stream().sorted(Entry.comparingByKey()).collect(Collectors.toList())) { @@ -143,7 +136,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket packet.writeString(player.getString("name")); // name packet.writeString(player.getString("clanName")); // clan name packet.writeD(scope == RankingOlympiadScope.SELF ? data.getKey() : curRank); // rank - if (!snapshot.isEmpty()) { int snapshotRank = 1; @@ -160,7 +152,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket { packet.writeD(scope == RankingOlympiadScope.SELF ? data.getKey() : curRank); } - packet.writeD(Config.SERVER_ID); // server id packet.writeD(player.getInt("level")); // level packet.writeD(player.getInt("classId")); // class id diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingList.java index ad8f5d0034..164286d6f1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingList.java @@ -114,10 +114,8 @@ public class ExPvpRankingList implements IClientOutgoingPacket private void writeScopeData(PacketWriter packet, RankingScope scope, List> list, List> snapshot) { - Entry playerData = list.stream().filter(it -> it.getValue().getInt("charId", 0) == _player.getObjectId()).findFirst().orElse(null); final int indexOf = list.indexOf(playerData); - final List> limited; switch (scope) { @@ -146,9 +144,7 @@ public class ExPvpRankingList implements IClientOutgoingPacket limited = Collections.emptyList(); } } - packet.writeD(limited.size()); - int rank = 1; for (Entry data : limited.stream().sorted(Entry.comparingByKey()).collect(Collectors.toList())) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java index 3b3728f090..f2e96db6b1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java @@ -48,7 +48,6 @@ public class ExRankingCharInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RANKING_CHAR_INFO.writeId(packet); - if (!_playerList.isEmpty()) { for (Integer id : _playerList.keySet()) @@ -59,7 +58,6 @@ public class ExRankingCharInfo implements IClientOutgoingPacket packet.writeD(id); // server rank packet.writeD(player.getInt("raceRank")); // race rank packet.writeD(player.getInt("classRank")); // class rank - for (Integer id2 : _snapshotList.keySet()) { final StatSet snapshot = _snapshotList.get(id2); @@ -68,7 +66,7 @@ public class ExRankingCharInfo implements IClientOutgoingPacket packet.writeD(id2); // server rank snapshot packet.writeD(snapshot.getInt("raceRank")); // race rank snapshot packet.writeD(snapshot.getInt("classRank")); // class rank snapshot - packet.writeD(0); + packet.writeD(0); packet.writeD(0); packet.writeD(0); return true; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java index f89d104f27..54de929cd5 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java @@ -55,12 +55,10 @@ public class ExRankingCharRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RANKING_CHAR_RANKERS.writeId(packet); - packet.writeC(_group); packet.writeC(_scope); packet.writeD(_race); packet.writeD(_player.getClassId().getId()); - if (!_playerList.isEmpty()) { switch (_group) @@ -71,7 +69,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket { final int count = _playerList.size() > 150 ? 150 : _playerList.size(); packet.writeD(count); - for (Integer id : _playerList.keySet()) { final StatSet player = _playerList.get(id); @@ -130,7 +127,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket packet.writeD(plr.getInt("classId")); packet.writeD(plr.getInt("race")); packet.writeD(id2); // server rank - if (!_snapshotList.isEmpty()) { for (Integer id3 : _snapshotList.keySet()) @@ -168,7 +164,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } } packet.writeD(count > 100 ? 100 : count); - int i = 1; for (Integer id : _playerList.keySet()) { @@ -218,7 +213,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket else { boolean found = false; - final Map raceList = new ConcurrentHashMap<>(); int i = 1; for (Integer id : _playerList.keySet()) @@ -230,7 +224,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket i++; } } - for (Integer id : raceList.keySet()) { final StatSet player = raceList.get(id); @@ -284,9 +277,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket i++; } } - packet.writeD(clanList.size()); - for (Integer id : clanList.keySet()) { final StatSet player = clanList.get(id); @@ -342,9 +333,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } } friendList.add(_player.getObjectId()); - packet.writeD(count); - for (int id : _playerList.keySet()) { final StatSet player = _playerList.get(id); @@ -381,7 +370,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket else { packet.writeD(1); - packet.writeString(_player.getName()); if (_player.getClan() != null) { @@ -431,7 +419,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } } packet.writeD(count > 100 ? 100 : count); - int i = 1; for (Integer id : _playerList.keySet()) { @@ -481,7 +468,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket else { boolean found = false; - final Map raceList = new ConcurrentHashMap<>(); int i = 1; for (Integer id : _playerList.keySet()) @@ -493,7 +479,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket i++; } } - for (Integer id : raceList.keySet()) { final StatSet player = raceList.get(id); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java index 2463589c81..c09b3e899d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java @@ -47,18 +47,15 @@ public class ExFlyMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_mapId); - packet.writeD(_locations.size()); for (SayuneEntry loc : _locations) { packet.writeD(loc.getId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(loc.getX()); packet.writeD(loc.getY()); packet.writeD(loc.getZ()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java index 03fc6b580d..70b3fb25d2 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java @@ -47,16 +47,13 @@ public class ExFlyMoveBroadcast implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE_BROADCAST.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); packet.writeD(_mapId); - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD(_currentLoc.getX()); packet.writeD(_currentLoc.getY()); packet.writeD(_currentLoc.getZ()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java index cfe11a27e0..49e5d86910 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java @@ -35,7 +35,6 @@ public class ExNotifyFlyMoveStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_FLY_MOVE_START.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java index d5640a47ef..0efa37ae8c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java @@ -51,7 +51,6 @@ public class ExMoveToLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_SUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_targetX); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java index 0cbe2c3e02..a0314c39aa 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java @@ -46,7 +46,6 @@ public class ExShuttleGetOff implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_OFF.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_x); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java index 5211bef5ba..061bcafed9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java @@ -43,7 +43,6 @@ public class ExShuttleGetOn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_ON.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java index 97d54a9019..c8aee1fde7 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java @@ -43,7 +43,6 @@ public class ExShuttleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHUTTLE_INFO.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD(_shuttle.getX()); packet.writeD(_shuttle.getY()); @@ -60,8 +59,8 @@ public class ExShuttleInfo implements IClientOutgoingPacket packet.writeD(loc.getY()); packet.writeD(loc.getZ()); } - packet.writeD(stop.isDoorOpen() ? 0x01 : 0x00); - packet.writeD(stop.hasDoorChanged() ? 0x01 : 0x00); + packet.writeD(stop.isDoorOpen() ? 1 : 0); + packet.writeD(stop.hasDoorChanged() ? 1 : 0); } return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java index 6ba38f29a1..28b33b998e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java @@ -43,7 +43,6 @@ public class ExShuttleMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_MOVE.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD((int) _shuttle.getStat().getMoveSpeed()); packet.writeD((int) _shuttle.getStat().getRotationSpeed()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java index bf2b6ea6eb..6c31189d6a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java @@ -44,7 +44,6 @@ public class ExStopMoveInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_SHUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java index f7f6849732..8492f42a6e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java @@ -44,7 +44,6 @@ public class ExValidateLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_SHUTTLE.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExTeleportFavoritesList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExTeleportFavoritesList.java index 0f68a71088..6bd6a492d2 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExTeleportFavoritesList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExTeleportFavoritesList.java @@ -42,14 +42,12 @@ public class ExTeleportFavoritesList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_FAVORITES_LIST.writeId(packet); - - packet.writeC(_enable ? 0x01 : 0x00); + packet.writeC(_enable ? 1 : 0); packet.writeD(_teleports.size()); for (int id : _teleports) { packet.writeD(id); } - return true; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java index 1d59c6d002..e7654ed911 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java @@ -60,7 +60,7 @@ public class AccountKicked implements IOutgoingPacket { OutgoingPackets.ACCOUNT_KICKED.writeId(packet); packet.writeD(_reason.getCode()); - return true; } } + diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 2e3a1f6163..1fe813e393 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: response + * Format: d d: response */ public class GGAuth implements IOutgoingPacket { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/loginserver/network/serverpackets/Init.java index 4b3f71f30e..d725f45ca2 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/loginserver/network/serverpackets/Init.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/loginserver/network/serverpackets/Init.java @@ -52,7 +52,6 @@ public class Init implements IOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.INIT.writeId(packet); - packet.writeD(_sessionId); // session id packet.writeD(0x0000c621); // protocol revision diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index 8c534554a8..f4dcd22b00 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: the failure reason + * Format: d d: the failure reason */ public class LoginFail implements IOutgoingPacket { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/BaseRecievePacket.java index c682cb741d..a6ed15ce32 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/BaseRecievePacket.java @@ -73,7 +73,7 @@ public abstract class BaseRecievePacket try { result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE); - result = result.substring(0, result.indexOf(0x00)); + result = result.substring(0, result.indexOf(0)); _off += (result.length() * 2) + 2; } catch (Exception e) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/BaseSendablePacket.java index a9d918de4c..8fa8491cbf 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/commons/network/BaseSendablePacket.java @@ -117,16 +117,16 @@ public abstract class BaseSendablePacket public byte[] getBytes() { // if (this instanceof Init) - // writeD(0x00); // reserve for XOR initial key + // writeD(0); // reserve for XOR initial key - writeD(0x00); // reserve for checksum + writeD(0); // reserve for checksum final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++) { - writeC(0x00); + writeC(0); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 2e73484508..becb5427c3 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.util.Util; /** - * Fromat:(ch) dddddc + * Format:(ch) dddddc */ public class RequestExMagicSkillUseGround implements IClientIncomingPacket { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/AllyInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/AllyInfo.java index d24c885191..b26b07362a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/AllyInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/AllyInfo.java @@ -39,7 +39,6 @@ public class AllyInfo implements IClientOutgoingPacket _player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_ALLIED_WITH_ANY_CLANS); return false; } - // ============ SystemMessage sm = new SystemMessage(SystemMessageId.ALLIANCE_INFORMATION); _player.sendPacket(sm); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 0347dc2bc2..7f9ca96b7d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -92,10 +92,8 @@ public class Attack implements IClientOutgoingPacket { // Get the last position in the hits table final int pos = _hits.length; - // Create a new Hit object final Hit[] tmp = new Hit[pos + 1]; - // Add the new Hit object to hits table System.arraycopy(_hits, 0, tmp, 0, _hits.length); tmp[pos] = new Hit(target, damage, miss, crit, shld); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index 29bad6b104..9e99825df0 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -75,30 +75,28 @@ public class BuyList implements IClientOutgoingPacket packet.writeD(item.getItemId()); if (item.getCount() < 0) { - packet.writeD(0x00); // max amount of items that a player can buy at a time (with this itemid) + packet.writeD(0); // max amount of items that a player can buy at a time (with this itemid) } else { packet.writeD(item.getCount()); } packet.writeH(item.getItem().getType2()); // item type2 - packet.writeH(0x00); // ? - + packet.writeH(0); // ? if (item.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { 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.getEnchantLevel()); // enchant level - packet.writeH(0x00); // ? - packet.writeH(0x00); + packet.writeH(0); // ? + packet.writeH(0); } else { - packet.writeD(0x00); // 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(0x00); // enchant level - packet.writeH(0x00); // ? - packet.writeH(0x00); + packet.writeD(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.writeH(0); // enchant level + packet.writeH(0); // ? + packet.writeH(0); } - if ((item.getItemId() >= 3960) && (item.getItemId() <= 4026)) { packet.writeD((int) (item.getPriceToSell() * Config.RATE_SIEGE_GUARDS_PRICE * (1 + _taxRate))); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index 6579adce9e..b489a4ad83 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -50,12 +50,12 @@ public class BuyListSeed implements IClientOutgoingPacket packet.writeH(_list.size()); // list length for (Item item : _list) { - packet.writeH(0x04); // item->type1 - packet.writeD(0x00); // objectId + packet.writeH(4); // item->type1 + packet.writeD(0); // objectId packet.writeD(item.getItemId()); // item id packet.writeD(item.getCount()); // item count - packet.writeH(0x04); // item->type2 - packet.writeH(0x00); // unknown :) + packet.writeH(4); // item->type2 + packet.writeH(0); // unknown :) packet.writeD(item.getPriceToSell()); // price } return true; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index 7d792654d8..66869caf4f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -26,17 +26,17 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ChangeWaitType implements IClientOutgoingPacket { + public static final int WT_SITTING = 0; + public static final int WT_STANDING = 1; + public static final int WT_START_FAKEDEATH = 2; + public static final int WT_STOP_FAKEDEATH = 3; + private final int _objectId; private final int _moveType; private final int _x; private final int _y; private final int _z; - public static final int WT_SITTING = 0; - public static final int WT_STANDING = 1; - public static final int WT_START_FAKEDEATH = 2; - public static final int WT_STOP_FAKEDEATH = 3; - public ChangeWaitType(Creature creature, int newMoveType) { _objectId = creature.getObjectId(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index cdb6a948d9..429ce2104e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class CharCreateFail implements IClientOutgoingPacket { - public static final int REASON_CREATION_FAILED = 0x00; - public static final int REASON_TOO_MANY_CHARACTERS = 0x01; - public static final int REASON_NAME_ALREADY_EXISTS = 0x02; - public static final int REASON_16_ENG_CHARS = 0x03; - public static final int REASON_INCORRECT_NAME = 0x04; + public static final int REASON_CREATION_FAILED = 0; + public static final int REASON_TOO_MANY_CHARACTERS = 1; + public static final int REASON_NAME_ALREADY_EXISTS = 2; + public static final int REASON_16_ENG_CHARS = 3; + public static final int REASON_INCORRECT_NAME = 4; private final int _error; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index 4f5aa889c4..43de5c6ed2 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -28,7 +28,7 @@ public class CharCreateOk implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_CREATE_OK.writeId(packet); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index 7b22f12774..d5ac02f1a4 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class CharDeleteFail implements IClientOutgoingPacket { - public static final int REASON_DELETION_FAILED = 0x01; - public static final int REASON_YOU_MAY_NOT_DELETE_CLAN_MEMBER = 0x02; - public static final int REASON_CLAN_LEADERS_MAY_NOT_BE_DELETED = 0x03; + public static final int REASON_DELETION_FAILED = 1; + public static final int REASON_YOU_MAY_NOT_DELETE_CLAN_MEMBER = 2; + public static final int REASON_CLAN_LEADERS_MAY_NOT_BE_DELETED = 3; private final int _error; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 0ea7f4acde..17b5189e00 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -58,7 +58,6 @@ public class CharInfo implements IClientOutgoingPacket packet.writeS(_player.getName()); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); - if (_player.getClassIndex() == 0) { packet.writeD(_player.getClassId().getId()); @@ -67,8 +66,7 @@ public class CharInfo implements IClientOutgoingPacket { packet.writeD(_player.getBaseClass()); } - - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_HEAD)); packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_RHAND)); packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LHAND)); @@ -79,16 +77,12 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_BACK)); packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LRHAND)); packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_HAIR)); - packet.writeD(_player.getPvpFlag()); packet.writeD(_player.getKarma()); - packet.writeD(_player.getMAtkSpd()); packet.writeD(_player.getPAtkSpd()); - packet.writeD(_player.getPvpFlag()); 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) @@ -104,24 +98,19 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeS(_gmSeeInvis ? "Invisible" : _player.getTitle()); - packet.writeD(_player.getClanId()); packet.writeD(_player.getClanCrestId()); packet.writeD(_player.getAllyId()); packet.writeD(_player.getAllyCrestId()); // In UserInfo leader rights and siege flags, but here found nothing?? // Therefore RelationChanged packet with that info is required - packet.writeD(0x00); - + packet.writeD(0); packet.writeC(_player.isSitting() ? 0 : 1); // standing = 1 sitting = 0 packet.writeC(_player.isRunning() ? 1 : 0); // running = 1 walking = 0 packet.writeC(_player.isInCombat() ? 1 : 0); packet.writeC(_player.isAlikeDead() ? 1 : 0); - packet.writeC(!_gmSeeInvis && _player.getAppearance().isInvisible() ? 1 : 0); // invisible = 1 visible = 0 - packet.writeC(_player.getMountType()); // 1 on strider 2 on wyvern 0 no mount packet.writeC(_player.getPrivateStoreType()); // 1 - sellshop @@ -132,35 +121,19 @@ public class CharInfo implements IClientOutgoingPacket } packet.writeC(_player.isInPartyMatchRoom() ? 1 : 0); - packet.writeD(_gmSeeInvis ? (_player.getAbnormalEffect() | Creature.ABNORMAL_EFFECT_STEALTH) : _player.getAbnormalEffect()); - packet.writeC(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); packet.writeC(_player.isMounted() ? 0 : _player.getEnchantEffect()); - - if (_player.getTeam() == 1) - { - packet.writeC(0x01); // team circle around feet 1 = Blue, 2 = red - } - else if (_player.getTeam() == 2) - { - packet.writeC(0x02); // team circle around feet 1 = Blue, 2 = red - } - else - { - packet.writeC(0x00); // team circle around feet 1 = Blue, 2 = red - } - + packet.writeC(_player.getTeam()); // team circle around feet 1 = Blue, 2 = red packet.writeD(_player.getClanCrestLargeId()); packet.writeC(_player.isNoble() ? 1 : 0); // Symbol on char menu ctrl+I packet.writeC((_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) || _player.isPVPHero()) ? 1 : 0); // Hero Aura - packet.writeC(_player.isFishing() ? 1 : 0); // 0x01: Fishing Mode (Cant be undone by setting back to 0) + packet.writeC(_player.isFishing() ? 1 : 0); // 1: Fishing Mode (Cant be undone by setting back to 0) packet.writeD(_player.getFishX()); packet.writeD(_player.getFishY()); packet.writeD(_player.getFishZ()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java index 2e49c91469..44ce743efa 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java @@ -72,10 +72,8 @@ public class CharSelectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_SELECT_INFO.writeId(packet); - final int size = _characterPackages.size(); packet.writeD(size); - long lastAccess = 0; if (_activeId == -1) { @@ -88,7 +86,6 @@ public class CharSelectInfo implements IClientOutgoingPacket } } } - for (int i = 0; i < size; i++) { final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); @@ -97,36 +94,29 @@ public class CharSelectInfo implements IClientOutgoingPacket packet.writeS(_loginName); packet.writeD(_sessionId); packet.writeD(charInfoPackage.getClanId()); - packet.writeD(0x00); // ?? - + packet.writeD(0); // ?? packet.writeD(charInfoPackage.getSex()); packet.writeD(charInfoPackage.getRace()); packet.writeD(charInfoPackage.getBaseClassId()); - - packet.writeD(0x01); // active ?? - - packet.writeD(0x00); // x - packet.writeD(0x00); // y - packet.writeD(0x00); // z - + packet.writeD(1); // active ?? + packet.writeD(0); // x + packet.writeD(0); // y + packet.writeD(0); // z packet.writeF(charInfoPackage.getCurrentHp()); // hp cur packet.writeF(charInfoPackage.getCurrentMp()); // mp cur - packet.writeD(charInfoPackage.getSp()); packet.writeD((int) charInfoPackage.getExp()); packet.writeD(charInfoPackage.getLevel()); - packet.writeD(charInfoPackage.getKarma()); // karma - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(charInfoPackage.getPaperdollObjectId(Inventory.PAPERDOLL_UNDER)); packet.writeD(charInfoPackage.getPaperdollObjectId(Inventory.PAPERDOLL_REAR)); packet.writeD(charInfoPackage.getPaperdollObjectId(Inventory.PAPERDOLL_LEAR)); @@ -143,7 +133,6 @@ public class CharSelectInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getPaperdollObjectId(Inventory.PAPERDOLL_BACK)); packet.writeD(charInfoPackage.getPaperdollObjectId(Inventory.PAPERDOLL_LRHAND)); packet.writeD(charInfoPackage.getPaperdollObjectId(Inventory.PAPERDOLL_HAIR)); - packet.writeD(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_UNDER)); packet.writeD(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_REAR)); packet.writeD(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_LEAR)); @@ -160,14 +149,11 @@ public class CharSelectInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_BACK)); packet.writeD(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_LRHAND)); packet.writeD(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_HAIR)); - packet.writeD(charInfoPackage.getHairStyle()); packet.writeD(charInfoPackage.getHairColor()); packet.writeD(charInfoPackage.getFace()); - packet.writeF(charInfoPackage.getMaxHp()); // hp max packet.writeF(charInfoPackage.getMaxMp()); // mp max - final long deleteTime = charInfoPackage.getDeleteTimer(); final int accesslevels = charInfoPackage.getAccessLevel(); int deletedays = 0; @@ -179,21 +165,18 @@ public class CharSelectInfo implements IClientOutgoingPacket { deletedays = -1; // like L2OFF player looks dead if he is banned. } - packet.writeD(deletedays); // days left before // delete .. if != 0 // then char is inactive packet.writeD(charInfoPackage.getClassId()); - if (i == _activeId) { - packet.writeD(0x01); + packet.writeD(1); } else { - packet.writeD(0x00); // c3 auto-select char + packet.writeD(0); // c3 auto-select char } - packet.writeC(charInfoPackage.getEnchantEffect() > 127 ? 127 : charInfoPackage.getEnchantEffect()); } return true; @@ -203,13 +186,11 @@ public class CharSelectInfo implements IClientOutgoingPacket { CharSelectInfoPackage charInfopackage; final List characterList = new ArrayList<>(); - try (Connection con = DatabaseFactory.getConnection()) { final PreparedStatement statement = con.prepareStatement("SELECT account_name, charId, char_name, level, maxHp, curHp, maxMp, curMp, acc, crit, evasion, mAtk, mDef, mSpd, pAtk, pDef, pSpd, runSpd, walkSpd, str, con, dex, _int, men, wit, face, hairStyle, hairColor, sex, heading, x, y, z, movement_multiplier, attack_speed_multiplier, colRad, colHeight, exp, sp, karma, pvpkills, pkkills, clanid, maxload, race, classid, deletetime, cancraft, title, rec_have, rec_left, accesslevel, online, char_slot, lastAccess, base_class FROM characters WHERE account_name=?"); statement.setString(1, _loginName); final ResultSet charList = statement.executeQuery(); - while (charList.next())// fills the package { charInfopackage = restoreChar(charList); @@ -218,14 +199,12 @@ public class CharSelectInfo implements IClientOutgoingPacket characterList.add(charInfopackage); } } - statement.close(); } catch (Exception e) { PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } - return characterList; } @@ -243,7 +222,6 @@ public class CharSelectInfo implements IClientOutgoingPacket charInfopackage.setSp(charList.getInt("sp")); charInfopackage.setLevel(charList.getInt("level")); } - charList.close(); statement.close(); } @@ -256,7 +234,6 @@ public class CharSelectInfo implements IClientOutgoingPacket private CharSelectInfoPackage restoreChar(ResultSet chardata) throws Exception { final int objectId = chardata.getInt("charId"); - // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) @@ -267,11 +244,9 @@ public class CharSelectInfo implements IClientOutgoingPacket { clan.removeClanMember(cha.getName(), 0); } - GameClient.deleteCharByObjId(objectId); return null; } - final String name = chardata.getString("char_name"); final CharSelectInfoPackage charInfopackage = new CharSelectInfoPackage(objectId, name); charInfopackage.setLevel(chardata.getInt("level")); @@ -280,38 +255,29 @@ public class CharSelectInfo implements IClientOutgoingPacket charInfopackage.setMaxMp(chardata.getInt("maxmp")); charInfopackage.setCurrentMp(chardata.getDouble("curmp")); charInfopackage.setKarma(chardata.getInt("karma")); - charInfopackage.setFace(chardata.getInt("face")); charInfopackage.setHairStyle(chardata.getInt("hairstyle")); charInfopackage.setHairColor(chardata.getInt("haircolor")); charInfopackage.setSex(chardata.getInt("sex")); - charInfopackage.setExp(chardata.getLong("exp")); charInfopackage.setSp(chardata.getInt("sp")); charInfopackage.setClanId(chardata.getInt("clanid")); - charInfopackage.setRace(chardata.getInt("race")); - charInfopackage.setAccessLevel(chardata.getInt("accesslevel")); - final int baseClassId = chardata.getInt("base_class"); final int activeClassId = chardata.getInt("classid"); - // if is in subclass, load subclass exp, sp, level info if (baseClassId != activeClassId) { loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId); } - charInfopackage.setClassId(activeClassId); - // Get the augmentation id for equipped weapon int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_LRHAND); if (weaponObjId < 1) { weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); } - /* * Check if the base class is set to zero and alse doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly. */ @@ -323,10 +289,8 @@ public class CharSelectInfo implements IClientOutgoingPacket { charInfopackage.setBaseClassId(baseClassId); } - charInfopackage.setDeleteTimer(deletetime); charInfopackage.setLastAccess(chardata.getLong("lastAccess")); - return charInfopackage; } } \ No newline at end of file diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 446ea7a114..6a0a480b17 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -43,28 +43,26 @@ public class CharSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_SELECTED.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); // ?? packet.writeS(_player.getTitle()); packet.writeD(_sessionId); packet.writeD(_player.getClanId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x01); // active ?? + packet.writeD(1); // active ?? packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); - packet.writeF(_player.getCurrentHp()); packet.writeF(_player.getCurrentMp()); packet.writeD(_player.getSp()); packet.writeD((int) _player.getExp()); packet.writeD(_player.getLevel()); packet.writeD(_player.getKarma()); // thx evill33t - packet.writeD(0x0); // ? + packet.writeD(0); // ? packet.writeD(_player.getINT()); packet.writeD(_player.getSTR()); packet.writeD(_player.getCON()); @@ -73,34 +71,29 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_player.getWIT()); for (int i = 0; i < 30; i++) { - packet.writeD(0x00); + packet.writeD(0); } // packet.writeD(0); //c3 // packet.writeD(0); //c3 // packet.writeD(0); //c3 - packet.writeD(0x00); // c3 work - packet.writeD(0x00); // c3 work - + packet.writeD(0); // c3 work + packet.writeD(0); // c3 work // extra info packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // in-game time - - packet.writeD(0x00); // - - packet.writeD(0x00); // c3 - - packet.writeD(0x00); // c3 InspectorBin - packet.writeD(0x00); // c3 - packet.writeD(0x00); // c3 - packet.writeD(0x00); // c3 - - packet.writeD(0x00); // c3 InspectorBin for 528 client - packet.writeD(0x00); // c3 - packet.writeD(0x00); // c3 - packet.writeD(0x00); // c3 - packet.writeD(0x00); // c3 - packet.writeD(0x00); // c3 - packet.writeD(0x00); // c3 - packet.writeD(0x00); // c3 + packet.writeD(0); // + packet.writeD(0); // c3 + packet.writeD(0); // c3 InspectorBin + packet.writeD(0); // c3 + packet.writeD(0); // c3 + packet.writeD(0); // c3 + packet.writeD(0); // c3 InspectorBin for 528 client + packet.writeD(0); // c3 + packet.writeD(0); // c3 + packet.writeD(0); // c3 + packet.writeD(0); // c3 + packet.writeD(0); // c3 + packet.writeD(0); // c3 + packet.writeD(0); // c3 return true; } } \ No newline at end of file diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharTemplates.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharTemplates.java index 39c3f6639d..fbf84119ab 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharTemplates.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharTemplates.java @@ -40,7 +40,6 @@ public class CharTemplates implements IClientOutgoingPacket { OutgoingPackets.CHAR_TEMPLATES.writeId(packet); packet.writeD(_chars.size()); - for (PlayerTemplate temp : _chars) { packet.writeD(temp.getRace().ordinal()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ClanHallDecoration.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ClanHallDecoration.java index 060ae560f6..743b7da925 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ClanHallDecoration.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ClanHallDecoration.java @@ -52,7 +52,6 @@ public class ClanHallDecoration implements IClientOutgoingPacket { packet.writeC(2); } - // FUNC_RESTORE_MP function = _clanHall.getFunction(ClanHall.FUNC_RESTORE_MP); if ((function == null) || (function.getLvl() == 0)) @@ -70,7 +69,6 @@ public class ClanHallDecoration implements IClientOutgoingPacket packet.writeC(2); packet.writeC(2); } - // FUNC_RESTORE_EXP function = _clanHall.getFunction(ClanHall.FUNC_RESTORE_EXP); if ((function == null) || (function.getLvl() == 0)) @@ -100,7 +98,6 @@ public class ClanHallDecoration implements IClientOutgoingPacket packet.writeC(2); } packet.writeC(0); - // CURTAINS function = _clanHall.getFunction(ClanHall.FUNC_DECO_CURTAINS); if ((function == null) || (function.getLvl() == 0)) @@ -115,7 +112,6 @@ public class ClanHallDecoration implements IClientOutgoingPacket { packet.writeC(2); } - // FUNC_ITEM_CREATE function = _clanHall.getFunction(ClanHall.FUNC_ITEM_CREATE); if ((function == null) || (function.getLvl() == 0)) @@ -130,7 +126,6 @@ public class ClanHallDecoration implements IClientOutgoingPacket { packet.writeC(2); } - // FUNC_SUPPORT function = _clanHall.getFunction(ClanHall.FUNC_SUPPORT); if ((function == null) || (function.getLvl() == 0)) @@ -162,7 +157,6 @@ public class ClanHallDecoration implements IClientOutgoingPacket { packet.writeC(2); } - // FUNC_ITEM_CREATE function = _clanHall.getFunction(ClanHall.FUNC_ITEM_CREATE); if ((function == null) || (function.getLvl() == 0)) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java index b87f1854a1..7c109b078a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java @@ -28,14 +28,15 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ConfirmDlg implements IClientOutgoingPacket { + private static final int TYPE_TEXT = 0; + private static final int TYPE_NUMBER = 1; + private static final int TYPE_NPC_NAME = 2; + private static final int TYPE_ITEM_NAME = 3; + private static final int TYPE_SKILL_NAME = 4; + private static final int TYPE_ZONE_NAME = 7; + private final int _messageId; private int _skillLevel = 1; - private static final int TYPE_ZONE_NAME = 7; - private static final int TYPE_SKILL_NAME = 4; - private static final int TYPE_ITEM_NAME = 3; - private static final int TYPE_NPC_NAME = 2; - private static final int TYPE_NUMBER = 1; - private static final int TYPE_TEXT = 0; private final List _types = new ArrayList<>(); private final List _values = new ArrayList<>(); private int _time = 0; @@ -169,7 +170,6 @@ public class ConfirmDlg implements IClientOutgoingPacket { packet.writeD(_requesterId); } - if ((_time > 0) && (_targetPlayer != null)) { _targetPlayer.addConfirmDlgRequestTime(_requesterId, _time); @@ -177,9 +177,9 @@ public class ConfirmDlg implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index a6b57ce622..41e7d00631 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -43,7 +43,7 @@ public class DeleteObject implements IClientOutgoingPacket { OutgoingPackets.DELETE_OBJECT.writeId(packet); packet.writeD(_objectId); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 return true; } } \ No newline at end of file diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 02d38ffc33..ebe6aa5065 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -63,10 +63,8 @@ public class Die implements IClientOutgoingPacket { return false; } - OutgoingPackets.DIE.writeId(packet); packet.writeD(_objectId); - // NOTE: // 6d 00 00 00 00 - to nearest village // 6d 01 00 00 00 - to hide away @@ -74,12 +72,11 @@ public class Die implements IClientOutgoingPacket // 6d 03 00 00 00 - to siege HQ // sweepable // 6d 04 00 00 00 - FIXED - packet.writeD(_canTeleport ? 0x01 : 0); // 6d 00 00 00 00 - to nearest village - + packet.writeD(_canTeleport ? 1 : 0); // 6d 00 00 00 00 - to nearest village if (_canTeleport && (_clan != null)) { SiegeClan siegeClan = null; - Boolean isInDefense = false; + boolean isInDefense = false; final Castle castle = CastleManager.getInstance().getCastle(_creature); final Fort fort = FortManager.getInstance().getFort(_creature); if ((castle != null) && castle.getSiege().isInProgress()) @@ -100,20 +97,18 @@ public class Die implements IClientOutgoingPacket isInDefense = true; } } - - packet.writeD(_clan.getHideoutId() > 0 ? 0x01 : 0x00); // 6d 01 00 00 00 - to hide away - packet.writeD((_clan.getCastleId() > 0) || (_clan.getFortId() > 0) || isInDefense ? 0x01 : 0x00); // 6d 02 00 00 00 - to castle - packet.writeD((siegeClan != null) && !isInDefense && !siegeClan.getFlag().isEmpty() ? 0x01 : 0x00); // 6d 03 00 00 00 - to siege HQ + packet.writeD(_clan.getHideoutId() > 0 ? 1 : 0); // 6d 01 00 00 00 - to hide away + packet.writeD((_clan.getCastleId() > 0) || (_clan.getFortId() > 0) || isInDefense ? 1 : 0); // 6d 02 00 00 00 - to castle + packet.writeD((siegeClan != null) && !isInDefense && !siegeClan.getFlag().isEmpty() ? 1 : 0); // 6d 03 00 00 00 - to siege HQ } else { - packet.writeD(0x00); // 6d 01 00 00 00 - to hide away - packet.writeD(0x00); // 6d 02 00 00 00 - to castle - packet.writeD(0x00); // 6d 03 00 00 00 - to siege HQ + packet.writeD(0); // 6d 01 00 00 00 - to hide away + packet.writeD(0); // 6d 02 00 00 00 - to castle + packet.writeD(0); // 6d 03 00 00 00 - to siege HQ } - - packet.writeD(_sweepable ? 0x01 : 0x00); // sweepable (blue glow) - packet.writeD(_allowFixedRes ? 0x01 : 0x00); // 6d 04 00 00 00 - to FIXED + packet.writeD(_sweepable ? 1 : 0); // sweepable (blue glow) + packet.writeD(_allowFixedRes ? 1 : 0); // 6d 04 00 00 00 - to FIXED return true; } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java index c83e72f2c4..0d4b035fcb 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java @@ -41,7 +41,7 @@ public class DoorInfo implements IClientOutgoingPacket OutgoingPackets.DOOR_INFO.writeId(packet); packet.writeD(_door.getObjectId()); packet.writeD(_door.getDoorId()); - packet.writeD(_showHp ? 0x01 : 0x00); + packet.writeD(_showHp ? 1 : 0); return true; } } \ No newline at end of file diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index a508f44167..806f86fd5a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -47,21 +47,19 @@ public class DropItem implements IClientOutgoingPacket packet.writeD(_objectId); packet.writeD(_item.getObjectId()); packet.writeD(_item.getItemId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item if (_item.isStackable()) { - packet.writeD(0x01); + packet.writeD(1); } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(_item.getCount()); - packet.writeD(1); // unknown return true; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java index fc78d506ae..74b25fe105 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java @@ -55,7 +55,7 @@ public class Earthquake implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_intensity); packet.writeD(_duration); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown return true; } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java index a6c77b97fe..95a8c43355 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java @@ -122,7 +122,6 @@ public class EquipUpdate implements IClientOutgoingPacket break; } } - packet.writeD(bodypart); return true; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmCancelItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmCancelItem.java index edd9e9f5e6..c1a86e87e8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmCancelItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmCancelItem.java @@ -42,7 +42,7 @@ public class ExConfirmCancelItem implements IClientOutgoingPacket packet.writeD(0x27); packet.writeD(0x2006); packet.writeD(_price); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java index 98e988abe7..eb3392c572 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java @@ -38,7 +38,6 @@ public class ExCursedWeaponList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet); - packet.writeD(_cursedWeaponIds.size()); for (Integer i : _cursedWeaponIds) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java index b8a3226daa..db190f50fa 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java @@ -43,7 +43,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet); - if (!_cursedWeaponInfo.isEmpty()) { packet.writeD(_cursedWeaponInfo.size()); @@ -51,7 +50,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { packet.writeD(w.id); packet.writeD(w.activated); - packet.writeD(w.loc.getX()); packet.writeD(w.loc.getY()); packet.writeD(w.loc.getZ()); @@ -72,10 +70,8 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { /** The location. */ public Location loc; - /** The id. */ public int id; - /** The activated. */ public int activated; // 0 - not activated ? 1 - activated diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index c61bf29aa0..c531ca7d1e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -66,15 +66,12 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_INFO.writeId(packet); - packet.writeD(_id); packet.writeD(_level); packet.writeD(_spCost); packet.writeD(_xpCost); packet.writeD(_rate); - packet.writeD(_reqs.size()); - for (Req temp : _reqs) { packet.writeD(temp.type); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java index ee556c9bfc..19495c8473 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java @@ -56,7 +56,6 @@ public class ExEnchantSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_LIST.writeId(packet); - packet.writeD(_skills.size()); for (Skill sk : _skills) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingHpRegen.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingHpRegen.java index dc0a8f17c3..4c0def1b45 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingHpRegen.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingHpRegen.java @@ -51,7 +51,6 @@ public class ExFishingHpRegen implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FISHING_HP_REGEN.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeD(_time); packet.writeD(_fishHP); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStart.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStart.java index b37e997902..7661e7ffae 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStart.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStart.java @@ -53,10 +53,10 @@ public class ExFishingStart implements IClientOutgoingPacket packet.writeD(_x); // x poisson packet.writeD(_y); // y poisson packet.writeD(_z); // z poisson - packet.writeC(0x00); // night lure - packet.writeC(0x00); // ?? - packet.writeC((_fishType >= 7) && (_fishType <= 9) ? 0x01 : 0x00); // 0 = day lure 1 = night lure - packet.writeC(0x00); + packet.writeC(0); // night lure + packet.writeC(0); // ?? + packet.writeC((_fishType >= 7) && (_fishType <= 9) ? 1 : 0); // 0 = day lure 1 = night lure + packet.writeC(0); return true; } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStartCombat.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStartCombat.java index bf91a478d8..29f7f9501a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStartCombat.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStartCombat.java @@ -47,7 +47,6 @@ public class ExFishingStartCombat implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FISHING_START_COMBAT.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeD(_time); packet.writeD(_hp); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java index e7ae194a59..b7ca841de2 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java @@ -30,10 +30,8 @@ public class ExGetBossRecord implements IClientOutgoingPacket { /** The _boss record info. */ private final Map _bossRecordInfo; - /** The _ranking. */ private final int _ranking; - /** The _total points. */ private final int _totalPoints; @@ -58,10 +56,10 @@ public class ExGetBossRecord implements IClientOutgoingPacket packet.writeD(_totalPoints); if (_bossRecordInfo == null) { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } else { @@ -70,7 +68,7 @@ public class ExGetBossRecord implements IClientOutgoingPacket { packet.writeD(entry.getKey()); packet.writeD(entry.getValue()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? } } return true; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index 7a5339cbdf..27734f7c4a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -42,7 +42,6 @@ public class ExHeroList implements IClientOutgoingPacket { OutgoingPackets.EX_HERO_LIST.writeId(packet); packet.writeD(_heroList.size()); - for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 700a38c802..973c0f9d95 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -53,7 +53,6 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(packet); - // If the mode is 0 and the activeChar isn't the PartyRoom leader, return an empty list. if (_mode == 0) { @@ -66,7 +65,6 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket return true; } } - for (Player cha : PartyMatchWaitingList.getInstance().getPlayers()) { // Don't add yourself in the list @@ -74,21 +72,17 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket { continue; } - if (!cha.isPartyWaiting()) { PartyMatchWaitingList.getInstance().removePlayer(cha); continue; } - if ((cha.getLevel() < _minLevel) || (cha.getLevel() > _maxLevel)) { continue; } - _members.add(cha); } - int count = 0; final int size = _members.size(); packet.writeD(1); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java index 6392dbba23..7d28cf5586 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java @@ -38,7 +38,6 @@ public class ExMPCCShowPartyMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_SHOW_PARTY_MEMBER_INFO.writeId(packet); - packet.writeD(_party.getMemberCount()); for (Player pc : _party.getPartyMembers()) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java index 7184c63000..bfcb7c188b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.network.OutgoingPackets; /** - * Fromat: (ch) (just a trigger) + * Format: (ch) (just a trigger) * @author -Wooden- */ public class ExMailArrived implements IClientOutgoingPacket diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java index 88bc3c383e..2eaa64c65c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java @@ -40,13 +40,10 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket { return false; } - OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet); - packet.writeS(_channel.getChannelLeader().getName()); // packet.writeD(0); // Channel loot packet.writeD(_channel.getMemberCount()); - packet.writeD(_channel.getParties().size()); for (Party p : _channel.getParties()) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java index f8002321cb..2201f7c3f0 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java @@ -46,12 +46,10 @@ public class ExOlympiadMode implements IClientOutgoingPacket { return false; } - if (_mode == 3) { _player.setObserverMode(true); } - OutgoingPackets.EX_OLYMPIAD_MODE.writeId(packet); packet.writeC(_mode); return true; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java index 28016623e8..359c937455 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java @@ -58,7 +58,6 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket _periodType = 2; _pointType = 2; } - _remainTime = hour; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java index 023b5a0b41..c4cbee2231 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java @@ -46,7 +46,7 @@ public class ExPledgeEmblem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_crestId); if (_data != null) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java index 7044264a80..121d1d5af9 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java @@ -177,9 +177,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(65535); // has to do something with display range and angle packet.writeD(65535); // has to do something with display range and angle - packet.writeD(_points.size() + _lines.size()); - for (Point point : _points) { packet.writeC(1); // Its the type in this case Point @@ -193,7 +191,6 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(point.getY()); packet.writeD(point.getZ()); } - for (Line line : _lines) { packet.writeC(2); // Its the type in this case Line diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index 0b71f2c32b..c3f542a54e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -28,7 +28,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; * Format: ch cddd[ddddcdcdcd] c - id (0xFE) h - sub id (0x1D) c d - manor id d d - size [ d - crop id d - residual buy d - start buy d - buy price c - reward type d - seed level c - reward 1 items d - reward 1 item id c - reward 2 items d - reward 2 item id ] * @author l3x */ - public class ExShowCropInfo implements IClientOutgoingPacket { private List _crops; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index bc6ef6f7ee..34a37c2e50 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -89,10 +89,8 @@ public class ExShowCropSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_count); // size - for (int i = 0; i < _count; i++) { packet.writeD(_cropData[(i * 14) + 0]); // crop id @@ -101,16 +99,13 @@ public class ExShowCropSetting implements IClientOutgoingPacket packet.writeD(_cropData[(i * 14) + 2]); // reward 1 id packet.writeC(1); packet.writeD(_cropData[(i * 14) + 3]); // reward 2 id - packet.writeD(_cropData[(i * 14) + 4]); // next sale limit packet.writeD(_cropData[(i * 14) + 5]); // ??? packet.writeD(_cropData[(i * 14) + 6]); // min crop price packet.writeD(_cropData[(i * 14) + 7]); // max crop price - packet.writeD(_cropData[(i * 14) + 8]); // today buy packet.writeD(_cropData[(i * 14) + 9]); // today price packet.writeC(_cropData[(i * 14) + 10]); // today reward - packet.writeD(_cropData[(i * 14) + 11]); // next buy packet.writeD(_cropData[(i * 14) + 12]); // next price packet.writeC(_cropData[(i * 14) + 13]); // next reward diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 047367b3cb..42e66ad0c7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -54,10 +54,8 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet); - packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index cf42f8ae05..38b4ee63f0 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -84,10 +84,8 @@ public class ExShowSeedSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_count); // size - for (int i = 0; i < _count; i++) { packet.writeD(_seedData[(i * 12) + 0]); // seed id @@ -96,12 +94,10 @@ public class ExShowSeedSetting implements IClientOutgoingPacket packet.writeD(_seedData[(i * 12) + 2]); // reward 1 id packet.writeC(1); packet.writeD(_seedData[(i * 12) + 3]); // reward 2 id - packet.writeD(_seedData[(i * 12) + 4]); // next sale limit packet.writeD(_seedData[(i * 12) + 5]); // price for castle to produce 1 packet.writeD(_seedData[(i * 12) + 6]); // min seed price packet.writeD(_seedData[(i * 12) + 7]); // max seed price - packet.writeD(_seedData[(i * 12) + 8]); // today sales packet.writeD(_seedData[(i * 12) + 9]); // today price packet.writeD(_seedData[(i * 12) + 10]); // next sales diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 2c74c771dc..0d933429a4 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -31,7 +31,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; * format(packet 0xFE) ch dd [ddddcdcdddc] c - id h - sub id d - manor id d - size [ d - Object id d - crop id d - seed level c d - reward 1 id c d - reward 2 id d - manor d - buy residual d - buy price d - reward ] * @author l3x */ - public class ExShowSellCropList implements IClientOutgoingPacket { private int _manorId = 1; @@ -43,7 +42,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _manorId = manorId; _castleCrops = new HashMap<>(); _cropsItems = new HashMap<>(); - final List allCrops = ManorSeedData.getInstance().getAllCrops(); for (int cropId : allCrops) { @@ -53,7 +51,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _cropsItems.put(cropId, item); } } - for (CropProcure crop : crops) { if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) @@ -67,10 +64,8 @@ public class ExShowSellCropList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_cropsItems.size()); // size - for (Item item : _cropsItems.values()) { packet.writeD(item.getObjectId()); // Object id @@ -80,7 +75,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket packet.writeD(ManorSeedData.getInstance().getRewardItem(item.getItemId(), 1)); // reward 1 id packet.writeC(1); packet.writeD(ManorSeedData.getInstance().getRewardItem(item.getItemId(), 2)); // reward 2 id - if (_castleCrops.containsKey(item.getItemId())) { final CropProcure crop = _castleCrops.get(item.getItemId()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index d3c1e08f37..d896aa5149 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -52,7 +52,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet); - packet.writeD(_inventory); packet.writeD(_warehouse); packet.writeD(_freight); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java index f9fd99f0ea..ec3863c62e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java @@ -26,7 +26,6 @@ public class ExVariationCancelResult implements IClientOutgoingPacket { /** The _close window. */ private final int _closeWindow; - /** The _unk1. */ private final int _unk1; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java index 6e8bd5de5f..7e30c6c891 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java @@ -26,10 +26,8 @@ public class ExVariationResult implements IClientOutgoingPacket { /** The _stat12. */ private final int _stat12; - /** The _stat34. */ private final int _stat34; - /** The _unk3. */ private final int _unk3; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java index c69f5bfe64..d8a287c3ff 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java @@ -37,7 +37,6 @@ public class FakePlayerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeD(_activeChar.getX()); packet.writeD(_activeChar.getY()); packet.writeD(_activeChar.getZ()); @@ -58,7 +57,6 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_activeChar.getFakePlayer().PAPERDOLL_HAIR()); packet.writeD(_activeChar.getFakePlayer().PAPERDOLL_RHAND()); packet.writeD(_activeChar.getFakePlayer().PAPERDOLL_HAIR()); - packet.writeD(_activeChar.getFakePlayer().getPvpFlag() ? 1 : 0); packet.writeD(_activeChar.getFakePlayer().getKarma()); packet.writeD(_activeChar.getMAtkSpd()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/FriendList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/FriendList.java index 1918bb74bb..7431fc1203 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/FriendList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/FriendList.java @@ -67,8 +67,8 @@ public class FriendList implements IClientOutgoingPacket { packet.writeD(friend._objId); packet.writeS(friend._name); - packet.writeD(friend._online ? 0x01 : 0x00); - packet.writeD(friend._online ? friend._objId : 0x00); + packet.writeD(friend._online ? 1 : 0); + packet.writeD(friend._online ? friend._objId : 0); } return true; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index 2ef8fb0351..ced052e594 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -46,9 +46,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket final float moveMultiplier = _player.getMovementSpeedMultiplier(); final int runSpd = (int) (_player.getRunSpeed() / moveMultiplier); final int walkSpd = (int) (_player.getWalkSpeed() / moveMultiplier); - OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -74,7 +72,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); packet.writeD(0x28); // unknown - packet.writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_UNDER)); packet.writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_REAR)); packet.writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_LEAR)); @@ -91,7 +88,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_BACK)); packet.writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_LRHAND)); packet.writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_HAIR)); - packet.writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_UNDER)); packet.writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_REAR)); packet.writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_LEAR)); @@ -109,7 +105,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_LRHAND)); packet.writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_HAIR)); packet.writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_FACE)); - packet.writeD(_player.getPAtk(null)); packet.writeD(_player.getPAtkSpd()); packet.writeD(_player.getPDef(null)); @@ -117,15 +112,11 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket 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); packet.writeD(walkSpd); packet.writeD(runSpd); // swimspeed @@ -141,8 +132,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeD(_player.isGM() ? 0x01 : 0x00); // builder level - + packet.writeD(_player.isGM() ? 1 : 0); // builder level packet.writeS(_player.getTitle()); packet.writeD(_player.getClanId()); // pledge id packet.writeD(_player.getClanCrestId()); // pledge crest id @@ -152,23 +142,17 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeC(_player.hasDwarvenCraft() ? 1 : 0); packet.writeD(_player.getPkKills()); packet.writeD(_player.getPvpKills()); - packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - // packet.writeD(0x00); // special effects? circles around player... + // packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); - - // packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + // packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window // packet.writeC(321); - // packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window - - // packet.writeC(_player.isNoble() ? 0x01 : 0x00); - // packet.writeC(_player.isHero() ? 0x01 : 0x00); - + // packet.writeC(_player.isNoble() ? 1 : 0); + // packet.writeC(_player.isHero() ? 1 : 0); // packet.writeD(_player.getAppearance().getNameColor()); // packet.writeD(_player.getAppearance().getTitleColor()); return true; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewHennaInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewHennaInfo.java index f1d59034a7..d0b4e57cdc 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewHennaInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewHennaInfo.java @@ -45,16 +45,13 @@ public class GMViewHennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_HENNA_INFO.writeId(packet); - packet.writeC(_player.getHennaStatINT()); packet.writeC(_player.getHennaStatSTR()); packet.writeC(_player.getHennaStatCON()); packet.writeC(_player.getHennaStatMEN()); packet.writeC(_player.getHennaStatDEX()); packet.writeC(_player.getHennaStatWIT()); - packet.writeD(3); // slots? - packet.writeD(_count); // size for (int i = 0; i < _count; i++) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index 042d78a632..dc4716f2e2 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -45,23 +45,21 @@ public class GMViewItemList implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_ITEM_LIST.writeId(packet); packet.writeS(_playerName); packet.writeD(_player.getInventoryLimit()); // inventory limit - packet.writeH(0x01); // show window ?? + packet.writeH(1); // show window ?? packet.writeH(_items.size()); - for (Item temp : _items) { if ((temp == null) || (temp.getItem() == null)) { continue; } - packet.writeH(temp.getItem().getType1()); packet.writeD(temp.getObjectId()); packet.writeD(temp.getItemId()); packet.writeD(temp.getCount()); packet.writeH(temp.getItem().getType2()); packet.writeH(temp.getCustomType1()); - packet.writeH(temp.isEquipped() ? 0x01 : 0x00); + packet.writeH(temp.isEquipped() ? 1 : 0); packet.writeD(temp.getItem().getBodyPart()); packet.writeH(temp.getEnchantLevel()); packet.writeH(temp.getCustomType2()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index 6fc62d7c48..c3b2a52d0d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -56,12 +56,10 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_player.getLevel()); packet.writeD(_clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis() ? 3 : 0); packet.writeD(0); - packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 packet.writeD(_clan.getAllyCrestId()); // c2 packet.writeD(_clan.isAtWar()); // c3 - final Collection members = _clan.getMembers(); packet.writeD(members.size()); for (ClanMember member : members) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewQuestList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewQuestList.java index 52c456313b..65b0285110 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewQuestList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewQuestList.java @@ -42,7 +42,6 @@ public class GMViewQuestList implements IClientOutgoingPacket { OutgoingPackets.GM_VIEW_QUEST_LIST.writeId(packet); packet.writeS(_player.getName()); - final List questList = _player.getAllActiveQuests(); packet.writeH(questList.size()); // quest count for (Quest q : questList) @@ -54,7 +53,6 @@ public class GMViewQuestList implements IClientOutgoingPacket packet.writeD(0); continue; } - packet.writeD(qs.getCond()); // stage of quest progress } return true; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java index 4eee43c679..2e0de53045 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -45,7 +45,7 @@ public class GMViewSkillInfo implements IClientOutgoingPacket packet.writeD(skill.isPassive() ? 1 : 0); packet.writeD(skill.getLevel()); packet.writeD(skill.getId()); - // packet.writeC(0x00); // c5 + // packet.writeC(0); // c5 } return true; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index 65e67c537d..92122107c5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -57,17 +57,14 @@ public class GMViewWarehouseWithdrawList implements IClientOutgoingPacket packet.writeS(_playerName); packet.writeD(_money); packet.writeH(_items.size()); - for (Item item : _items) { packet.writeH(item.getItem().getType1()); - packet.writeD(item.getObjectId()); packet.writeD(item.getItemId()); packet.writeD(item.getCount()); packet.writeH(item.getItem().getType2()); packet.writeH(item.getCustomType1()); - switch (item.getItem().getType2()) { case ItemTemplate.TYPE2_WEAPON: @@ -87,12 +84,11 @@ public class GMViewWarehouseWithdrawList implements IClientOutgoingPacket { packet.writeD(item.getItem().getBodyPart()); packet.writeH(item.getEnchantLevel()); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); break; } } - packet.writeD(item.getObjectId()); } return true; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index 717b548b8d..9c28a6d459 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -41,7 +41,6 @@ public class GetItem implements IClientOutgoingPacket OutgoingPackets.GET_ITEM.writeId(packet); packet.writeD(_playerId); packet.writeD(_item.getObjectId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 0319e3a4fa..bb165224a0 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -41,7 +41,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeD(_player.getAdena()); packet.writeD(3); packet.writeD(_hennaEquipList.size()); - for (Henna temp : _hennaEquipList) { // Player must have at least one dye in inventory to be able to see the henna that can be applied with it. diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 1146173d86..720d0d4b35 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -45,14 +45,12 @@ public class HennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_INFO.writeId(packet); - packet.writeC(_player.getHennaStatINT()); // equip INT packet.writeC(_player.getHennaStatSTR()); // equip STR packet.writeC(_player.getHennaStatCON()); // equip CON packet.writeC(_player.getHennaStatMEN()); // equip MEM packet.writeC(_player.getHennaStatDEX()); // equip DEX packet.writeC(_player.getHennaStatWIT()); // equip WIT - // Henna slots int classId = _player.getClassId().level(); if (classId == 1) @@ -67,7 +65,6 @@ public class HennaInfo implements IClientOutgoingPacket { packet.writeD(0); } - packet.writeD(_count); // size for (int i = 0; i < _count; i++) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemInfo.java index ff97978c0d..321c84dfb4 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemInfo.java @@ -42,7 +42,6 @@ public class HennaItemInfo implements IClientOutgoingPacket packet.writeD(_henna.getPrice()); // total amount of adenas required to draw symbol packet.writeD(1); // able to draw or not 0 is false and 1 is true packet.writeD(_player.getAdena()); - packet.writeD(_player.getINT()); // current INT packet.writeC(_player.getINT() + _henna.getINT()); // equip INT packet.writeD(_player.getSTR()); // current STR diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index bbfd432bfc..8bcd2c3400 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -42,7 +42,6 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket packet.writeD(_henna.getPrice() / 5); // amount of required adenas packet.writeD(1); // able to remove or not 0 is false and 1 is true packet.writeD(_player.getAdena()); - packet.writeD(_player.getINT()); // current INT packet.writeC(_player.getINT() - _henna.getINT()); // equip INT packet.writeD(_player.getSTR()); // current STR diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index e7a130fff6..c04ed908d1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -37,7 +37,6 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(_player.getAdena()); packet.writeD(_player.getHennaEmptySlots()); packet.writeD(Math.abs(_player.getHennaEmptySlots() - 3)); - for (int i = 1; i <= 3; i++) { final Henna henna = _player.getHenna(i); @@ -47,7 +46,7 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(henna.getDyeId()); packet.writeD(Henna.getRequiredDyeAmount() / 2); packet.writeD(henna.getPrice() / 5); - packet.writeD(0x01); + packet.writeD(1); } } return true; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index f492155d0d..8fd650c95b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -50,7 +50,7 @@ public class ItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ITEM_LIST.writeId(packet); - packet.writeH(_showWindow ? 0x01 : 0x00); + packet.writeH(_showWindow ? 1 : 0); packet.writeH(_items.size()); for (Item temp : _items) { @@ -64,7 +64,7 @@ public class ItemList implements IClientOutgoingPacket packet.writeD(temp.getCount()); packet.writeH(temp.getItem().getType2()); packet.writeH(temp.getCustomType1()); - packet.writeH(temp.isEquipped() ? 0x01 : 0x00); + packet.writeH(temp.isEquipped() ? 1 : 0); packet.writeD(temp.getItem().getBodyPart()); packet.writeH(temp.getEnchantLevel()); // race tickets diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java index e4adce2daa..24faf515cf 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java @@ -45,7 +45,6 @@ public class JoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PARTY.writeId(packet); - packet.writeD(_response); return true; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java index 4e2f2127ec..7db002454c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java @@ -35,7 +35,6 @@ public class JoinPledge implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PLEDGE.writeId(packet); - packet.writeD(_pledgeId); return true; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index 38d6af6dec..4868af3d52 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -38,7 +38,7 @@ public class KeyPacket implements IClientOutgoingPacket packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok packet.writeB(_key); packet.writeD(Config.SERVER_ID); // server id - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MagicEffectIcons.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MagicEffectIcons.java index 773ab3a68f..f4c1ab7e5c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MagicEffectIcons.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MagicEffectIcons.java @@ -57,7 +57,6 @@ public class MagicEffectIcons implements IClientOutgoingPacket { return; } - if (debuff) { _debuffs.add(new Effect(skillId, level, duration)); @@ -72,14 +71,11 @@ public class MagicEffectIcons implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_EFFECT_ICONS.writeId(packet); - packet.writeH(_effects.size() + _debuffs.size()); - for (Effect temp : _effects) { packet.writeD(temp._skillId); packet.writeH(temp._level); - if (temp._duration == -1) { packet.writeD(-1); @@ -89,12 +85,10 @@ public class MagicEffectIcons implements IClientOutgoingPacket packet.writeD(temp._duration / 1000); } } - for (Effect temp : _debuffs) { packet.writeD(temp._skillId); packet.writeH(temp._level); - if (temp._duration == -1) { packet.writeD(-1); @@ -104,7 +98,6 @@ public class MagicEffectIcons implements IClientOutgoingPacket packet.writeD(temp._duration / 1000); } } - return true; } } \ No newline at end of file diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java index fce15a399f..3773099a5b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java @@ -42,7 +42,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket _objectId = creature.getObjectId(); _skillId = skillId; _skillLevel = skillLevel; - if (targets != null) { _numberOfTargets = targets.size(); @@ -54,7 +53,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket _targets = new ArrayList<>(); _targets.add(creature); } - _singleTargetId = 0; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java index 20c0ebe96d..04a8281b65 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java @@ -76,12 +76,12 @@ public class MagicSkillUse implements IClientOutgoingPacket packet.writeD(_z); // if (_critical) // ? // { - // writeD(0x01); - // writeH(0x00); + // writeD(1); + // writeH(0); // } // else // { - packet.writeD(0x00); + packet.writeD(0); // } packet.writeD(_targetx); packet.writeD(_targety); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index e9c7228b8e..cdb12d1b27 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -46,11 +46,9 @@ public class MonRaceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MON_RACE_INFO.writeId(packet); - packet.writeD(_unknown1); packet.writeD(_unknown2); packet.writeD(8); - for (int i = 0; i < 8; i++) { packet.writeD(_monsters[i].getObjectId()); // npcObjectID @@ -77,7 +75,6 @@ public class MonRaceInfo implements IClientOutgoingPacket } packet.writeD(0); } - return true; } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java index 69e15f58d0..1b4775ea64 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java @@ -49,13 +49,10 @@ public class MoveToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java index 43ce2891d1..04f10aa847 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java @@ -38,13 +38,11 @@ public class MoveToLocationInVehicle implements IClientOutgoingPacket { return; } - final Player player = (Player) actor; if (player.getBoat() == null) { return; } - _objectId = player.getObjectId(); _boatId = player.getBoat().getObjectId(); _destination = destination; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java index d254072ff2..679bb1289d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java @@ -59,11 +59,9 @@ public class MoveToPawn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_PAWN.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetId); packet.writeD(_distance); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index 2ea4bfe8ed..1f82a88b8e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -51,7 +51,6 @@ public class MultiSellList implements IClientOutgoingPacket packet.writeD(_finished); // finished packet.writeD(0x28); // size of pages packet.writeD(_list == null ? 0 : _list.getEntries().size()); // list length - if (_list != null) { for (MultiSellEntry ent : _list.getEntries()) @@ -60,7 +59,6 @@ public class MultiSellList implements IClientOutgoingPacket packet.writeC(1); packet.writeH(ent.getProducts().size()); packet.writeH(ent.getIngredients().size()); - for (MultiSellIngredient i : ent.getProducts()) { packet.writeH(i.getItemId()); @@ -69,7 +67,6 @@ public class MultiSellList implements IClientOutgoingPacket packet.writeD(i.getItemCount()); packet.writeH(i.getEnchantmentLevel()); // enchtant level } - for (MultiSellIngredient i : ent.getIngredients()) { final int items = i.getItemId(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java index b9c3d1b6f1..5bf1eb43f7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java @@ -47,7 +47,6 @@ public class MyTargetSelected implements IClientOutgoingPacket { /** The _object id. */ private final int _objectId; - /** The _color. */ private final int _color; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index 0a96399834..cc15fa1a44 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -129,13 +129,10 @@ public class NpcHtmlMessage implements IClientOutgoingPacket { /** The _npc obj id. */ private final int _npcObjId; - /** The _html. */ private String _html; - /** The _html file. */ private String _file = null; - /** The _validate. */ private final boolean _validate = true; @@ -167,7 +164,6 @@ public class NpcHtmlMessage implements IClientOutgoingPacket buildBypassCache(player); buildLinksCache(player); } - if ((_file != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS) { BuilderUtil.sendHtmlMessage(player, _file.substring(10)); @@ -186,14 +182,12 @@ public class NpcHtmlMessage implements IClientOutgoingPacket _html = ""; return; } - if (text.length() > 8192) { PacketLogger.warning("Html is too long! This will crash the client!"); _html = "Html was too long,
Try to use DB for this action"; return; } - _html = text; // html code must not exceed 8192 bytes } @@ -211,7 +205,6 @@ public class NpcHtmlMessage implements IClientOutgoingPacket PacketLogger.warning("Missing html page " + path); return false; } - _file = path; setHtml(content); return true; @@ -257,7 +250,6 @@ public class NpcHtmlMessage implements IClientOutgoingPacket { return; } - player.clearBypass(); final int len = _html.length(); for (int i = 0; i < len; i++) @@ -268,7 +260,6 @@ public class NpcHtmlMessage implements IClientOutgoingPacket { break; } - start += 10; i = start; final int finish2 = _html.indexOf('$', start); @@ -294,7 +285,6 @@ public class NpcHtmlMessage implements IClientOutgoingPacket { return; } - player.clearLinks(); final int len = _html.length(); for (int i = 0; i < len; i++) @@ -305,7 +295,6 @@ public class NpcHtmlMessage implements IClientOutgoingPacket { break; } - i = start; player.addLink(_html.substring(start + 5, finish).trim()); } @@ -317,7 +306,7 @@ public class NpcHtmlMessage implements IClientOutgoingPacket OutgoingPackets.NPC_HTML_MESSAGE.writeId(packet); packet.writeD(_npcObjId); packet.writeS(_html); - packet.writeD(0x00); + packet.writeD(0); return true; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java index 39c0a46ef5..0eb54cdcfe 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java @@ -27,9 +27,9 @@ import org.l2jmobius.gameserver.model.actor.instance.FortSiegeGuard; import org.l2jmobius.gameserver.model.actor.instance.Guard; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.instance.SiegeGuard; import org.l2jmobius.gameserver.model.actor.instance.SiegeNpc; -import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -81,7 +81,6 @@ public class NpcInfo implements IClientOutgoingPacket attacker.broadcastPacket(new StopRotation(cha, cha.getHeading(), 0)); return; } - _creature = cha; _displayId = cha.getTemplate().getDisplayId(); _isAttackable = cha.isAutoAttackable(attacker); @@ -90,7 +89,6 @@ public class NpcInfo implements IClientOutgoingPacket _isSummoned = false; _collisionHeight = cha.getTemplate().getFCollisionHeight(); _collisionRadius = cha.getTemplate().getFCollisionRadius(); - if (Config.SHOW_NPC_CLAN_CREST && (cha.getCastle() != null) && (cha.getCastle().getOwnerId() != 0) && !cha.isMonster() && !cha.isArtefact() && !(cha instanceof ControlTower)) { if (cha.isInsideZone(ZoneId.TOWN) || cha.isInsideZone(ZoneId.CASTLE) // @@ -103,12 +101,10 @@ public class NpcInfo implements IClientOutgoingPacket _allyId = clan.getAllyId(); } } - if (cha.getTemplate().isServerSideName()) { _name = cha.getTemplate().getName(); } - if (Config.CHAMPION_ENABLE && cha.isChampion()) { _title = Config.CHAMP_TITLE; @@ -121,7 +117,6 @@ public class NpcInfo implements IClientOutgoingPacket { _title = cha.getTitle(); } - // Custom level titles if (cha.isMonster() && (Config.SHOW_NPC_LEVEL || Config.SHOW_NPC_AGGRESSION)) { @@ -150,7 +145,6 @@ public class NpcInfo implements IClientOutgoingPacket } _title = cha.isChampion() ? Config.CHAMP_TITLE + " " + t1 : t1; } - _x = _creature.getX(); _y = _creature.getY(); _z = _creature.getZ(); @@ -183,7 +177,6 @@ public class NpcInfo implements IClientOutgoingPacket _name = _creature.getName(); _title = cha.getTitle(); } - _x = _creature.getX(); _y = _creature.getY(); _z = _creature.getZ(); @@ -199,16 +192,10 @@ public class NpcInfo implements IClientOutgoingPacket @Override public boolean write(PacketWriter packet) { - if (_creature == null) + if ((_creature == null) || ((_creature instanceof Summon) && (((Summon) _creature).getOwner() != null) && ((Summon) _creature).getOwner().getAppearance().isInvisible())) { return false; } - - if ((_creature instanceof Summon) && (((Summon) _creature).getOwner() != null) && ((Summon) _creature).getOwner().getAppearance().isInvisible()) - { - return false; - } - OutgoingPackets.NPC_INFO.writeId(packet); packet.writeD(_creature.getObjectId()); packet.writeD(_displayId + 1000000); // npctype id @@ -217,7 +204,7 @@ public class NpcInfo implements IClientOutgoingPacket packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); packet.writeD(_runSpd); @@ -243,10 +230,9 @@ public class NpcInfo implements IClientOutgoingPacket 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); - if (_creature instanceof Summon) { - packet.writeD(0x01); // Title color 0=client default + packet.writeD(1); // Title color 0=client default packet.writeD(((Summon) _creature).getPvpFlag()); packet.writeD(((Summon) _creature).getKarma()); } @@ -256,26 +242,23 @@ public class NpcInfo implements IClientOutgoingPacket packet.writeD(0); packet.writeD(0); } - packet.writeD(_creature.getAbnormalEffect()); // C2 packet.writeD(_clanId); // C2 packet.writeD(_clanCrest); // C2 packet.writeD(_allyId); // C2 packet.writeD(_allyCrest); // C2 - packet.writeC(0x00); // C2 - + packet.writeC(0); // C2 if (Config.CHAMPION_ENABLE) { packet.writeC(_creature.isChampion() ? Config.CHAMPION_AURA : 0); } else { - packet.writeC(0x00); // C3 team circle 1-blue, 2-red + packet.writeC(0); // C3 team circle 1-blue, 2-red } - packet.writeF(_collisionRadius); packet.writeF(_collisionHeight); - packet.writeD(0x00); // C4 + packet.writeD(0); // C4 return true; } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java index 7f07473ff4..58fce38644 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java @@ -47,9 +47,9 @@ public class ObservationMode implements IClientOutgoingPacket packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeC(0x00); + packet.writeC(0); packet.writeC(0xc0); - packet.writeC(0x00); + packet.writeC(0); return true; } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index 022ace542b..d367081144 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -42,7 +42,6 @@ public class PackageSendableList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet); - packet.writeD(_playerObjId); packet.writeD(_adena); packet.writeD(_items.size()); @@ -53,11 +52,11 @@ public class PackageSendableList implements IClientOutgoingPacket packet.writeD(item.getItemId()); packet.writeD(item.getCount()); packet.writeH(item.getItem().getType2()); - packet.writeH(0x00); + packet.writeH(0); packet.writeD(item.getItem().getBodyPart()); packet.writeH(item.getEnchantLevel()); - packet.writeH(0x00); - packet.writeH(0x00); + 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?? } return true; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchList.java index 0a45207cd6..e84e975d99 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartyMatchList.java @@ -50,20 +50,16 @@ public class PartyMatchList implements IClientOutgoingPacket PartyMatchRoomList.getInstance().deleteRoom(room.getId()); continue; } - if ((_loc > 0) && (_loc != room.getLocation())) { continue; } - if ((_lim == 0) && ((_player.getLevel() < room.getMinLevel()) || (_player.getLevel() > room.getMaxLevel()))) { continue; } - _rooms.add(room); } - int count = 0; final int size = _rooms.size(); OutgoingPackets.PARTY_MATCH_LIST.writeId(packet); @@ -75,7 +71,6 @@ public class PartyMatchList implements IClientOutgoingPacket { packet.writeD(0); } - packet.writeD(_rooms.size()); while (size > count) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index bf40a641c7..300cfa12d4 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -56,7 +56,6 @@ public class PartyMemberPosition implements IClientOutgoingPacket { OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); packet.writeD(_locations.size()); - for (Entry entry : _locations.entrySet()) { final Location loc = entry.getValue(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java index ca82e44e2f..f112f59d41 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java @@ -45,17 +45,15 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket 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(0x01); ?? + packet.writeD(0); // writeD(1); ?? packet.writeD(0); return true; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java index b750b30897..98ee6b2e0b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java @@ -44,28 +44,24 @@ public class PartySmallWindowAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ALL.writeId(packet); - packet.writeD(_leaderObjId); packet.writeD(_dist); packet.writeD(_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(0x01); ?? + packet.writeD(0); // writeD(1); ?? packet.writeD(member.getRace().ordinal()); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java index d8c7e1d279..496e0bb812 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java @@ -38,10 +38,8 @@ public class PartySmallWindowUpdate implements IClientOutgoingPacket 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()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartySpelled.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartySpelled.java index 553a8da4a1..e71d0cb2d3 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartySpelled.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PartySpelled.java @@ -63,7 +63,6 @@ public class PartySpelled implements IClientOutgoingPacket OutgoingPackets.PARTY_SPELLED.writeId(packet); packet.writeD(_creature instanceof Servitor ? 2 : _creature instanceof Pet ? 1 : 0); packet.writeD(_creature.getObjectId()); - // C4 does not support more than 20 effects in party window, so limiting them makes no difference. // This check ignores first effects, so there is space for last effects to be viewable by party members. // It may also help healers be aware of cursed members. @@ -77,7 +76,6 @@ public class PartySpelled implements IClientOutgoingPacket { packet.writeD(_effects.size()); } - for (; size < _effects.size(); size++) { final Effect temp = _effects.get(size); @@ -85,7 +83,6 @@ public class PartySpelled implements IClientOutgoingPacket { continue; } - packet.writeD(temp._skillId); packet.writeH(temp._dat); packet.writeD(temp._duration / 1000); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java index b9bf490b3f..78230c8f88 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java @@ -90,7 +90,6 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeD(0); // 1=attackable - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); @@ -106,7 +105,6 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD(_flWalkSpd); packet.writeD(_flyRunSpd); packet.writeD(_flyWalkSpd); - packet.writeF(1/* _cha.getProperMultiplier() */); packet.writeF(1/* _cha.getAttackSpeedMultiplier() */); packet.writeF(_summon.getTemplate().getFCollisionRadius()); @@ -147,7 +145,6 @@ public class PetInfo implements IClientOutgoingPacket 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; final int npcId = _summon.getTemplate().getNpcId(); if ((npcId >= 12526) && (npcId <= 12528)) @@ -158,9 +155,7 @@ public class PetInfo implements IClientOutgoingPacket { packet.writeH(0); } - packet.writeC(0); // c2 - // Following all added in C4. packet.writeH(0); // ?? packet.writeC(0); // team aura (1 = blue, 2 = red) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 010728605d..fc3e207d90 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -87,12 +87,12 @@ public class PetInventoryUpdate implements IClientOutgoingPacket packet.writeD(item.getItem().getItemId()); packet.writeD(item.getCount()); packet.writeH(item.getItem().getType2()); // item type2 - packet.writeH(0x00); // ? + 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(0x00); // ? + packet.writeH(0); // ? } return true; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index 2ab73d789c..7ebf494890 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -39,7 +39,6 @@ public class PetItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item temp : _items) { @@ -51,16 +50,16 @@ public class PetItemList implements IClientOutgoingPacket packet.writeH(0xff); // ? if (temp.isEquipped()) { - packet.writeH(0x01); + packet.writeH(1); } else { - packet.writeH(0x00); + packet.writeH(0); } packet.writeD(temp.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 // 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(0x00); // ? + packet.writeH(0); // ? } return true; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java index 5f80611746..e74c07fba5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java @@ -51,13 +51,10 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket packet.writeD(_player.getLevel()); // ?? packet.writeD(_member.getClan().getDissolvingExpiryTime() > Chronos.currentTimeMillis() ? 3 : 0); packet.writeD(0); - packet.writeD(_member.getClan().getAllyId()); packet.writeS(_member.getClan().getAllyName()); packet.writeD(_member.getClan().getAllyCrestId()); - packet.writeD(_member.getClan().isAtWar()); // new c3 - packet.writeD(_member.getClan().getMembers().size() - 1); for (ClanMember m : _member.getClan().getMembers()) { @@ -66,7 +63,6 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket { continue; } - packet.writeS(m.getName()); packet.writeD(m.getLevel()); packet.writeD(m.getClassId()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java index 3677c193af..2d8e6b75e0 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java @@ -37,7 +37,6 @@ public class PledgeReceivePowerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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 diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 0bcce58b29..5817ae347e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -36,7 +36,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_SUB_PLEDGE_CREATED.writeId(packet); - packet.writeD(0x01); + packet.writeD(1); packet.writeD(_subPledge.getId()); packet.writeS(_subPledge.getName()); packet.writeS(_subPledge.getLeaderName()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java index e12e4b02c5..67358d749b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java @@ -40,7 +40,7 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket { OutgoingPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(packet); packet.writeD(_tab); // type : 0 = Declared, 1 = Under Attack - packet.writeD(0x00); // page + packet.writeD(0); // page packet.writeD(_tab == 0 ? _clan.getWarList().size() : _clan.getAttackerList().size()); for (Integer i : _tab == 0 ? _clan.getWarList() : _clan.getAttackerList()) { @@ -49,7 +49,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket { continue; } - packet.writeS(clan.getName()); packet.writeD(_tab); // ?? packet.writeD(_tab); // ?? diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index 95363c1451..197fc38d39 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -49,13 +49,10 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket packet.writeD(_player.getLevel()); // ?? packet.writeD(_clan.getDissolvingExpiryTime() > Chronos.currentTimeMillis() ? 3 : 0); packet.writeD(0); - packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); packet.writeD(_clan.getAllyCrestId()); - packet.writeD(_clan.isAtWar()); // new c3 - packet.writeD(_clan.getMembers().size() - 1); for (ClanMember m : _clan.getMembers()) { @@ -64,7 +61,6 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket { continue; } - packet.writeS(m.getName()); packet.writeD(m.getLevel()); packet.writeD(m.getClassId()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java index 949650cdc6..984a03f0be 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java @@ -49,7 +49,6 @@ public class PrivateStoreListBuy implements IClientOutgoingPacket { _playerAdena = _player.getAdena(); } - // _storePlayer.getSellList().updateItems(); // Update SellList for case inventory content has changed // this items must be the items available into the _activeChar (seller) inventory _items = _storePlayer.getBuyList().getAvailableItems(_player.getInventory()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index e15afdcbda..9203b12174 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -51,7 +51,6 @@ public class PrivateStoreListSell implements IClientOutgoingPacket { _playerAdena = _player.getAdena(); } - _storePlayer.getSellList().updateItems(); _items = _storePlayer.getSellList().getItems(); _packageSale = _storePlayer.getSellList().isPackaged(); @@ -71,9 +70,9 @@ public class PrivateStoreListSell implements IClientOutgoingPacket packet.writeD(item.getObjectId()); packet.writeD(item.getItem().getItemId()); packet.writeD(item.getCount()); - packet.writeH(0x00); + packet.writeH(0); packet.writeH(item.getEnchant()); - packet.writeH(0x00); + packet.writeH(0); packet.writeD(item.getItem().getBodyPart()); packet.writeD(item.getPrice()); // your price packet.writeD(item.getItem().getReferencePrice()); // store price diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index c22b960801..079dcee5db 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -47,7 +47,6 @@ public class PrivateStoreManageListBuy implements IClientOutgoingPacket { _playerAdena = _player.getAdena(); } - _itemList = _player.getInventory().getUniqueItems(false, true, true); _buyList = _player.getBuyList().getItems(); } @@ -59,7 +58,6 @@ public class PrivateStoreManageListBuy implements IClientOutgoingPacket // section 1 packet.writeD(_player.getObjectId()); packet.writeD(_playerAdena); - // section2 packet.writeD(_itemList.size()); // inventory items for potential buy for (Item item : _itemList) @@ -68,11 +66,10 @@ public class PrivateStoreManageListBuy implements IClientOutgoingPacket 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(0x00); + packet.writeH(0); packet.writeD(item.getItem().getBodyPart()); packet.writeH(item.getItem().getType2()); } - // section 3 packet.writeD(_buyList.size()); // count for all items already added for buy for (TradeList.TradeItem item : _buyList) @@ -81,7 +78,7 @@ public class PrivateStoreManageListBuy implements IClientOutgoingPacket packet.writeH(item.getEnchant()); packet.writeD(item.getCount()); packet.writeD(item.getItem().getReferencePrice()); - packet.writeH(0x00); + packet.writeH(0); packet.writeD(item.getItem().getBodyPart()); packet.writeH(item.getItem().getType2()); packet.writeD(item.getPrice()); // your price diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index 9dc225f439..aeec1f72f7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -28,7 +28,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; * 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) * * @version $Revision: 1.3.2.1.2.3 $ $Date: 2005/03/27 15:29:39 $ */ - /* * In memory of our friend Vadim 03/11/2014 */ @@ -51,7 +50,6 @@ public class PrivateStoreManageListSell implements IClientOutgoingPacket { _playerAdena = _player.getAdena(); } - _player.getSellList().updateItems(); _packageSale = _player.getSellList().isPackaged(); _itemList = _player.getInventory().getAvailableItems(_player.getSellList()); @@ -69,7 +67,6 @@ public class PrivateStoreManageListSell implements IClientOutgoingPacket packet.writeD(_player.getObjectId()); packet.writeD(_packageSale ? 1 : 0); // Package sell packet.writeD(_playerAdena); - // section2 packet.writeD(_itemList.size()); // for potential sells for (TradeItem item : _itemList) @@ -84,7 +81,6 @@ public class PrivateStoreManageListSell implements IClientOutgoingPacket packet.writeD(item.getItem().getBodyPart()); packet.writeD(item.getPrice()); // store price } - // section 3 packet.writeD(_sellList.size()); // count for any items already added for sell for (TradeItem item : _sellList) @@ -95,7 +91,7 @@ public class PrivateStoreManageListSell implements IClientOutgoingPacket packet.writeD(item.getCount()); packet.writeH(0); packet.writeH(item.getEnchant()); // enchant level - packet.writeH(0x00); + packet.writeH(0); packet.writeD(item.getItem().getBodyPart()); packet.writeD(item.getPrice()); // your price packet.writeD(item.getItem().getReferencePrice()); // store price diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java index cbd1aa5084..3eb3fc8132 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java @@ -40,7 +40,6 @@ public class QuestList implements IClientOutgoingPacket for (QuestState qs : _questStates) { packet.writeD(qs.getQuest().getQuestId()); - final int states = qs.getInt("__compltdStateFlags"); if (states != 0) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java index 69271b995b..16d886b61c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java @@ -47,7 +47,7 @@ public class RecipeBookItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_BOOK_ITEM_LIST.writeId(packet); - packet.writeD(_isDwarvenCraft ? 0x00 : 0x01); // 0 = Dwarven - 1 = Common + packet.writeD(_isDwarvenCraft ? 0 : 1); // 0 = Dwarven - 1 = Common packet.writeD(_maxMp); if (_recipes == null) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index ea766af5e1..65db792c93 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -52,7 +52,6 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket 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()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java index 962c625c45..85ada022ba 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java @@ -46,7 +46,6 @@ public class RecipeShopManageList implements IClientOutgoingPacket { _recipes = _seller.getCommonRecipeBook(); } - // clean previous recipes if (_seller.getCreateList() != null) { @@ -67,8 +66,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket OutgoingPackets.RECIPE_SHOP_MANAGE_LIST.writeId(packet); packet.writeD(_seller.getObjectId()); packet.writeD(_seller.getAdena()); - packet.writeD(_isDwarven ? 0x00 : 0x01); - + packet.writeD(_isDwarven ? 0 : 1); if (_recipes == null) { packet.writeD(0); @@ -84,7 +82,6 @@ public class RecipeShopManageList implements IClientOutgoingPacket packet.writeD(count); } } - if (_seller.getCreateList() == null) { packet.writeD(0); @@ -93,11 +90,10 @@ public class RecipeShopManageList implements IClientOutgoingPacket { final ManufactureList list = _seller.getCreateList(); packet.writeD(list.size()); - for (ManufactureItem item : list.getList()) { packet.writeD(item.getRecipeId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(item.getCost()); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java index 8d6a78a62d..be9565ef86 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java @@ -45,11 +45,10 @@ public class RecipeShopSellList implements IClientOutgoingPacket packet.writeD(_player.getMaxMp()); // Creator's MP packet.writeD(_buyer.getAdena()); // Buyer Adena packet.writeD(createList.size()); - for (ManufactureItem item : createList.getList()) { packet.writeD(item.getRecipeId()); - packet.writeD(0x00); // unknown + packet.writeD(0); // unknown packet.writeD(item.getCost()); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/RestartResponse.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/RestartResponse.java index 755950cdc0..f089288a78 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/RestartResponse.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/RestartResponse.java @@ -26,6 +26,7 @@ public class RestartResponse implements IClientOutgoingPacket { private static final RestartResponse STATIC_PACKET_TRUE = new RestartResponse(true); private static final RestartResponse STATIC_PACKET_FALSE = new RestartResponse(false); + private final String _message; private final boolean _result; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java index 5004a5a2f3..7bb072cdf5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java @@ -23,6 +23,7 @@ public class Ride implements IClientOutgoingPacket { public static final int ACTION_MOUNT = 1; public static final int ACTION_DISMOUNT = 0; + private final int _id; private final int _bRide; private int _rideType; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java index 655999628b..21da1dc898 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java @@ -46,13 +46,10 @@ public class SSQStatus implements IClientOutgoingPacket 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? - int dawnPercent = 0; int duskPercent = 0; - switch (_page) { case 1: @@ -83,7 +80,6 @@ public class SSQStatus implements IClientOutgoingPacket break; } } - switch (currentPeriod) { case SevenSigns.PERIOD_COMP_RECRUITING: @@ -99,19 +95,15 @@ public class SSQStatus implements IClientOutgoingPacket 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 - 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); final int duskFestivalScore = SevenSigns.getInstance().getCurrentFestivalScore(SevenSigns.CABAL_DUSK); final double totalStoneScore = duskStoneScore + dawnStoneScore; - /* * Scoring seems to be proportionate to a set base value, so base this on the maximum obtainable score from festivals, which is 500. */ @@ -122,7 +114,6 @@ public class SSQStatus implements IClientOutgoingPacket duskStoneScoreProp = Math.round(((float) duskStoneScore / (float) totalStoneScore) * 500); dawnStoneScoreProp = Math.round(((float) dawnStoneScore / (float) totalStoneScore) * 500); } - final int duskTotalScore = SevenSigns.getInstance().getCurrentScore(SevenSigns.CABAL_DUSK); final int dawnTotalScore = SevenSigns.getInstance().getCurrentScore(SevenSigns.CABAL_DAWN); final int totalOverallScore = duskTotalScore + dawnTotalScore; @@ -131,19 +122,15 @@ public class SSQStatus implements IClientOutgoingPacket dawnPercent = Math.round(((float) dawnTotalScore / totalOverallScore) * 100); 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 % - /* DAWN */ packet.writeD(dawnStoneScoreProp); // Seal Stone Score packet.writeD(dawnFestivalScore); // Festival Score packet.writeD(dawnTotalScore); // Total Score - packet.writeC(dawnPercent); // Dawn % break; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java index 6ff29a30a1..587c50868c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java @@ -56,10 +56,8 @@ public class SellList implements IClientOutgoingPacket { OutgoingPackets.SELL_LIST.writeId(packet); packet.writeD(_money); - packet.writeD(0x00); - + packet.writeD(0); packet.writeH(_selllist.size()); - for (Item item : _selllist) { packet.writeH(item.getItem().getType1()); @@ -67,11 +65,11 @@ public class SellList implements IClientOutgoingPacket packet.writeD(item.getItemId()); packet.writeD(item.getCount()); packet.writeH(item.getItem().getType2()); - packet.writeH(0x00); + packet.writeH(0); packet.writeD(item.getItem().getBodyPart()); packet.writeH(item.getEnchantLevel()); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); packet.writeD(Config.MERCHANT_ZERO_SELL_PRICE ? 0 : item.getItem().getReferencePrice() / 2); } return true; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 8928185ce9..ffbd05182b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -58,9 +58,8 @@ public class SellListProcure implements IClientOutgoingPacket { OutgoingPackets.SELL_LIST_PROCURE.writeId(packet); packet.writeD(_money); // money - packet.writeD(0x00); // lease ? + packet.writeD(0); // lease ? packet.writeH(_sellList.size()); // list size - for (Entry entry : _sellList.entrySet()) { final Item item = entry.getKey(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java index 42d04e3f28..4e04154474 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java @@ -40,12 +40,10 @@ public class SendMacroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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 - if (_macro != null) { packet.writeD(_macro.id); // Macro ID @@ -53,9 +51,7 @@ public class SendMacroList implements IClientOutgoingPacket packet.writeS(_macro.descr); // Desc packet.writeS(_macro.acronym); // acronym packet.writeC(_macro.icon); // icon - packet.writeC(_macro.commands.length); // count - for (int i = 0; i < _macro.commands.length; i++) { final Macro.MacroCmd cmd = _macro.commands[i]; @@ -66,7 +62,6 @@ public class SendMacroList implements IClientOutgoingPacket packet.writeS(cmd.cmd); // command name } } - // writeD(1); //unknown change of Macro edit,add,delete // packet.writeC(0); //unknown // packet.writeC(1); //count of Macros diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index d692833969..c416f1ad44 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -39,7 +39,6 @@ public class ShortCutInit implements IClientOutgoingPacket { return; } - _shortCuts = _player.getAllShortCuts(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java index 1a5d161862..482630c619 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java @@ -41,7 +41,6 @@ public class ShortCutRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_REGISTER.writeId(packet); - packet.writeD(_shortcut.getType()); packet.writeD(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client switch (_shortcut.getType()) @@ -55,7 +54,7 @@ public class ShortCutRegister implements IClientOutgoingPacket { packet.writeD(_shortcut.getId()); packet.writeD(_shortcut.getLevel()); - packet.writeC(0x00); // C5 + packet.writeC(0); // C5 break; } case ShortCut.TYPE_ACTION: // 3 @@ -78,7 +77,6 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeD(_shortcut.getId()); } } - packet.writeD(1); // ?? return true; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java index b130e5a297..04e5e2a589 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java @@ -56,7 +56,7 @@ public class ShowBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - packet.writeC(0x01); // 1 to show, 0 to hide + packet.writeC(1); // 1 to show, 0 to hide packet.writeS(TOP); packet.writeS(FAV); packet.writeS(REGION); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java index 59f75b1206..c4b67c7893 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java @@ -34,9 +34,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = ca
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Attackers Clans?
* d = Number of Attackers Clans
* { //repeats
@@ -73,9 +73,9 @@ public class SiegeAttackerList implements IClientOutgoingPacket { OutgoingPackets.SIEGE_ATTACKER_LIST.writeId(packet); packet.writeD(_residenceId); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _attackers.size(); if (size > 0) { @@ -89,12 +89,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getClanId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -103,8 +102,8 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index b8223d2bb4..7abaecc4fa 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -34,9 +34,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = 0xcb
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Defending Clans?
* d = Number of Defending Clans
* { //repeats
@@ -77,9 +77,9 @@ public class SiegeDefenderList implements IClientOutgoingPacket { OutgoingPackets.SIEGE_DEFENDER_LIST.writeId(packet); packet.writeD(_residenceId); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _defenders.size() + _waiting.size(); if (size > 0) { @@ -94,32 +94,31 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getClanId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) switch (siegeclan.getType()) { case OWNER: { - packet.writeD(0x01); // owner + packet.writeD(1); // owner break; } case DEFENDER_PENDING: { - packet.writeD(0x02); // approved + packet.writeD(2); // approved break; } case DEFENDER: { - packet.writeD(0x03); // waiting approved + packet.writeD(3); // waiting approved break; } default: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -135,8 +134,8 @@ public class SiegeDefenderList implements IClientOutgoingPacket packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) - packet.writeD(0x02); // waiting approval + 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 @@ -145,8 +144,8 @@ public class SiegeDefenderList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index e35e864754..6c2af43ad4 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -77,7 +77,7 @@ public class SiegeInfo implements IClientOutgoingPacket { OutgoingPackets.SIEGE_INFO.writeId(packet); packet.writeD(_residenceId); - packet.writeD((_ownerId == _player.getClanId()) && _player.isClanLeader() ? 0x01 : 0x00); + packet.writeD((_ownerId == _player.getClanId()) && _player.isClanLeader() ? 1 : 0); packet.writeD(_ownerId); if (_ownerId > 0) { @@ -101,10 +101,9 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Calendar.getInstance().getTimeInMillis() / 1000)); packet.writeD((int) _siegeDate); - packet.writeD(0x00); // number of choices? + packet.writeD(0); // number of choices? return true; } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SignsSky.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SignsSky.java index 216b329277..34fed4e306 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SignsSky.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SignsSky.java @@ -53,7 +53,6 @@ public class SignsSky implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SIGNS_SKY.writeId(packet); - if (_state == 2) { packet.writeH(258); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java index b62952920f..0e9a5974de 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java @@ -83,7 +83,6 @@ public class SkillList implements IClientOutgoingPacket { ns[i] = sk; } - _skills = ns; } } @@ -93,7 +92,6 @@ public class SkillList implements IClientOutgoingPacket { OutgoingPackets.SKILL_LIST.writeId(packet); packet.writeD(_skills.length); - for (Skill temp : _skills) { packet.writeD(temp.passive ? 1 : 0); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index c683123fa3..5e86c1c154 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; /** - * CDSDDSS -> (0xd5)(objId)(name)(0x00)(type)(speaker)(name) + * CDSDDSS -> (0xd5)(objId)(name)(0)(type)(speaker)(name) */ public class Snoop implements IClientOutgoingPacket { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index 213fe06beb..ac4feecd11 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -41,7 +41,7 @@ public class SpawnItem implements IClientOutgoingPacket _x = item.getX(); _y = item.getY(); _z = item.getZ(); - _stackable = item.isStackable() ? 0x01 : 0x00; + _stackable = item.isStackable() ? 1 : 0; _count = item.getCount(); } @@ -51,14 +51,13 @@ public class SpawnItem implements IClientOutgoingPacket OutgoingPackets.SPAWN_ITEM.writeId(packet); packet.writeD(_objectId); packet.writeD(_itemId); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); // only show item count if it is a stackable item packet.writeD(_stackable); packet.writeD(_count); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 return true; } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index eb55e279b2..07db21369c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -44,16 +44,13 @@ public class StatusUpdate implements IClientOutgoingPacket public static final int INT = 0x06; public static final int WIT = 0x07; public static final int MEN = 0x08; - public static final int CUR_HP = 0x09; public static final int MAX_HP = 0x0a; public static final int CUR_MP = 0x0b; public static final int MAX_MP = 0x0c; - public static final int SP = 0x0d; public static final int CUR_LOAD = 0x0e; public static final int MAX_LOAD = 0x0f; - public static final int P_ATK = 0x11; public static final int ATK_SPD = 0x12; public static final int P_DEF = 0x13; @@ -65,12 +62,10 @@ public class StatusUpdate implements IClientOutgoingPacket public static final int M_DEF = 0x19; public static final int PVP_FLAG = 0x1a; public static final int KARMA = 0x1b; - public static final int CUR_CP = 0x21; public static final int MAX_CP = 0x22; private Player _actor; - private List _attributes; public int _objectId; @@ -107,12 +102,10 @@ public class StatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATUS_UPDATE.writeId(packet); - if (_actor != null) { packet.writeD(_actor.getObjectId()); packet.writeD(28); // all the attributes - packet.writeD(LEVEL); packet.writeD(_actor.getLevel()); packet.writeD(EXP); @@ -129,7 +122,6 @@ public class StatusUpdate implements IClientOutgoingPacket packet.writeD(_actor.getWIT()); packet.writeD(MEN); packet.writeD(_actor.getMEN()); - packet.writeD(CUR_HP); packet.writeD((int) _actor.getCurrentHp()); packet.writeD(MAX_HP); @@ -144,7 +136,6 @@ public class StatusUpdate implements IClientOutgoingPacket packet.writeD(_actor.getCurrentLoad()); packet.writeD(MAX_LOAD); packet.writeD(_actor.getMaxLoad()); - packet.writeD(P_ATK); packet.writeD(_actor.getPAtk(null)); packet.writeD(ATK_SPD); @@ -159,7 +150,6 @@ public class StatusUpdate implements IClientOutgoingPacket packet.writeD(_actor.getCriticalHit(null, null)); packet.writeD(M_ATK); packet.writeD(_actor.getMAtk(null, null)); - packet.writeD(CAST_SPD); packet.writeD(_actor.getMAtkSpd()); packet.writeD(M_DEF); @@ -177,7 +167,6 @@ public class StatusUpdate implements IClientOutgoingPacket { packet.writeD(_objectId); packet.writeD(_attributes.size()); - for (int i = 0; i < _attributes.size(); i++) { final Attribute temp = _attributes.get(i); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 9481217acc..59d343b945 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -33,6 +33,7 @@ public class SystemMessage implements IClientOutgoingPacket private static final int TYPE_NPC_NAME = 2; private static final int TYPE_NUMBER = 1; private static final int TYPE_TEXT = 0; + private final int _messageId; private final List _types = new ArrayList<>(); private final List _values = new ArrayList<>(); @@ -122,15 +123,12 @@ public class SystemMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SYSTEM_MESSAGE.writeId(packet); - packet.writeD(_messageId); packet.writeD(_types.size()); - for (int i = 0; i < _types.size(); i++) { final int t = _types.get(i).intValue(); packet.writeD(t); - switch (t) { case TYPE_TEXT: diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index 5e31d80225..461d458678 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -45,7 +45,7 @@ public class TeleportToLocation implements IClientOutgoingPacket packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // Fade 0, Instant 1. + packet.writeD(0); // Fade 0, Instant 1. packet.writeD(_heading); return true; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java index 1235f0fb56..5e33f4015c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java @@ -37,20 +37,17 @@ public class TradeOtherAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_OTHER_ADD.writeId(packet); - packet.writeH(1); // item count - 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(0x00); // ? - + 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(0x00); // ? - packet.writeH(0x00); + packet.writeH(0); // ? + packet.writeH(0); return true; } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java index 4b586ebfe6..79a53e29cd 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java @@ -37,20 +37,17 @@ public class TradeOwnAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_OWN_ADD.writeId(packet); - packet.writeH(1); // item count - 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(0x00); // ? - + 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(0x00); // ? - packet.writeH(0x00); + packet.writeH(0); // ? + packet.writeH(0); return true; } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index 80aa78ab2a..96b8bbbab1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -45,7 +45,6 @@ public class TradeStart implements IClientOutgoingPacket { return false; } - OutgoingPackets.TRADE_START.writeId(packet); packet.writeD(_player.getActiveTradeList().getPartner().getObjectId()); // writeD((_activeChar != null || _activeChar.getTransactionRequester() != null)? _activeChar.getTransactionRequester().getObjectId() : 0); @@ -57,12 +56,11 @@ public class TradeStart implements IClientOutgoingPacket packet.writeD(item.getItemId()); packet.writeD(item.getCount()); packet.writeH(item.getItem().getType2()); // item type2 - packet.writeH(0x00); // ? - + 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.getEnchantLevel()); // enchant level - packet.writeH(0x00); // ? - packet.writeH(0x00); + packet.writeH(0); // ? + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java index 7320188d2d..4f121434f0 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java @@ -72,11 +72,11 @@ public class TradeUpdate implements IClientOutgoingPacket packet.writeD(item.getItem().getItemId()); packet.writeD(aveCount); packet.writeH(item.getItem().getType2()); // item type2 - packet.writeH(0x00); // ? + 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(0x00); // ? - packet.writeH(0x00); + packet.writeH(0); // ? + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 49aab0e23a..d9afce2484 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -58,17 +58,14 @@ public class UserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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); - if (_player.getClassIndex() == 0) { packet.writeD(_player.getClassId().getId()); @@ -77,7 +74,6 @@ public class UserInfo implements IClientOutgoingPacket { packet.writeD(_player.getBaseClass()); } - packet.writeD(_player.getLevel()); packet.writeD((int) _player.getExp()); packet.writeD(_player.getSTR()); @@ -93,7 +89,6 @@ public class UserInfo implements IClientOutgoingPacket 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 packet.writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_UNDER)); @@ -137,15 +132,11 @@ public class UserInfo implements IClientOutgoingPacket 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) @@ -190,7 +181,6 @@ public class UserInfo implements IClientOutgoingPacket } packet.writeC(_player.isInPartyMatchRoom() ? 1 : 0); - if (_player.getAppearance().isInvisible()) { packet.writeD((_player.getAbnormalEffect() | Creature.ABNORMAL_EFFECT_STEALTH)); @@ -199,55 +189,37 @@ public class UserInfo implements IClientOutgoingPacket { packet.writeD(_player.getAbnormalEffect()); // C2 } - - packet.writeC(0x00); - + packet.writeC(0); packet.writeD(_player.getClanPrivileges()); - // C4 addition - packet.writeD(0x00); // swim? - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); // swim? + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); // C4 addition end - packet.writeH(_player.getRecomLeft()); // c2 recommendations remaining packet.writeH(_player.getRecomHave()); // c2 recommendations received - packet.writeD(0x00); // _player.getMountNpcId() > 0 ? _player.getMountNpcId() + 1000000 : 0 + packet.writeD(0); // _player.getMountNpcId() > 0 ? _player.getMountNpcId() + 1000000 : 0 packet.writeH(_player.getInventoryLimit()); - packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); packet.writeC(_player.isMounted() ? 0 : _player.getEnchantEffect()); - - if (_player.getTeam() == 1) - { - packet.writeC(0x01); // team circle around feet 1= Blue, 2 = red - } - else if (_player.getTeam() == 2) - { - packet.writeC(0x02); // team circle around feet 1= Blue, 2 = red - } - else - { - packet.writeC(0x00); // team circle around feet 1= Blue, 2 = red - } - + packet.writeC(_player.getTeam()); // team circle around feet 1= Blue, 2 = red packet.writeD(_player.getClanCrestLargeId()); - packet.writeC(_player.isNoble() ? 1 : 0); // 0x01: symbol on char menu ctrl+I - packet.writeC((_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) || _player.isPVPHero()) ? 1 : 0); // 0x01: Hero Aura + 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 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 - packet.writeD(_player.getAppearance().getNameColor()); + packet.writeD(_player.getAppearance().getNameColor()); // Add heading? return true; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java index 7b3c4154db..bea058fe0b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java @@ -41,7 +41,6 @@ public class ValidateLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 813920b5cb..22c2df2085 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -50,7 +50,6 @@ public class WareHouseDepositList implements IClientOutgoingPacket { _items.add(temp); } - // augmented and shadow items can be stored in private wh if (_whType == PRIVATE) { @@ -74,7 +73,6 @@ public class WareHouseDepositList implements IClientOutgoingPacket packet.writeH(_whType); packet.writeD(_playerAdena); packet.writeH(_items.size()); - for (Item item : _items) { packet.writeH(item.getItem().getType1()); // item type1 //unconfirmed, works @@ -82,11 +80,11 @@ public class WareHouseDepositList implements IClientOutgoingPacket packet.writeD(item.getItemId()); // unconfirmed, works packet.writeD(item.getCount()); // unconfirmed, works packet.writeH(item.getItem().getType2()); // item type2 //unconfirmed, works - packet.writeH(0x00); // ? 100 + packet.writeH(0); // ? 100 packet.writeD(item.getItem().getBodyPart()); // ? packet.writeH(item.getEnchantLevel()); // enchant level -confirmed - packet.writeH(0x00); // ? 300 - packet.writeH(0x00); // ? 200 + packet.writeH(0); // ? 300 + packet.writeH(0); // ? 200 packet.writeD(item.getObjectId()); // item id - confimed } return true; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index a6a793cda6..ce452c80f1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -67,15 +67,15 @@ public class WareHouseWithdrawalList implements IClientOutgoingPacket for (Item item : _items) { packet.writeH(item.getItem().getType1()); // item type1 //unconfirmed, works - packet.writeD(0x00); // unconfirmed, works + packet.writeD(0); // unconfirmed, works packet.writeD(item.getItemId()); // unconfirmed, works packet.writeD(item.getCount()); // unconfirmed, works packet.writeH(item.getItem().getType2()); // item type2 //unconfirmed, works - packet.writeH(0x00); // ? + packet.writeH(0); // ? packet.writeD(item.getItem().getBodyPart()); // ? packet.writeH(item.getEnchantLevel()); // enchant level -confirmed - packet.writeH(0x00); // ? - packet.writeH(0x00); // ? + packet.writeH(0); // ? + packet.writeH(0); // ? packet.writeD(item.getObjectId()); // item id - confimed } return true; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WearList.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WearList.java index 608eb9a006..d11bc27681 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WearList.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WearList.java @@ -51,14 +51,12 @@ public class WearList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.WEAR_LIST.writeId(packet); - packet.writeC(0xc0); // ? packet.writeC(0x13); // ? - packet.writeC(0x00); // ? - packet.writeC(0x00); // ? + packet.writeC(0); // ? + packet.writeC(0); // ? packet.writeD(_money); // current money packet.writeD(_listId); - int newlength = 0; for (Item item : _list) { @@ -68,27 +66,23 @@ public class WearList implements IClientOutgoingPacket } } packet.writeH(newlength); - for (Item item : _list) { if ((item.getItem().getCrystalType() <= _expertise) && item.isEquipable()) { packet.writeD(item.getItemId()); packet.writeH(item.getItem().getType2()); // item type2 - if (item.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { packet.writeH(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 } else { - packet.writeH(0x00); // 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(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); } } - return true; } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 274b988fa6..9c9c003e0d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -19,7 +19,7 @@ package org.l2jmobius.loginserver.network.serverpackets; import org.l2jmobius.loginserver.network.AbstractServerPacket; /** - * Fromat: d d: response + * Format: d d: response */ public class GGAuth extends AbstractServerPacket { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/serverpackets/Init.java index 24eedf9dca..c0a579a265 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/serverpackets/Init.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/serverpackets/Init.java @@ -20,7 +20,7 @@ import org.l2jmobius.loginserver.network.AbstractServerPacket; import org.l2jmobius.loginserver.network.LoginClient; /** - * Format: dd b dddd s d: session id d: protocol revision b: 0x90 bytes : 0x80 bytes for the scrambled RSA public key 0x10 bytes at 0x00 d: unknow d: unknow d: unknow d: unknow s: blowfish key + * Format: dd b dddd s d: session id d: protocol revision b: 0x90 bytes : 0x80 bytes for the scrambled RSA public key 0x10 bytes at 0x00 d: unknown d: unknown d: unknown d: unknown s: blowfish key */ public final class Init extends AbstractServerPacket { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index 66c8cd2c5a..42959611c7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -19,7 +19,7 @@ package org.l2jmobius.loginserver.network.serverpackets; import org.l2jmobius.loginserver.network.AbstractServerPacket; /** - * Fromat: d d: the failure reason + * Format: d d: the failure reason */ public class LoginFail extends AbstractServerPacket { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/BaseRecievePacket.java index c682cb741d..a6ed15ce32 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/BaseRecievePacket.java @@ -73,7 +73,7 @@ public abstract class BaseRecievePacket try { result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE); - result = result.substring(0, result.indexOf(0x00)); + result = result.substring(0, result.indexOf(0)); _off += (result.length() * 2) + 2; } catch (Exception e) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/BaseSendablePacket.java index a9d918de4c..8fa8491cbf 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/network/BaseSendablePacket.java @@ -117,16 +117,16 @@ public abstract class BaseSendablePacket public byte[] getBytes() { // if (this instanceof Init) - // writeD(0x00); // reserve for XOR initial key + // writeD(0); // reserve for XOR initial key - writeD(0x00); // reserve for checksum + writeD(0); // reserve for checksum final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++) { - writeC(0x00); + writeC(0); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 2e73484508..becb5427c3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ActionFailed; import org.l2jmobius.gameserver.util.Util; /** - * Fromat:(ch) dddddc + * Format:(ch) dddddc */ public class RequestExMagicSkillUseGround implements IClientIncomingPacket { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AllyInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AllyInfo.java index d24c885191..b26b07362a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AllyInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AllyInfo.java @@ -39,7 +39,6 @@ public class AllyInfo implements IClientOutgoingPacket _player.sendPacket(SystemMessageId.YOU_ARE_NOT_CURRENTLY_ALLIED_WITH_ANY_CLANS); return false; } - // ============ SystemMessage sm = new SystemMessage(SystemMessageId.ALLIANCE_INFORMATION); _player.sendPacket(sm); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 0347dc2bc2..7f9ca96b7d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -92,10 +92,8 @@ public class Attack implements IClientOutgoingPacket { // Get the last position in the hits table final int pos = _hits.length; - // Create a new Hit object final Hit[] tmp = new Hit[pos + 1]; - // Add the new Hit object to hits table System.arraycopy(_hits, 0, tmp, 0, _hits.length); tmp[pos] = new Hit(target, damage, miss, crit, shld); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index 29bad6b104..9e99825df0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -75,30 +75,28 @@ public class BuyList implements IClientOutgoingPacket packet.writeD(item.getItemId()); if (item.getCount() < 0) { - packet.writeD(0x00); // max amount of items that a player can buy at a time (with this itemid) + packet.writeD(0); // max amount of items that a player can buy at a time (with this itemid) } else { packet.writeD(item.getCount()); } packet.writeH(item.getItem().getType2()); // item type2 - packet.writeH(0x00); // ? - + packet.writeH(0); // ? if (item.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { 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.getEnchantLevel()); // enchant level - packet.writeH(0x00); // ? - packet.writeH(0x00); + packet.writeH(0); // ? + packet.writeH(0); } else { - packet.writeD(0x00); // 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(0x00); // enchant level - packet.writeH(0x00); // ? - packet.writeH(0x00); + packet.writeD(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.writeH(0); // enchant level + packet.writeH(0); // ? + packet.writeH(0); } - if ((item.getItemId() >= 3960) && (item.getItemId() <= 4026)) { packet.writeD((int) (item.getPriceToSell() * Config.RATE_SIEGE_GUARDS_PRICE * (1 + _taxRate))); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index 6579adce9e..b489a4ad83 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -50,12 +50,12 @@ public class BuyListSeed implements IClientOutgoingPacket packet.writeH(_list.size()); // list length for (Item item : _list) { - packet.writeH(0x04); // item->type1 - packet.writeD(0x00); // objectId + packet.writeH(4); // item->type1 + packet.writeD(0); // objectId packet.writeD(item.getItemId()); // item id packet.writeD(item.getCount()); // item count - packet.writeH(0x04); // item->type2 - packet.writeH(0x00); // unknown :) + packet.writeH(4); // item->type2 + packet.writeH(0); // unknown :) packet.writeD(item.getPriceToSell()); // price } return true; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index 7d792654d8..66869caf4f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -26,17 +26,17 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ChangeWaitType implements IClientOutgoingPacket { + public static final int WT_SITTING = 0; + public static final int WT_STANDING = 1; + public static final int WT_START_FAKEDEATH = 2; + public static final int WT_STOP_FAKEDEATH = 3; + private final int _objectId; private final int _moveType; private final int _x; private final int _y; private final int _z; - public static final int WT_SITTING = 0; - public static final int WT_STANDING = 1; - public static final int WT_START_FAKEDEATH = 2; - public static final int WT_STOP_FAKEDEATH = 3; - public ChangeWaitType(Creature creature, int newMoveType) { _objectId = creature.getObjectId(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index cdb6a948d9..429ce2104e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class CharCreateFail implements IClientOutgoingPacket { - public static final int REASON_CREATION_FAILED = 0x00; - public static final int REASON_TOO_MANY_CHARACTERS = 0x01; - public static final int REASON_NAME_ALREADY_EXISTS = 0x02; - public static final int REASON_16_ENG_CHARS = 0x03; - public static final int REASON_INCORRECT_NAME = 0x04; + public static final int REASON_CREATION_FAILED = 0; + public static final int REASON_TOO_MANY_CHARACTERS = 1; + public static final int REASON_NAME_ALREADY_EXISTS = 2; + public static final int REASON_16_ENG_CHARS = 3; + public static final int REASON_INCORRECT_NAME = 4; private final int _error; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index 4f5aa889c4..43de5c6ed2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -28,7 +28,7 @@ public class CharCreateOk implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_CREATE_OK.writeId(packet); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index 7b22f12774..d5ac02f1a4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class CharDeleteFail implements IClientOutgoingPacket { - public static final int REASON_DELETION_FAILED = 0x01; - public static final int REASON_YOU_MAY_NOT_DELETE_CLAN_MEMBER = 0x02; - public static final int REASON_CLAN_LEADERS_MAY_NOT_BE_DELETED = 0x03; + public static final int REASON_DELETION_FAILED = 1; + public static final int REASON_YOU_MAY_NOT_DELETE_CLAN_MEMBER = 2; + public static final int REASON_CLAN_LEADERS_MAY_NOT_BE_DELETED = 3; private final int _error; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 0ead3f6557..25c978a279 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -59,7 +59,6 @@ public class CharInfo implements IClientOutgoingPacket packet.writeS(_player.getName()); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); - if (_player.getClassIndex() == 0) { packet.writeD(_player.getClassId().getId()); @@ -68,7 +67,6 @@ public class CharInfo implements IClientOutgoingPacket { packet.writeD(_player.getBaseClass()); } - packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_DHAIR)); packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_HEAD)); packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_RHAND)); @@ -81,40 +79,35 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_LRHAND)); packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_HAIR)); packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_FACE)); - // c6 new h's - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); packet.writeD(_inventory.getPaperdollAugmentationId(Inventory.PAPERDOLL_RHAND)); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); + 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(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); packet.writeD(_player.getPvpFlag()); packet.writeD(_player.getKarma()); - packet.writeD(_player.getMAtkSpd()); packet.writeD(_player.getPAtkSpd()); - packet.writeD(_player.getPvpFlag()); 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) @@ -130,24 +123,19 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeS(_gmSeeInvis ? "Invisible" : _player.getTitle()); - packet.writeD(_player.getClanId()); packet.writeD(_player.getClanCrestId()); packet.writeD(_player.getAllyId()); packet.writeD(_player.getAllyCrestId()); // In UserInfo leader rights and siege flags, but here found nothing?? // Therefore RelationChanged packet with that info is required - packet.writeD(0x00); - + packet.writeD(0); packet.writeC(_player.isSitting() ? 0 : 1); // standing = 1 sitting = 0 packet.writeC(_player.isRunning() ? 1 : 0); // running = 1 walking = 0 packet.writeC(_player.isInCombat() ? 1 : 0); packet.writeC(_player.isAlikeDead() ? 1 : 0); - packet.writeC(!_gmSeeInvis && _player.getAppearance().isInvisible() ? 1 : 0); // invisible = 1 visible = 0 - packet.writeC(_player.getMountType()); // 1 on strider 2 on wyvern 0 no mount packet.writeC(_player.getPrivateStoreType()); // 1 - sellshop @@ -158,55 +146,35 @@ public class CharInfo implements IClientOutgoingPacket } packet.writeC(_player.isInPartyMatchRoom() ? 1 : 0); - packet.writeD(_gmSeeInvis ? (_player.getAbnormalEffect() | Creature.ABNORMAL_EFFECT_STEALTH) : _player.getAbnormalEffect()); - packet.writeC(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); packet.writeC(_player.isMounted() ? 0 : _player.getEnchantEffect()); - - if (_player.getTeam() == 1) - { - packet.writeC(0x01); // team circle around feet 1 = Blue, 2 = red - } - else if (_player.getTeam() == 2) - { - packet.writeC(0x02); // team circle around feet 1 = Blue, 2 = red - } - else - { - packet.writeC(0x00); // team circle around feet 1 = Blue, 2 = red - } - + packet.writeC(_player.getTeam()); // team circle around feet 1 = Blue, 2 = red packet.writeD(_player.getClanCrestLargeId()); packet.writeC(_player.isNoble() ? 1 : 0); // Symbol on char menu ctrl+I packet.writeC((_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) || _player.isPVPHero()) ? 1 : 0); // Hero Aura - packet.writeC(_player.isFishing() ? 1 : 0); // 0x01: Fishing Mode (Cant be undone by setting back to 0) + packet.writeC(_player.isFishing() ? 1 : 0); // 1: Fishing Mode (Cant be undone by setting back to 0) packet.writeD(_player.getFishX()); packet.writeD(_player.getFishY()); packet.writeD(_player.getFishZ()); packet.writeD(_player.getAppearance().getNameColor()); - packet.writeD(_player.getHeading()); - packet.writeD(_player.getPledgeClass()); packet.writeD(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); - if (_player.isCursedWeaponEquiped()) { packet.writeD(CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquipedId())); } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java index 3950ecc5d0..66aa17971b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java @@ -72,10 +72,8 @@ public class CharSelectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_SELECT_INFO.writeId(packet); - final int size = _characterPackages.size(); packet.writeD(size); - long lastAccess = 0; if (_activeId == -1) { @@ -88,7 +86,6 @@ public class CharSelectInfo implements IClientOutgoingPacket } } } - for (int i = 0; i < size; i++) { final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); @@ -97,36 +94,29 @@ public class CharSelectInfo implements IClientOutgoingPacket packet.writeS(_loginName); packet.writeD(_sessionId); packet.writeD(charInfoPackage.getClanId()); - packet.writeD(0x00); // ?? - + packet.writeD(0); // ?? packet.writeD(charInfoPackage.getSex()); packet.writeD(charInfoPackage.getRace()); packet.writeD(charInfoPackage.getBaseClassId()); - - packet.writeD(0x01); // active ?? - - packet.writeD(0x00); // x - packet.writeD(0x00); // y - packet.writeD(0x00); // z - + packet.writeD(1); // active ?? + packet.writeD(0); // x + packet.writeD(0); // y + packet.writeD(0); // z packet.writeF(charInfoPackage.getCurrentHp()); // hp cur packet.writeF(charInfoPackage.getCurrentMp()); // mp cur - packet.writeD(charInfoPackage.getSp()); packet.writeQ(charInfoPackage.getExp()); packet.writeD(charInfoPackage.getLevel()); - packet.writeD(charInfoPackage.getKarma()); // karma - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(charInfoPackage.getPaperdollObjectId(Inventory.PAPERDOLL_DHAIR)); packet.writeD(charInfoPackage.getPaperdollObjectId(Inventory.PAPERDOLL_REAR)); packet.writeD(charInfoPackage.getPaperdollObjectId(Inventory.PAPERDOLL_LEAR)); @@ -144,7 +134,6 @@ public class CharSelectInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getPaperdollObjectId(Inventory.PAPERDOLL_LRHAND)); packet.writeD(charInfoPackage.getPaperdollObjectId(Inventory.PAPERDOLL_HAIR)); packet.writeD(charInfoPackage.getPaperdollObjectId(Inventory.PAPERDOLL_FACE)); - packet.writeD(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_DHAIR)); packet.writeD(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_REAR)); packet.writeD(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_LEAR)); @@ -162,14 +151,11 @@ public class CharSelectInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_LRHAND)); packet.writeD(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_HAIR)); packet.writeD(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_FACE)); - packet.writeD(charInfoPackage.getHairStyle()); packet.writeD(charInfoPackage.getHairColor()); packet.writeD(charInfoPackage.getFace()); - packet.writeF(charInfoPackage.getMaxHp()); // hp max packet.writeF(charInfoPackage.getMaxMp()); // mp max - final long deleteTime = charInfoPackage.getDeleteTimer(); final int accesslevels = charInfoPackage.getAccessLevel(); int deletedays = 0; @@ -181,23 +167,19 @@ public class CharSelectInfo implements IClientOutgoingPacket { deletedays = -1; // like L2OFF player looks dead if he is banned. } - packet.writeD(deletedays); // days left before // delete .. if != 0 // then char is inactive packet.writeD(charInfoPackage.getClassId()); - if (i == _activeId) { - packet.writeD(0x01); + packet.writeD(1); } else { - packet.writeD(0x00); // c3 auto-select char + packet.writeD(0); // c3 auto-select char } - packet.writeC(charInfoPackage.getEnchantEffect() > 127 ? 127 : charInfoPackage.getEnchantEffect()); - packet.writeD(charInfoPackage.getAugmentationId()); } return true; @@ -207,13 +189,11 @@ public class CharSelectInfo implements IClientOutgoingPacket { CharSelectInfoPackage charInfopackage; final List characterList = new ArrayList<>(); - try (Connection con = DatabaseFactory.getConnection()) { final PreparedStatement statement = con.prepareStatement("SELECT account_name, charId, char_name, level, maxHp, curHp, maxMp, curMp, acc, crit, evasion, mAtk, mDef, mSpd, pAtk, pDef, pSpd, runSpd, walkSpd, str, con, dex, _int, men, wit, face, hairStyle, hairColor, sex, heading, x, y, z, movement_multiplier, attack_speed_multiplier, colRad, colHeight, exp, sp, karma, pvpkills, pkkills, clanid, maxload, race, classid, deletetime, cancraft, title, rec_have, rec_left, accesslevel, online, char_slot, lastAccess, base_class FROM characters WHERE account_name=?"); statement.setString(1, _loginName); final ResultSet charList = statement.executeQuery(); - while (charList.next())// fills the package { charInfopackage = restoreChar(charList); @@ -222,14 +202,12 @@ public class CharSelectInfo implements IClientOutgoingPacket characterList.add(charInfopackage); } } - statement.close(); } catch (Exception e) { PacketLogger.warning(getClass().getSimpleName() + ": " + e.getMessage()); } - return characterList; } @@ -247,7 +225,6 @@ public class CharSelectInfo implements IClientOutgoingPacket charInfopackage.setSp(charList.getInt("sp")); charInfopackage.setLevel(charList.getInt("level")); } - charList.close(); statement.close(); } @@ -260,7 +237,6 @@ public class CharSelectInfo implements IClientOutgoingPacket private CharSelectInfoPackage restoreChar(ResultSet chardata) throws Exception { final int objectId = chardata.getInt("charId"); - // See if the char must be deleted final long deletetime = chardata.getLong("deletetime"); if ((deletetime > 0) && (Chronos.currentTimeMillis() > deletetime)) @@ -271,11 +247,9 @@ public class CharSelectInfo implements IClientOutgoingPacket { clan.removeClanMember(cha.getName(), 0); } - GameClient.deleteCharByObjId(objectId); return null; } - final String name = chardata.getString("char_name"); final CharSelectInfoPackage charInfopackage = new CharSelectInfoPackage(objectId, name); charInfopackage.setLevel(chardata.getInt("level")); @@ -284,38 +258,29 @@ public class CharSelectInfo implements IClientOutgoingPacket charInfopackage.setMaxMp(chardata.getInt("maxmp")); charInfopackage.setCurrentMp(chardata.getDouble("curmp")); charInfopackage.setKarma(chardata.getInt("karma")); - charInfopackage.setFace(chardata.getInt("face")); charInfopackage.setHairStyle(chardata.getInt("hairstyle")); charInfopackage.setHairColor(chardata.getInt("haircolor")); charInfopackage.setSex(chardata.getInt("sex")); - charInfopackage.setExp(chardata.getLong("exp")); charInfopackage.setSp(chardata.getInt("sp")); charInfopackage.setClanId(chardata.getInt("clanid")); - charInfopackage.setRace(chardata.getInt("race")); - charInfopackage.setAccessLevel(chardata.getInt("accesslevel")); - final int baseClassId = chardata.getInt("base_class"); final int activeClassId = chardata.getInt("classid"); - // if is in subclass, load subclass exp, sp, level info if (baseClassId != activeClassId) { loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId); } - charInfopackage.setClassId(activeClassId); - // Get the augmentation id for equipped weapon int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_LRHAND); if (weaponObjId < 1) { weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); } - if (weaponObjId > 0) { try (Connection con = DatabaseFactory.getConnection()) @@ -327,7 +292,6 @@ public class CharSelectInfo implements IClientOutgoingPacket { charInfopackage.setAugmentationId(result.getInt("attributes")); } - result.close(); statement.close(); } @@ -336,7 +300,6 @@ public class CharSelectInfo implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Could not restore augmentation info: " + e.getMessage()); } } - /* * Check if the base class is set to zero and alse doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly. */ @@ -348,10 +311,8 @@ public class CharSelectInfo implements IClientOutgoingPacket { charInfopackage.setBaseClassId(baseClassId); } - charInfopackage.setDeleteTimer(deletetime); charInfopackage.setLastAccess(chardata.getLong("lastAccess")); - return charInfopackage; } } \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 868e50c3e9..b662b0e2f9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -43,28 +43,26 @@ public class CharSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_SELECTED.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); // ?? packet.writeS(_player.getTitle()); packet.writeD(_sessionId); packet.writeD(_player.getClanId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x01); // active ?? + packet.writeD(1); // active ?? packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); - packet.writeF(_player.getCurrentHp()); packet.writeF(_player.getCurrentMp()); packet.writeD(_player.getSp()); packet.writeQ(_player.getExp()); packet.writeD(_player.getLevel()); packet.writeD(_player.getKarma()); // thx evill33t - packet.writeD(0x0); // ? + packet.writeD(0); // ? packet.writeD(_player.getINT()); packet.writeD(_player.getSTR()); packet.writeD(_player.getCON()); @@ -73,34 +71,29 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_player.getWIT()); for (int i = 0; i < 30; i++) { - packet.writeD(0x00); + packet.writeD(0); } // packet.writeD(0); //c3 // packet.writeD(0); //c3 // packet.writeD(0); //c3 - packet.writeD(0x00); // c3 work - packet.writeD(0x00); // c3 work - + packet.writeD(0); // c3 work + packet.writeD(0); // c3 work // extra info packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // in-game time - - packet.writeD(0x00); // - - packet.writeD(0x00); // c3 - - packet.writeD(0x00); // c3 InspectorBin - packet.writeD(0x00); // c3 - packet.writeD(0x00); // c3 - packet.writeD(0x00); // c3 - - packet.writeD(0x00); // c3 InspectorBin for 528 client - packet.writeD(0x00); // c3 - packet.writeD(0x00); // c3 - packet.writeD(0x00); // c3 - packet.writeD(0x00); // c3 - packet.writeD(0x00); // c3 - packet.writeD(0x00); // c3 - packet.writeD(0x00); // c3 + packet.writeD(0); // + packet.writeD(0); // c3 + packet.writeD(0); // c3 InspectorBin + packet.writeD(0); // c3 + packet.writeD(0); // c3 + packet.writeD(0); // c3 + packet.writeD(0); // c3 InspectorBin for 528 client + packet.writeD(0); // c3 + packet.writeD(0); // c3 + packet.writeD(0); // c3 + packet.writeD(0); // c3 + packet.writeD(0); // c3 + packet.writeD(0); // c3 + packet.writeD(0); // c3 return true; } } \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharTemplates.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharTemplates.java index 39c3f6639d..fbf84119ab 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharTemplates.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharTemplates.java @@ -40,7 +40,6 @@ public class CharTemplates implements IClientOutgoingPacket { OutgoingPackets.CHAR_TEMPLATES.writeId(packet); packet.writeD(_chars.size()); - for (PlayerTemplate temp : _chars) { packet.writeD(temp.getRace().ordinal()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ClanHallDecoration.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ClanHallDecoration.java index 060ae560f6..743b7da925 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ClanHallDecoration.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ClanHallDecoration.java @@ -52,7 +52,6 @@ public class ClanHallDecoration implements IClientOutgoingPacket { packet.writeC(2); } - // FUNC_RESTORE_MP function = _clanHall.getFunction(ClanHall.FUNC_RESTORE_MP); if ((function == null) || (function.getLvl() == 0)) @@ -70,7 +69,6 @@ public class ClanHallDecoration implements IClientOutgoingPacket packet.writeC(2); packet.writeC(2); } - // FUNC_RESTORE_EXP function = _clanHall.getFunction(ClanHall.FUNC_RESTORE_EXP); if ((function == null) || (function.getLvl() == 0)) @@ -100,7 +98,6 @@ public class ClanHallDecoration implements IClientOutgoingPacket packet.writeC(2); } packet.writeC(0); - // CURTAINS function = _clanHall.getFunction(ClanHall.FUNC_DECO_CURTAINS); if ((function == null) || (function.getLvl() == 0)) @@ -115,7 +112,6 @@ public class ClanHallDecoration implements IClientOutgoingPacket { packet.writeC(2); } - // FUNC_ITEM_CREATE function = _clanHall.getFunction(ClanHall.FUNC_ITEM_CREATE); if ((function == null) || (function.getLvl() == 0)) @@ -130,7 +126,6 @@ public class ClanHallDecoration implements IClientOutgoingPacket { packet.writeC(2); } - // FUNC_SUPPORT function = _clanHall.getFunction(ClanHall.FUNC_SUPPORT); if ((function == null) || (function.getLvl() == 0)) @@ -162,7 +157,6 @@ public class ClanHallDecoration implements IClientOutgoingPacket { packet.writeC(2); } - // FUNC_ITEM_CREATE function = _clanHall.getFunction(ClanHall.FUNC_ITEM_CREATE); if ((function == null) || (function.getLvl() == 0)) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java index b87f1854a1..7c109b078a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java @@ -28,14 +28,15 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ConfirmDlg implements IClientOutgoingPacket { + private static final int TYPE_TEXT = 0; + private static final int TYPE_NUMBER = 1; + private static final int TYPE_NPC_NAME = 2; + private static final int TYPE_ITEM_NAME = 3; + private static final int TYPE_SKILL_NAME = 4; + private static final int TYPE_ZONE_NAME = 7; + private final int _messageId; private int _skillLevel = 1; - private static final int TYPE_ZONE_NAME = 7; - private static final int TYPE_SKILL_NAME = 4; - private static final int TYPE_ITEM_NAME = 3; - private static final int TYPE_NPC_NAME = 2; - private static final int TYPE_NUMBER = 1; - private static final int TYPE_TEXT = 0; private final List _types = new ArrayList<>(); private final List _values = new ArrayList<>(); private int _time = 0; @@ -169,7 +170,6 @@ public class ConfirmDlg implements IClientOutgoingPacket { packet.writeD(_requesterId); } - if ((_time > 0) && (_targetPlayer != null)) { _targetPlayer.addConfirmDlgRequestTime(_requesterId, _time); @@ -177,9 +177,9 @@ public class ConfirmDlg implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index a6b57ce622..41e7d00631 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -43,7 +43,7 @@ public class DeleteObject implements IClientOutgoingPacket { OutgoingPackets.DELETE_OBJECT.writeId(packet); packet.writeD(_objectId); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 return true; } } \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 02d38ffc33..ebe6aa5065 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -63,10 +63,8 @@ public class Die implements IClientOutgoingPacket { return false; } - OutgoingPackets.DIE.writeId(packet); packet.writeD(_objectId); - // NOTE: // 6d 00 00 00 00 - to nearest village // 6d 01 00 00 00 - to hide away @@ -74,12 +72,11 @@ public class Die implements IClientOutgoingPacket // 6d 03 00 00 00 - to siege HQ // sweepable // 6d 04 00 00 00 - FIXED - packet.writeD(_canTeleport ? 0x01 : 0); // 6d 00 00 00 00 - to nearest village - + packet.writeD(_canTeleport ? 1 : 0); // 6d 00 00 00 00 - to nearest village if (_canTeleport && (_clan != null)) { SiegeClan siegeClan = null; - Boolean isInDefense = false; + boolean isInDefense = false; final Castle castle = CastleManager.getInstance().getCastle(_creature); final Fort fort = FortManager.getInstance().getFort(_creature); if ((castle != null) && castle.getSiege().isInProgress()) @@ -100,20 +97,18 @@ public class Die implements IClientOutgoingPacket isInDefense = true; } } - - packet.writeD(_clan.getHideoutId() > 0 ? 0x01 : 0x00); // 6d 01 00 00 00 - to hide away - packet.writeD((_clan.getCastleId() > 0) || (_clan.getFortId() > 0) || isInDefense ? 0x01 : 0x00); // 6d 02 00 00 00 - to castle - packet.writeD((siegeClan != null) && !isInDefense && !siegeClan.getFlag().isEmpty() ? 0x01 : 0x00); // 6d 03 00 00 00 - to siege HQ + packet.writeD(_clan.getHideoutId() > 0 ? 1 : 0); // 6d 01 00 00 00 - to hide away + packet.writeD((_clan.getCastleId() > 0) || (_clan.getFortId() > 0) || isInDefense ? 1 : 0); // 6d 02 00 00 00 - to castle + packet.writeD((siegeClan != null) && !isInDefense && !siegeClan.getFlag().isEmpty() ? 1 : 0); // 6d 03 00 00 00 - to siege HQ } else { - packet.writeD(0x00); // 6d 01 00 00 00 - to hide away - packet.writeD(0x00); // 6d 02 00 00 00 - to castle - packet.writeD(0x00); // 6d 03 00 00 00 - to siege HQ + packet.writeD(0); // 6d 01 00 00 00 - to hide away + packet.writeD(0); // 6d 02 00 00 00 - to castle + packet.writeD(0); // 6d 03 00 00 00 - to siege HQ } - - packet.writeD(_sweepable ? 0x01 : 0x00); // sweepable (blue glow) - packet.writeD(_allowFixedRes ? 0x01 : 0x00); // 6d 04 00 00 00 - to FIXED + packet.writeD(_sweepable ? 1 : 0); // sweepable (blue glow) + packet.writeD(_allowFixedRes ? 1 : 0); // 6d 04 00 00 00 - to FIXED return true; } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java index c83e72f2c4..0d4b035fcb 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java @@ -41,7 +41,7 @@ public class DoorInfo implements IClientOutgoingPacket OutgoingPackets.DOOR_INFO.writeId(packet); packet.writeD(_door.getObjectId()); packet.writeD(_door.getDoorId()); - packet.writeD(_showHp ? 0x01 : 0x00); + packet.writeD(_showHp ? 1 : 0); return true; } } \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index a508f44167..806f86fd5a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -47,21 +47,19 @@ public class DropItem implements IClientOutgoingPacket packet.writeD(_objectId); packet.writeD(_item.getObjectId()); packet.writeD(_item.getItemId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item if (_item.isStackable()) { - packet.writeD(0x01); + packet.writeD(1); } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(_item.getCount()); - packet.writeD(1); // unknown return true; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java index fc78d506ae..74b25fe105 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java @@ -55,7 +55,7 @@ public class Earthquake implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_intensity); packet.writeD(_duration); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown return true; } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java index a6c77b97fe..95a8c43355 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java @@ -122,7 +122,6 @@ public class EquipUpdate implements IClientOutgoingPacket break; } } - packet.writeD(bodypart); return true; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java index 72293f5fb8..d2a4fde478 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java @@ -48,11 +48,11 @@ public class EtcStatusUpdate implements IClientOutgoingPacket } else { - packet.writeD(0x00); // 1-7 increase force, level + packet.writeD(0); // 1-7 increase force, level } packet.writeD(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%) packet.writeD(_player.isInRefusalMode() || _player.isChatBanned() ? 1 : 0); // 1 = block all chat - // writeD(0x00); // 1 = danger area + // writeD(0); // 1 = danger area packet.writeD(_player.isInsideZone(ZoneId.DANGER_AREA)/* || _player.isInDangerArea() */ ? 1 : 0); // 1 = danger area packet.writeD(Math.min(_player.getExpertisePenalty() + _player.getMasteryPenalty() + _player.getMasteryWeapPenalty(), 1)); // 1 = grade penalty packet.writeD(_player.getCharmOfCourage() ? 1 : 0); // 1 = charm of courage (no xp loss in siege..) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmCancelItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmCancelItem.java index 60b9ec1bab..6c9e4177b7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmCancelItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmCancelItem.java @@ -42,7 +42,7 @@ public class ExConfirmCancelItem implements IClientOutgoingPacket packet.writeD(0x27); packet.writeD(0x2006); packet.writeQ(_price); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java index 98e988abe7..eb3392c572 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java @@ -38,7 +38,6 @@ public class ExCursedWeaponList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet); - packet.writeD(_cursedWeaponIds.size()); for (Integer i : _cursedWeaponIds) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java index b8a3226daa..db190f50fa 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java @@ -43,7 +43,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet); - if (!_cursedWeaponInfo.isEmpty()) { packet.writeD(_cursedWeaponInfo.size()); @@ -51,7 +50,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { packet.writeD(w.id); packet.writeD(w.activated); - packet.writeD(w.loc.getX()); packet.writeD(w.loc.getY()); packet.writeD(w.loc.getZ()); @@ -72,10 +70,8 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { /** The location. */ public Location loc; - /** The id. */ public int id; - /** The activated. */ public int activated; // 0 - not activated ? 1 - activated diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java index 10d1b1c16b..e64aaecae9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java @@ -27,7 +27,6 @@ public class ExDuelAskStart implements IClientOutgoingPacket { /** The _requestor name. */ private final String _requestorName; - /** The _party duel. */ private final int _partyDuel; @@ -46,7 +45,6 @@ public class ExDuelAskStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_ASK_START.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDuel); return true; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java index 8c7dd5eb01..2c64f10db0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java @@ -41,7 +41,6 @@ public class ExDuelEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_END.writeId(packet); - packet.writeD(_unk1); return true; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java index c57947015a..c2eb551256 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java @@ -41,7 +41,6 @@ public class ExDuelReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_READY.writeId(packet); - packet.writeD(_unk1); return true; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java index e3e06bcb2b..9e18e2c72e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java @@ -41,7 +41,6 @@ public class ExDuelStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_START.writeId(packet); - packet.writeD(_unk1); return true; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index eb99e49b22..4213c865d0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -66,15 +66,12 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_INFO.writeId(packet); - packet.writeD(_id); packet.writeD(_level); packet.writeD(_spCost); packet.writeQ(_xpCost); packet.writeD(_rate); - packet.writeD(_reqs.size()); - for (Req temp : _reqs) { packet.writeD(temp.type); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java index 3de4dcae74..1dd1f5f416 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java @@ -56,7 +56,6 @@ public class ExEnchantSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_LIST.writeId(packet); - packet.writeD(_skills.size()); for (Skill sk : _skills) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingHpRegen.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingHpRegen.java index dc0a8f17c3..4c0def1b45 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingHpRegen.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingHpRegen.java @@ -51,7 +51,6 @@ public class ExFishingHpRegen implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FISHING_HP_REGEN.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeD(_time); packet.writeD(_fishHP); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStart.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStart.java index b37e997902..7661e7ffae 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStart.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStart.java @@ -53,10 +53,10 @@ public class ExFishingStart implements IClientOutgoingPacket packet.writeD(_x); // x poisson packet.writeD(_y); // y poisson packet.writeD(_z); // z poisson - packet.writeC(0x00); // night lure - packet.writeC(0x00); // ?? - packet.writeC((_fishType >= 7) && (_fishType <= 9) ? 0x01 : 0x00); // 0 = day lure 1 = night lure - packet.writeC(0x00); + packet.writeC(0); // night lure + packet.writeC(0); // ?? + packet.writeC((_fishType >= 7) && (_fishType <= 9) ? 1 : 0); // 0 = day lure 1 = night lure + packet.writeC(0); return true; } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStartCombat.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStartCombat.java index bf91a478d8..29f7f9501a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStartCombat.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStartCombat.java @@ -47,7 +47,6 @@ public class ExFishingStartCombat implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FISHING_START_COMBAT.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeD(_time); packet.writeD(_hp); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java index e7ae194a59..b7ca841de2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java @@ -30,10 +30,8 @@ public class ExGetBossRecord implements IClientOutgoingPacket { /** The _boss record info. */ private final Map _bossRecordInfo; - /** The _ranking. */ private final int _ranking; - /** The _total points. */ private final int _totalPoints; @@ -58,10 +56,10 @@ public class ExGetBossRecord implements IClientOutgoingPacket packet.writeD(_totalPoints); if (_bossRecordInfo == null) { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } else { @@ -70,7 +68,7 @@ public class ExGetBossRecord implements IClientOutgoingPacket { packet.writeD(entry.getKey()); packet.writeD(entry.getValue()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? } } return true; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index 7a5339cbdf..27734f7c4a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -42,7 +42,6 @@ public class ExHeroList implements IClientOutgoingPacket { OutgoingPackets.EX_HERO_LIST.writeId(packet); packet.writeD(_heroList.size()); - for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 700a38c802..973c0f9d95 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -53,7 +53,6 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(packet); - // If the mode is 0 and the activeChar isn't the PartyRoom leader, return an empty list. if (_mode == 0) { @@ -66,7 +65,6 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket return true; } } - for (Player cha : PartyMatchWaitingList.getInstance().getPlayers()) { // Don't add yourself in the list @@ -74,21 +72,17 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket { continue; } - if (!cha.isPartyWaiting()) { PartyMatchWaitingList.getInstance().removePlayer(cha); continue; } - if ((cha.getLevel() < _minLevel) || (cha.getLevel() > _maxLevel)) { continue; } - _members.add(cha); } - int count = 0; final int size = _members.size(); packet.writeD(1); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java index 6392dbba23..7d28cf5586 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java @@ -38,7 +38,6 @@ public class ExMPCCShowPartyMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_SHOW_PARTY_MEMBER_INFO.writeId(packet); - packet.writeD(_party.getMemberCount()); for (Player pc : _party.getPartyMembers()) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java index 7184c63000..bfcb7c188b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java @@ -20,7 +20,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.network.OutgoingPackets; /** - * Fromat: (ch) (just a trigger) + * Format: (ch) (just a trigger) * @author -Wooden- */ public class ExMailArrived implements IClientOutgoingPacket diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java index 81f8877b39..48abbacdb3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java @@ -40,13 +40,10 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket { return false; } - OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet); - packet.writeS(_channel.getChannelLeader().getName()); packet.writeD(0); // Channel loot packet.writeD(_channel.getMemberCount()); - packet.writeD(_channel.getParties().size()); for (Party p : _channel.getParties()) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java index f8002321cb..2201f7c3f0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java @@ -46,12 +46,10 @@ public class ExOlympiadMode implements IClientOutgoingPacket { return false; } - if (_mode == 3) { _player.setObserverMode(true); } - OutgoingPackets.EX_OLYMPIAD_MODE.writeId(packet); packet.writeC(_mode); return true; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java index 28016623e8..359c937455 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java @@ -58,7 +58,6 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket _periodType = 2; _pointType = 2; } - _remainTime = hour; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java index 023b5a0b41..c4cbee2231 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java @@ -46,7 +46,7 @@ public class ExPledgeEmblem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_crestId); if (_data != null) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java index 7044264a80..121d1d5af9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java @@ -177,9 +177,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(65535); // has to do something with display range and angle packet.writeD(65535); // has to do something with display range and angle - packet.writeD(_points.size() + _lines.size()); - for (Point point : _points) { packet.writeC(1); // Its the type in this case Point @@ -193,7 +191,6 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(point.getY()); packet.writeD(point.getZ()); } - for (Line line : _lines) { packet.writeC(2); // Its the type in this case Line diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java index a3f2f40145..b1844a5db4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java @@ -27,19 +27,14 @@ public class ExSetCompassZoneCode implements IClientOutgoingPacket { /** The Constant SIEGEWARZONE1. */ public static final int SIEGEWARZONE1 = 0x0A; - /** The Constant SIEGEWARZONE2. */ public static final int SIEGEWARZONE2 = 0x0B; - /** The Constant PEACEZONE. */ public static final int PEACEZONE = 0x0C; - /** The Constant SEVENSIGNSZONE. */ public static final int SEVENSIGNSZONE = 0x0D; - /** The Constant PVPZONE. */ public static final int PVPZONE = 0x0E; - /** The Constant GENERALZONE. */ public static final int GENERALZONE = 0x0F; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index 0b71f2c32b..c3f542a54e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -28,7 +28,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; * Format: ch cddd[ddddcdcdcd] c - id (0xFE) h - sub id (0x1D) c d - manor id d d - size [ d - crop id d - residual buy d - start buy d - buy price c - reward type d - seed level c - reward 1 items d - reward 1 item id c - reward 2 items d - reward 2 item id ] * @author l3x */ - public class ExShowCropInfo implements IClientOutgoingPacket { private List _crops; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index bc6ef6f7ee..34a37c2e50 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -89,10 +89,8 @@ public class ExShowCropSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_count); // size - for (int i = 0; i < _count; i++) { packet.writeD(_cropData[(i * 14) + 0]); // crop id @@ -101,16 +99,13 @@ public class ExShowCropSetting implements IClientOutgoingPacket packet.writeD(_cropData[(i * 14) + 2]); // reward 1 id packet.writeC(1); packet.writeD(_cropData[(i * 14) + 3]); // reward 2 id - packet.writeD(_cropData[(i * 14) + 4]); // next sale limit packet.writeD(_cropData[(i * 14) + 5]); // ??? packet.writeD(_cropData[(i * 14) + 6]); // min crop price packet.writeD(_cropData[(i * 14) + 7]); // max crop price - packet.writeD(_cropData[(i * 14) + 8]); // today buy packet.writeD(_cropData[(i * 14) + 9]); // today price packet.writeC(_cropData[(i * 14) + 10]); // today reward - packet.writeD(_cropData[(i * 14) + 11]); // next buy packet.writeD(_cropData[(i * 14) + 12]); // next price packet.writeC(_cropData[(i * 14) + 13]); // next reward diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 047367b3cb..42e66ad0c7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -54,10 +54,8 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet); - packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index cf42f8ae05..38b4ee63f0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -84,10 +84,8 @@ public class ExShowSeedSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_count); // size - for (int i = 0; i < _count; i++) { packet.writeD(_seedData[(i * 12) + 0]); // seed id @@ -96,12 +94,10 @@ public class ExShowSeedSetting implements IClientOutgoingPacket packet.writeD(_seedData[(i * 12) + 2]); // reward 1 id packet.writeC(1); packet.writeD(_seedData[(i * 12) + 3]); // reward 2 id - packet.writeD(_seedData[(i * 12) + 4]); // next sale limit packet.writeD(_seedData[(i * 12) + 5]); // price for castle to produce 1 packet.writeD(_seedData[(i * 12) + 6]); // min seed price packet.writeD(_seedData[(i * 12) + 7]); // max seed price - packet.writeD(_seedData[(i * 12) + 8]); // today sales packet.writeD(_seedData[(i * 12) + 9]); // today price packet.writeD(_seedData[(i * 12) + 10]); // next sales diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 2c74c771dc..0d933429a4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -31,7 +31,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; * format(packet 0xFE) ch dd [ddddcdcdddc] c - id h - sub id d - manor id d - size [ d - Object id d - crop id d - seed level c d - reward 1 id c d - reward 2 id d - manor d - buy residual d - buy price d - reward ] * @author l3x */ - public class ExShowSellCropList implements IClientOutgoingPacket { private int _manorId = 1; @@ -43,7 +42,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _manorId = manorId; _castleCrops = new HashMap<>(); _cropsItems = new HashMap<>(); - final List allCrops = ManorSeedData.getInstance().getAllCrops(); for (int cropId : allCrops) { @@ -53,7 +51,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _cropsItems.put(cropId, item); } } - for (CropProcure crop : crops) { if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) @@ -67,10 +64,8 @@ public class ExShowSellCropList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_cropsItems.size()); // size - for (Item item : _cropsItems.values()) { packet.writeD(item.getObjectId()); // Object id @@ -80,7 +75,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket packet.writeD(ManorSeedData.getInstance().getRewardItem(item.getItemId(), 1)); // reward 1 id packet.writeC(1); packet.writeD(ManorSeedData.getInstance().getRewardItem(item.getItemId(), 2)); // reward 2 id - if (_castleCrops.containsKey(item.getItemId())) { final CropProcure crop = _castleCrops.get(item.getItemId()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index d3c1e08f37..d896aa5149 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -52,7 +52,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet); - packet.writeD(_inventory); packet.writeD(_warehouse); packet.writeD(_freight); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java index cfc983ef5f..5d12cd5e38 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java @@ -59,7 +59,6 @@ public class ExUseSharedGroupItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USE_SHARED_GROUP_ITEM.writeId(packet); - packet.writeD(_unk1); packet.writeD(_unk2); packet.writeD(_unk3); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java index f9fd99f0ea..ec3863c62e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java @@ -26,7 +26,6 @@ public class ExVariationCancelResult implements IClientOutgoingPacket { /** The _close window. */ private final int _closeWindow; - /** The _unk1. */ private final int _unk1; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java index 6e8bd5de5f..7e30c6c891 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java @@ -26,10 +26,8 @@ public class ExVariationResult implements IClientOutgoingPacket { /** The _stat12. */ private final int _stat12; - /** The _stat34. */ private final int _stat34; - /** The _unk3. */ private final int _unk3; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java index eef79a21ed..a89ae5e2d9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java @@ -37,7 +37,6 @@ public class FakePlayerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeD(_activeChar.getX()); packet.writeD(_activeChar.getY()); packet.writeD(_activeChar.getZ()); @@ -59,7 +58,6 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_activeChar.getFakePlayer().PAPERDOLL_RHAND()); packet.writeD(_activeChar.getFakePlayer().PAPERDOLL_HAIR()); packet.writeD(_activeChar.getFakePlayer().PAPERDOLL_HAIR2()); - packet.writeH(0); packet.writeH(0); packet.writeH(0); @@ -84,7 +82,6 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeH(0); packet.writeH(0); packet.writeH(0); - packet.writeD(_activeChar.getFakePlayer().getPvpFlag() ? 1 : 0); packet.writeD(_activeChar.getFakePlayer().getKarma()); packet.writeD(_activeChar.getMAtkSpd()); @@ -141,7 +138,7 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_activeChar.getFakePlayer().getPledgeClass()); packet.writeD(0); packet.writeD(_activeChar.getFakePlayer().titleColor()); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/FriendList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/FriendList.java index 1918bb74bb..7431fc1203 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/FriendList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/FriendList.java @@ -67,8 +67,8 @@ public class FriendList implements IClientOutgoingPacket { packet.writeD(friend._objId); packet.writeS(friend._name); - packet.writeD(friend._online ? 0x01 : 0x00); - packet.writeD(friend._online ? friend._objId : 0x00); + packet.writeD(friend._online ? 1 : 0); + packet.writeD(friend._online ? friend._objId : 0); } return true; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index a1c78625dc..7220e56831 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -46,9 +46,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket final float moveMultiplier = _player.getMovementSpeedMultiplier(); final int runSpd = (int) (_player.getRunSpeed() / moveMultiplier); final int walkSpd = (int) (_player.getWalkSpeed() / moveMultiplier); - OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -74,7 +72,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); packet.writeD(0x28); // unknown - packet.writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_DHAIR)); packet.writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_REAR)); packet.writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_LEAR)); @@ -92,7 +89,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_LRHAND)); packet.writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_HAIR)); packet.writeD(_player.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_FACE)); - packet.writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_DHAIR)); packet.writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_REAR)); packet.writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_LEAR)); @@ -110,43 +106,41 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_LRHAND)); packet.writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_HAIR)); packet.writeD(_player.getInventory().getPaperdollItemId(Inventory.PAPERDOLL_FACE)); - // c6 new h's - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); + 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.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.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); // end of c6 new h's packet.writeD(_player.getPAtk(null)); packet.writeD(_player.getPAtkSpd()); @@ -155,15 +149,11 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket 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); packet.writeD(walkSpd); packet.writeD(runSpd); // swimspeed @@ -179,8 +169,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeD(_player.isGM() ? 0x01 : 0x00); // builder level - + packet.writeD(_player.isGM() ? 1 : 0); // builder level packet.writeS(_player.getTitle()); packet.writeD(_player.getClanId()); // pledge id packet.writeD(_player.getClanCrestId()); // pledge crest id @@ -190,23 +179,17 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeC(_player.hasDwarvenCraft() ? 1 : 0); packet.writeD(_player.getPkKills()); packet.writeD(_player.getPvpKills()); - packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); - - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeC(321); - packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window - - packet.writeC(_player.isNoble() ? 0x01 : 0x00); - packet.writeC(_player.isHero() ? 0x01 : 0x00); - + packet.writeC(_player.isNoble() ? 1 : 0); + packet.writeC(_player.isHero() ? 1 : 0); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); return true; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewHennaInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewHennaInfo.java index f1d59034a7..d0b4e57cdc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewHennaInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewHennaInfo.java @@ -45,16 +45,13 @@ public class GMViewHennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_HENNA_INFO.writeId(packet); - packet.writeC(_player.getHennaStatINT()); packet.writeC(_player.getHennaStatSTR()); packet.writeC(_player.getHennaStatCON()); packet.writeC(_player.getHennaStatMEN()); packet.writeC(_player.getHennaStatDEX()); packet.writeC(_player.getHennaStatWIT()); - packet.writeD(3); // slots? - packet.writeD(_count); // size for (int i = 0; i < _count; i++) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index 3b00087bfb..48159e89d5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -45,24 +45,21 @@ public class GMViewItemList implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_ITEM_LIST.writeId(packet); packet.writeS(_playerName); packet.writeD(_player.getInventoryLimit()); // inventory limit - packet.writeH(0x01); // show window ?? + packet.writeH(1); // show window ?? packet.writeH(_items.size()); - for (Item temp : _items) { if ((temp == null) || (temp.getItem() == null)) { continue; } - packet.writeH(temp.getItem().getType1()); - packet.writeD(temp.getObjectId()); packet.writeD(temp.getItemId()); packet.writeD(temp.getCount()); packet.writeH(temp.getItem().getType2()); packet.writeH(temp.getCustomType1()); - packet.writeH(temp.isEquipped() ? 0x01 : 0x00); + packet.writeH(temp.isEquipped() ? 1 : 0); packet.writeD(temp.getItem().getBodyPart()); packet.writeH(temp.getEnchantLevel()); packet.writeH(temp.getCustomType2()); @@ -72,7 +69,7 @@ public class GMViewItemList implements IClientOutgoingPacket } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(-1); // C6 } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index 37f4bdd5d1..a771b53dd3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -47,7 +47,7 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeD(_clan.getClanId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); packet.writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game @@ -58,12 +58,10 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_clan.getReputationScore()); packet.writeD(0); packet.writeD(0); - packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 packet.writeD(_clan.getAllyCrestId()); // c2 packet.writeD(_clan.isAtWar()); // c3 - final Collection members = _clan.getMembers(); packet.writeD(members.size()); for (ClanMember member : members) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewQuestList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewQuestList.java index 52c456313b..65b0285110 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewQuestList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewQuestList.java @@ -42,7 +42,6 @@ public class GMViewQuestList implements IClientOutgoingPacket { OutgoingPackets.GM_VIEW_QUEST_LIST.writeId(packet); packet.writeS(_player.getName()); - final List questList = _player.getAllActiveQuests(); packet.writeH(questList.size()); // quest count for (Quest q : questList) @@ -54,7 +53,6 @@ public class GMViewQuestList implements IClientOutgoingPacket packet.writeD(0); continue; } - packet.writeD(qs.getCond()); // stage of quest progress } return true; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java index 7f3b90a8da..b362821799 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -45,7 +45,7 @@ public class GMViewSkillInfo implements IClientOutgoingPacket packet.writeD(skill.isPassive() ? 1 : 0); packet.writeD(skill.getLevel()); packet.writeD(skill.getId()); - packet.writeC(0x00); // c5 + packet.writeC(0); // c5 } return true; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index f87906663a..5224a258a3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -57,17 +57,14 @@ public class GMViewWarehouseWithdrawList implements IClientOutgoingPacket packet.writeS(_playerName); packet.writeD(_money); packet.writeH(_items.size()); - for (Item item : _items) { packet.writeH(item.getItem().getType1()); - packet.writeD(item.getObjectId()); packet.writeD(item.getItemId()); packet.writeD(item.getCount()); packet.writeH(item.getItem().getType2()); packet.writeH(item.getCustomType1()); - switch (item.getItem().getType2()) { case ItemTemplate.TYPE2_WEAPON: @@ -87,14 +84,12 @@ public class GMViewWarehouseWithdrawList implements IClientOutgoingPacket { packet.writeD(item.getItem().getBodyPart()); packet.writeH(item.getEnchantLevel()); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); break; } } - packet.writeD(item.getObjectId()); - switch (item.getItem().getType2()) { case ItemTemplate.TYPE2_WEAPON: diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index 717b548b8d..9c28a6d459 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -41,7 +41,6 @@ public class GetItem implements IClientOutgoingPacket OutgoingPackets.GET_ITEM.writeId(packet); packet.writeD(_playerId); packet.writeD(_item.getObjectId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 0319e3a4fa..bb165224a0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -41,7 +41,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeD(_player.getAdena()); packet.writeD(3); packet.writeD(_hennaEquipList.size()); - for (Henna temp : _hennaEquipList) { // Player must have at least one dye in inventory to be able to see the henna that can be applied with it. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 1146173d86..720d0d4b35 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -45,14 +45,12 @@ public class HennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_INFO.writeId(packet); - packet.writeC(_player.getHennaStatINT()); // equip INT packet.writeC(_player.getHennaStatSTR()); // equip STR packet.writeC(_player.getHennaStatCON()); // equip CON packet.writeC(_player.getHennaStatMEN()); // equip MEM packet.writeC(_player.getHennaStatDEX()); // equip DEX packet.writeC(_player.getHennaStatWIT()); // equip WIT - // Henna slots int classId = _player.getClassId().level(); if (classId == 1) @@ -67,7 +65,6 @@ public class HennaInfo implements IClientOutgoingPacket { packet.writeD(0); } - packet.writeD(_count); // size for (int i = 0; i < _count; i++) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemInfo.java index ff97978c0d..321c84dfb4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemInfo.java @@ -42,7 +42,6 @@ public class HennaItemInfo implements IClientOutgoingPacket packet.writeD(_henna.getPrice()); // total amount of adenas required to draw symbol packet.writeD(1); // able to draw or not 0 is false and 1 is true packet.writeD(_player.getAdena()); - packet.writeD(_player.getINT()); // current INT packet.writeC(_player.getINT() + _henna.getINT()); // equip INT packet.writeD(_player.getSTR()); // current STR diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index bbfd432bfc..8bcd2c3400 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -42,7 +42,6 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket packet.writeD(_henna.getPrice() / 5); // amount of required adenas packet.writeD(1); // able to remove or not 0 is false and 1 is true packet.writeD(_player.getAdena()); - packet.writeD(_player.getINT()); // current INT packet.writeC(_player.getINT() - _henna.getINT()); // equip INT packet.writeD(_player.getSTR()); // current STR diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index e7a130fff6..c04ed908d1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -37,7 +37,6 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(_player.getAdena()); packet.writeD(_player.getHennaEmptySlots()); packet.writeD(Math.abs(_player.getHennaEmptySlots() - 3)); - for (int i = 1; i <= 3; i++) { final Henna henna = _player.getHenna(i); @@ -47,7 +46,7 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(henna.getDyeId()); packet.writeD(Henna.getRequiredDyeAmount() / 2); packet.writeD(henna.getPrice() / 5); - packet.writeD(0x01); + packet.writeD(1); } } return true; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index a7c40fc36a..ea92aefbb0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -50,7 +50,7 @@ public class ItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ITEM_LIST.writeId(packet); - packet.writeH(_showWindow ? 0x01 : 0x00); + packet.writeH(_showWindow ? 1 : 0); packet.writeH(_items.size()); for (Item temp : _items) { @@ -64,7 +64,7 @@ public class ItemList implements IClientOutgoingPacket packet.writeD(temp.getCount()); packet.writeH(temp.getItem().getType2()); packet.writeH(temp.getCustomType1()); - packet.writeH(temp.isEquipped() ? 0x01 : 0x00); + packet.writeH(temp.isEquipped() ? 1 : 0); packet.writeD(temp.getItem().getBodyPart()); packet.writeH(temp.getEnchantLevel()); // race tickets diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java index e4adce2daa..24faf515cf 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java @@ -45,7 +45,6 @@ public class JoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PARTY.writeId(packet); - packet.writeD(_response); return true; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java index 4e2f2127ec..7db002454c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java @@ -35,7 +35,6 @@ public class JoinPledge implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PLEDGE.writeId(packet); - packet.writeD(_pledgeId); return true; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index 38d6af6dec..4868af3d52 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -38,7 +38,7 @@ public class KeyPacket implements IClientOutgoingPacket packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok packet.writeB(_key); packet.writeD(Config.SERVER_ID); // server id - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicEffectIcons.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicEffectIcons.java index 773ab3a68f..f4c1ab7e5c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicEffectIcons.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicEffectIcons.java @@ -57,7 +57,6 @@ public class MagicEffectIcons implements IClientOutgoingPacket { return; } - if (debuff) { _debuffs.add(new Effect(skillId, level, duration)); @@ -72,14 +71,11 @@ public class MagicEffectIcons implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_EFFECT_ICONS.writeId(packet); - packet.writeH(_effects.size() + _debuffs.size()); - for (Effect temp : _effects) { packet.writeD(temp._skillId); packet.writeH(temp._level); - if (temp._duration == -1) { packet.writeD(-1); @@ -89,12 +85,10 @@ public class MagicEffectIcons implements IClientOutgoingPacket packet.writeD(temp._duration / 1000); } } - for (Effect temp : _debuffs) { packet.writeD(temp._skillId); packet.writeH(temp._level); - if (temp._duration == -1) { packet.writeD(-1); @@ -104,7 +98,6 @@ public class MagicEffectIcons implements IClientOutgoingPacket packet.writeD(temp._duration / 1000); } } - return true; } } \ No newline at end of file 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 fce15a399f..3773099a5b 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 @@ -42,7 +42,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket _objectId = creature.getObjectId(); _skillId = skillId; _skillLevel = skillLevel; - if (targets != null) { _numberOfTargets = targets.size(); @@ -54,7 +53,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket _targets = new ArrayList<>(); _targets.add(creature); } - _singleTargetId = 0; } 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 20c0ebe96d..04a8281b65 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 @@ -76,12 +76,12 @@ public class MagicSkillUse implements IClientOutgoingPacket packet.writeD(_z); // if (_critical) // ? // { - // writeD(0x01); - // writeH(0x00); + // writeD(1); + // writeH(0); // } // else // { - packet.writeD(0x00); + packet.writeD(0); // } packet.writeD(_targetx); packet.writeD(_targety); 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 581b2c8265..e6e8dd12c4 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 @@ -45,7 +45,6 @@ public class ManagePledgePower implements IClientOutgoingPacket { return true; } - OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet); packet.writeD(0); packet.writeD(0); 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 e9c7228b8e..cdb12d1b27 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 @@ -46,11 +46,9 @@ public class MonRaceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MON_RACE_INFO.writeId(packet); - packet.writeD(_unknown1); packet.writeD(_unknown2); packet.writeD(8); - for (int i = 0; i < 8; i++) { packet.writeD(_monsters[i].getObjectId()); // npcObjectID @@ -77,7 +75,6 @@ public class MonRaceInfo implements IClientOutgoingPacket } packet.writeD(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 69e15f58d0..1b4775ea64 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 @@ -49,13 +49,10 @@ public class MoveToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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); 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 43ce2891d1..04f10aa847 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 @@ -38,13 +38,11 @@ public class MoveToLocationInVehicle implements IClientOutgoingPacket { return; } - final Player player = (Player) actor; if (player.getBoat() == null) { return; } - _objectId = player.getObjectId(); _boatId = player.getBoat().getObjectId(); _destination = destination; 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 f487262e10..9dd7fd3304 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 @@ -53,11 +53,9 @@ public class MoveToPawn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_PAWN.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetId); packet.writeD(_distance); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_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 77f5eb9185..52f436d8a1 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 @@ -51,18 +51,16 @@ public class MultiSellList implements IClientOutgoingPacket packet.writeD(_finished); // finished packet.writeD(0x28); // size of pages packet.writeD(_list == null ? 0 : _list.getEntries().size()); // list length - if (_list != null) { for (MultiSellEntry ent : _list.getEntries()) { packet.writeD(ent.getEntryId()); - packet.writeD(0x00); // C6 - packet.writeD(0x00); // C6 + packet.writeD(0); // C6 + packet.writeD(0); // C6 packet.writeC(1); packet.writeH(ent.getProducts().size()); packet.writeH(ent.getIngredients().size()); - for (MultiSellIngredient i : ent.getProducts()) { packet.writeH(i.getItemId()); @@ -70,10 +68,9 @@ public class MultiSellList implements IClientOutgoingPacket packet.writeH(ItemTable.getInstance().getTemplate(i.getItemId()).getType2()); packet.writeD(i.getItemCount()); packet.writeH(i.getEnchantmentLevel()); // enchtant level - packet.writeD(0x00); // C6 - packet.writeD(0x00); // C6 + packet.writeD(0); // C6 + packet.writeD(0); // C6 } - for (MultiSellIngredient i : ent.getIngredients()) { final int items = i.getItemId(); @@ -86,8 +83,8 @@ public class MultiSellList implements IClientOutgoingPacket packet.writeH(typeE); packet.writeD(i.getItemCount()); // Count packet.writeH(i.getEnchantmentLevel()); // Enchant Level - packet.writeD(0x00); // C6 - packet.writeD(0x00); // C6 + packet.writeD(0); // C6 + packet.writeD(0); // C6 } } } 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 b9c3d1b6f1..5bf1eb43f7 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 @@ -47,7 +47,6 @@ public class MyTargetSelected implements IClientOutgoingPacket { /** The _object id. */ private final int _objectId; - /** The _color. */ private final int _color; 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 0a96399834..cc15fa1a44 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 @@ -129,13 +129,10 @@ public class NpcHtmlMessage implements IClientOutgoingPacket { /** The _npc obj id. */ private final int _npcObjId; - /** The _html. */ private String _html; - /** The _html file. */ private String _file = null; - /** The _validate. */ private final boolean _validate = true; @@ -167,7 +164,6 @@ public class NpcHtmlMessage implements IClientOutgoingPacket buildBypassCache(player); buildLinksCache(player); } - if ((_file != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS) { BuilderUtil.sendHtmlMessage(player, _file.substring(10)); @@ -186,14 +182,12 @@ public class NpcHtmlMessage implements IClientOutgoingPacket _html = ""; return; } - if (text.length() > 8192) { PacketLogger.warning("Html is too long! This will crash the client!"); _html = "Html was too long,
Try to use DB for this action"; return; } - _html = text; // html code must not exceed 8192 bytes } @@ -211,7 +205,6 @@ public class NpcHtmlMessage implements IClientOutgoingPacket PacketLogger.warning("Missing html page " + path); return false; } - _file = path; setHtml(content); return true; @@ -257,7 +250,6 @@ public class NpcHtmlMessage implements IClientOutgoingPacket { return; } - player.clearBypass(); final int len = _html.length(); for (int i = 0; i < len; i++) @@ -268,7 +260,6 @@ public class NpcHtmlMessage implements IClientOutgoingPacket { break; } - start += 10; i = start; final int finish2 = _html.indexOf('$', start); @@ -294,7 +285,6 @@ public class NpcHtmlMessage implements IClientOutgoingPacket { return; } - player.clearLinks(); final int len = _html.length(); for (int i = 0; i < len; i++) @@ -305,7 +295,6 @@ public class NpcHtmlMessage implements IClientOutgoingPacket { break; } - i = start; player.addLink(_html.substring(start + 5, finish).trim()); } @@ -317,7 +306,7 @@ public class NpcHtmlMessage implements IClientOutgoingPacket OutgoingPackets.NPC_HTML_MESSAGE.writeId(packet); packet.writeD(_npcObjId); packet.writeS(_html); - packet.writeD(0x00); + packet.writeD(0); return true; } 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 b07c16bf85..e85e955c83 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 @@ -27,9 +27,9 @@ import org.l2jmobius.gameserver.model.actor.instance.FortSiegeGuard; import org.l2jmobius.gameserver.model.actor.instance.Guard; import org.l2jmobius.gameserver.model.actor.instance.Monster; import org.l2jmobius.gameserver.model.actor.instance.Pet; +import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.actor.instance.SiegeGuard; import org.l2jmobius.gameserver.model.actor.instance.SiegeNpc; -import org.l2jmobius.gameserver.model.actor.instance.Servitor; import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.zone.ZoneId; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -81,7 +81,6 @@ public class NpcInfo implements IClientOutgoingPacket attacker.broadcastPacket(new StopRotation(cha, cha.getHeading(), 0)); return; } - _creature = cha; _displayId = cha.getTemplate().getDisplayId(); _isAttackable = cha.isAutoAttackable(attacker); @@ -90,7 +89,6 @@ public class NpcInfo implements IClientOutgoingPacket _isSummoned = false; _collisionHeight = cha.getTemplate().getFCollisionHeight(); _collisionRadius = cha.getTemplate().getFCollisionRadius(); - if (Config.SHOW_NPC_CLAN_CREST && (cha.getCastle() != null) && (cha.getCastle().getOwnerId() != 0) && !cha.isMonster() && !cha.isArtefact() && !(cha instanceof ControlTower)) { if (cha.isInsideZone(ZoneId.TOWN) || cha.isInsideZone(ZoneId.CASTLE) // @@ -103,12 +101,10 @@ public class NpcInfo implements IClientOutgoingPacket _allyId = clan.getAllyId(); } } - if (cha.getTemplate().isServerSideName()) { _name = cha.getTemplate().getName(); } - if (Config.CHAMPION_ENABLE && cha.isChampion()) { _title = Config.CHAMP_TITLE; @@ -121,7 +117,6 @@ public class NpcInfo implements IClientOutgoingPacket { _title = cha.getTitle(); } - // Custom level titles if (cha.isMonster() && (Config.SHOW_NPC_LEVEL || Config.SHOW_NPC_AGGRESSION)) { @@ -150,7 +145,6 @@ public class NpcInfo implements IClientOutgoingPacket } _title = cha.isChampion() ? Config.CHAMP_TITLE + " " + t1 : t1; } - _x = _creature.getX(); _y = _creature.getY(); _z = _creature.getZ(); @@ -183,7 +177,6 @@ public class NpcInfo implements IClientOutgoingPacket _name = _creature.getName(); _title = cha.getTitle(); } - _x = _creature.getX(); _y = _creature.getY(); _z = _creature.getZ(); @@ -199,16 +192,10 @@ public class NpcInfo implements IClientOutgoingPacket @Override public boolean write(PacketWriter packet) { - if (_creature == null) + if ((_creature == null) || ((_creature instanceof Summon) && (((Summon) _creature).getOwner() != null) && ((Summon) _creature).getOwner().getAppearance().isInvisible())) { return false; } - - if ((_creature instanceof Summon) && (((Summon) _creature).getOwner() != null) && ((Summon) _creature).getOwner().getAppearance().isInvisible()) - { - return false; - } - OutgoingPackets.NPC_INFO.writeId(packet); packet.writeD(_creature.getObjectId()); packet.writeD(_displayId + 1000000); // npctype id @@ -217,7 +204,7 @@ public class NpcInfo implements IClientOutgoingPacket packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); packet.writeD(_runSpd); @@ -243,10 +230,9 @@ public class NpcInfo implements IClientOutgoingPacket 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); - if (_creature instanceof Summon) { - packet.writeD(0x01); // Title color 0=client default + packet.writeD(1); // Title color 0=client default packet.writeD(((Summon) _creature).getPvpFlag()); packet.writeD(((Summon) _creature).getKarma()); } @@ -256,27 +242,24 @@ public class NpcInfo implements IClientOutgoingPacket packet.writeD(0); packet.writeD(0); } - packet.writeD(_creature.getAbnormalEffect()); // C2 packet.writeD(_clanId); // C2 packet.writeD(_clanCrest); // C2 packet.writeD(_allyId); // C2 packet.writeD(_allyCrest); // C2 - packet.writeC(0x00); // C2 - + packet.writeC(0); // C2 if (Config.CHAMPION_ENABLE) { packet.writeC(_creature.isChampion() ? Config.CHAMPION_AURA : 0); } else { - packet.writeC(0x00); // C3 team circle 1-blue, 2-red + packet.writeC(0); // C3 team circle 1-blue, 2-red } - packet.writeF(_collisionRadius); packet.writeF(_collisionHeight); - packet.writeD(0x00); // C4 - packet.writeD(0x00); // C6 + packet.writeD(0); // C4 + packet.writeD(0); // C6 return true; } } 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 7f07473ff4..58fce38644 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 @@ -47,9 +47,9 @@ public class ObservationMode implements IClientOutgoingPacket packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeC(0x00); + packet.writeC(0); packet.writeC(0xc0); - packet.writeC(0x00); + packet.writeC(0); return true; } } 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 022ace542b..d367081144 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 @@ -42,7 +42,6 @@ public class PackageSendableList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet); - packet.writeD(_playerObjId); packet.writeD(_adena); packet.writeD(_items.size()); @@ -53,11 +52,11 @@ public class PackageSendableList implements IClientOutgoingPacket packet.writeD(item.getItemId()); packet.writeD(item.getCount()); packet.writeH(item.getItem().getType2()); - packet.writeH(0x00); + packet.writeH(0); packet.writeD(item.getItem().getBodyPart()); packet.writeH(item.getEnchantLevel()); - packet.writeH(0x00); - packet.writeH(0x00); + 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?? } return true; 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 0a45207cd6..e84e975d99 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 @@ -50,20 +50,16 @@ public class PartyMatchList implements IClientOutgoingPacket PartyMatchRoomList.getInstance().deleteRoom(room.getId()); continue; } - if ((_loc > 0) && (_loc != room.getLocation())) { continue; } - if ((_lim == 0) && ((_player.getLevel() < room.getMinLevel()) || (_player.getLevel() > room.getMaxLevel()))) { continue; } - _rooms.add(room); } - int count = 0; final int size = _rooms.size(); OutgoingPackets.PARTY_MATCH_LIST.writeId(packet); @@ -75,7 +71,6 @@ public class PartyMatchList implements IClientOutgoingPacket { packet.writeD(0); } - packet.writeD(_rooms.size()); while (size > count) { 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 bf40a641c7..300cfa12d4 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 @@ -56,7 +56,6 @@ public class PartyMemberPosition implements IClientOutgoingPacket { OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); packet.writeD(_locations.size()); - for (Entry entry : _locations.entrySet()) { final Location loc = entry.getValue(); 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 ca82e44e2f..f112f59d41 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 @@ -45,17 +45,15 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket 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(0x01); ?? + packet.writeD(0); // writeD(1); ?? packet.writeD(0); return true; } 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 b750b30897..98ee6b2e0b 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 @@ -44,28 +44,24 @@ public class PartySmallWindowAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ALL.writeId(packet); - packet.writeD(_leaderObjId); packet.writeD(_dist); packet.writeD(_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(0x01); ?? + packet.writeD(0); // writeD(1); ?? packet.writeD(member.getRace().ordinal()); } } 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 d8c7e1d279..496e0bb812 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 @@ -38,10 +38,8 @@ public class PartySmallWindowUpdate implements IClientOutgoingPacket 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()); 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 857bafe78b..a82f3eba7b 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 @@ -60,7 +60,6 @@ public class PartySpelled implements IClientOutgoingPacket { return false; } - OutgoingPackets.PARTY_SPELLED.writeId(packet); packet.writeD(_creature instanceof Servitor ? 2 : _creature instanceof Pet ? 1 : 0); packet.writeD(_creature.getObjectId()); 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 aea13d38f6..fdef587acc 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 @@ -90,7 +90,6 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeD(0); // 1=attackable - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); @@ -106,7 +105,6 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD(_flWalkSpd); packet.writeD(_flyRunSpd); packet.writeD(_flyWalkSpd); - packet.writeF(1/* _cha.getProperMultiplier() */); packet.writeF(1/* _cha.getAttackSpeedMultiplier() */); packet.writeF(_summon.getTemplate().getFCollisionRadius()); @@ -147,7 +145,6 @@ public class PetInfo implements IClientOutgoingPacket 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; final int npcId = _summon.getTemplate().getNpcId(); if ((npcId >= 12526) && (npcId <= 12528)) @@ -158,9 +155,7 @@ public class PetInfo implements IClientOutgoingPacket { packet.writeH(0); } - packet.writeC(0); // c2 - // Following all added in C4. packet.writeH(0); // ?? packet.writeC(0); // team aura (1 = blue, 2 = red) 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 010728605d..fc3e207d90 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 @@ -87,12 +87,12 @@ public class PetInventoryUpdate implements IClientOutgoingPacket packet.writeD(item.getItem().getItemId()); packet.writeD(item.getCount()); packet.writeH(item.getItem().getType2()); // item type2 - packet.writeH(0x00); // ? + 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(0x00); // ? + packet.writeH(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 2ab73d789c..7ebf494890 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 @@ -39,7 +39,6 @@ public class PetItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item temp : _items) { @@ -51,16 +50,16 @@ public class PetItemList implements IClientOutgoingPacket packet.writeH(0xff); // ? if (temp.isEquipped()) { - packet.writeH(0x01); + packet.writeH(1); } else { - packet.writeH(0x00); + packet.writeH(0); } packet.writeD(temp.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 // 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(0x00); // ? + packet.writeH(0); // ? } 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 4642c2fe38..dfae9013be 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 @@ -36,12 +36,10 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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 - // clan or subpledge name if (_member.getPledgeType() != 0) { @@ -51,7 +49,6 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket { packet.writeS(_member.getClan().getName()); } - packet.writeS(_member.getApprenticeOrSponsorName()); // name of this member's apprentice/sponsor return true; } 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 3677c193af..2d8e6b75e0 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 @@ -37,7 +37,6 @@ public class PledgeReceivePowerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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 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 0bcce58b29..5817ae347e 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 @@ -36,7 +36,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_SUB_PLEDGE_CREATED.writeId(packet); - packet.writeD(0x01); + packet.writeD(1); packet.writeD(_subPledge.getId()); packet.writeS(_subPledge.getName()); packet.writeS(_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 e12e4b02c5..67358d749b 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 @@ -40,7 +40,7 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket { OutgoingPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(packet); packet.writeD(_tab); // type : 0 = Declared, 1 = Under Attack - packet.writeD(0x00); // page + packet.writeD(0); // page packet.writeD(_tab == 0 ? _clan.getWarList().size() : _clan.getAttackerList().size()); for (Integer i : _tab == 0 ? _clan.getWarList() : _clan.getAttackerList()) { @@ -49,7 +49,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket { continue; } - packet.writeS(clan.getName()); packet.writeD(_tab); // ?? packet.writeD(_tab); // ?? 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 0b39bc7a0d..1ecc74d50e 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 @@ -45,12 +45,10 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket { _pledgeType = 0; writePledge(packet, 0); - for (SubPledge element : _clan.getAllSubPledges()) { _player.sendPacket(new PledgeReceiveSubPledgeCreated(element)); } - for (ClanMember m : _members) { if (m.getPledgeType() == 0) @@ -59,7 +57,6 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket } _player.sendPacket(new PledgeShowMemberListAdd(m)); } - // unless this is sent sometimes, the client doesn't recognize the player as the leader _player.sendPacket(new UserInfo(_player)); return true; @@ -68,13 +65,11 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket void writePledge(PacketWriter packet, 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()); @@ -83,13 +78,11 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket 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; for (ClanMember m : _members) { @@ -97,7 +90,6 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket { continue; } - if (m.getPledgeType() == -1) { yellow = m.getSponsor() != 0 ? 1 : 0; @@ -110,7 +102,6 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket { yellow = 0; } - packet.writeS(m.getName()); packet.writeD(m.getLevel()); packet.writeD(m.getClassId()); 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 949650cdc6..984a03f0be 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 @@ -49,7 +49,6 @@ public class PrivateStoreListBuy implements IClientOutgoingPacket { _playerAdena = _player.getAdena(); } - // _storePlayer.getSellList().updateItems(); // Update SellList for case inventory content has changed // this items must be the items available into the _activeChar (seller) inventory _items = _storePlayer.getBuyList().getAvailableItems(_player.getInventory()); 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 e15afdcbda..9203b12174 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 @@ -51,7 +51,6 @@ public class PrivateStoreListSell implements IClientOutgoingPacket { _playerAdena = _player.getAdena(); } - _storePlayer.getSellList().updateItems(); _items = _storePlayer.getSellList().getItems(); _packageSale = _storePlayer.getSellList().isPackaged(); @@ -71,9 +70,9 @@ public class PrivateStoreListSell implements IClientOutgoingPacket packet.writeD(item.getObjectId()); packet.writeD(item.getItem().getItemId()); packet.writeD(item.getCount()); - packet.writeH(0x00); + packet.writeH(0); packet.writeH(item.getEnchant()); - packet.writeH(0x00); + packet.writeH(0); packet.writeD(item.getItem().getBodyPart()); packet.writeD(item.getPrice()); // your price packet.writeD(item.getItem().getReferencePrice()); // store price 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 c22b960801..079dcee5db 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 @@ -47,7 +47,6 @@ public class PrivateStoreManageListBuy implements IClientOutgoingPacket { _playerAdena = _player.getAdena(); } - _itemList = _player.getInventory().getUniqueItems(false, true, true); _buyList = _player.getBuyList().getItems(); } @@ -59,7 +58,6 @@ public class PrivateStoreManageListBuy implements IClientOutgoingPacket // section 1 packet.writeD(_player.getObjectId()); packet.writeD(_playerAdena); - // section2 packet.writeD(_itemList.size()); // inventory items for potential buy for (Item item : _itemList) @@ -68,11 +66,10 @@ public class PrivateStoreManageListBuy implements IClientOutgoingPacket 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(0x00); + packet.writeH(0); packet.writeD(item.getItem().getBodyPart()); packet.writeH(item.getItem().getType2()); } - // section 3 packet.writeD(_buyList.size()); // count for all items already added for buy for (TradeList.TradeItem item : _buyList) @@ -81,7 +78,7 @@ public class PrivateStoreManageListBuy implements IClientOutgoingPacket packet.writeH(item.getEnchant()); packet.writeD(item.getCount()); packet.writeD(item.getItem().getReferencePrice()); - packet.writeH(0x00); + packet.writeH(0); packet.writeD(item.getItem().getBodyPart()); packet.writeH(item.getItem().getType2()); packet.writeD(item.getPrice()); // your price 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 9dc225f439..aeec1f72f7 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 @@ -28,7 +28,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; * 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) * * @version $Revision: 1.3.2.1.2.3 $ $Date: 2005/03/27 15:29:39 $ */ - /* * In memory of our friend Vadim 03/11/2014 */ @@ -51,7 +50,6 @@ public class PrivateStoreManageListSell implements IClientOutgoingPacket { _playerAdena = _player.getAdena(); } - _player.getSellList().updateItems(); _packageSale = _player.getSellList().isPackaged(); _itemList = _player.getInventory().getAvailableItems(_player.getSellList()); @@ -69,7 +67,6 @@ public class PrivateStoreManageListSell implements IClientOutgoingPacket packet.writeD(_player.getObjectId()); packet.writeD(_packageSale ? 1 : 0); // Package sell packet.writeD(_playerAdena); - // section2 packet.writeD(_itemList.size()); // for potential sells for (TradeItem item : _itemList) @@ -84,7 +81,6 @@ public class PrivateStoreManageListSell implements IClientOutgoingPacket packet.writeD(item.getItem().getBodyPart()); packet.writeD(item.getPrice()); // store price } - // section 3 packet.writeD(_sellList.size()); // count for any items already added for sell for (TradeItem item : _sellList) @@ -95,7 +91,7 @@ public class PrivateStoreManageListSell implements IClientOutgoingPacket packet.writeD(item.getCount()); packet.writeH(0); packet.writeH(item.getEnchant()); // enchant level - packet.writeH(0x00); + packet.writeH(0); packet.writeD(item.getItem().getBodyPart()); packet.writeD(item.getPrice()); // your price packet.writeD(item.getItem().getReferencePrice()); // store price 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 cbd1aa5084..3eb3fc8132 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 @@ -40,7 +40,6 @@ public class QuestList implements IClientOutgoingPacket for (QuestState qs : _questStates) { packet.writeD(qs.getQuest().getQuestId()); - final int states = qs.getInt("__compltdStateFlags"); if (states != 0) { 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 69271b995b..16d886b61c 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 @@ -47,7 +47,7 @@ public class RecipeBookItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_BOOK_ITEM_LIST.writeId(packet); - packet.writeD(_isDwarvenCraft ? 0x00 : 0x01); // 0 = Dwarven - 1 = Common + packet.writeD(_isDwarvenCraft ? 0 : 1); // 0 = Dwarven - 1 = Common packet.writeD(_maxMp); if (_recipes == null) { 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 ea766af5e1..65db792c93 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 @@ -52,7 +52,6 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket 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()); 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 962c625c45..85ada022ba 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 @@ -46,7 +46,6 @@ public class RecipeShopManageList implements IClientOutgoingPacket { _recipes = _seller.getCommonRecipeBook(); } - // clean previous recipes if (_seller.getCreateList() != null) { @@ -67,8 +66,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket OutgoingPackets.RECIPE_SHOP_MANAGE_LIST.writeId(packet); packet.writeD(_seller.getObjectId()); packet.writeD(_seller.getAdena()); - packet.writeD(_isDwarven ? 0x00 : 0x01); - + packet.writeD(_isDwarven ? 0 : 1); if (_recipes == null) { packet.writeD(0); @@ -84,7 +82,6 @@ public class RecipeShopManageList implements IClientOutgoingPacket packet.writeD(count); } } - if (_seller.getCreateList() == null) { packet.writeD(0); @@ -93,11 +90,10 @@ public class RecipeShopManageList implements IClientOutgoingPacket { final ManufactureList list = _seller.getCreateList(); packet.writeD(list.size()); - for (ManufactureItem item : list.getList()) { packet.writeD(item.getRecipeId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(item.getCost()); } } 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 8d6a78a62d..be9565ef86 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 @@ -45,11 +45,10 @@ public class RecipeShopSellList implements IClientOutgoingPacket packet.writeD(_player.getMaxMp()); // Creator's MP packet.writeD(_buyer.getAdena()); // Buyer Adena packet.writeD(createList.size()); - for (ManufactureItem item : createList.getList()) { packet.writeD(item.getRecipeId()); - packet.writeD(0x00); // unknown + packet.writeD(0); // unknown packet.writeD(item.getCost()); } } 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 755950cdc0..f089288a78 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 @@ -26,6 +26,7 @@ public class RestartResponse implements IClientOutgoingPacket { private static final RestartResponse STATIC_PACKET_TRUE = new RestartResponse(true); private static final RestartResponse STATIC_PACKET_FALSE = new RestartResponse(false); + private final String _message; private final boolean _result; 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 5004a5a2f3..7bb072cdf5 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 @@ -23,6 +23,7 @@ public class Ride implements IClientOutgoingPacket { public static final int ACTION_MOUNT = 1; public static final int ACTION_DISMOUNT = 0; + private final int _id; private final int _bRide; private int _rideType; 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 655999628b..21da1dc898 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 @@ -46,13 +46,10 @@ public class SSQStatus implements IClientOutgoingPacket 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? - int dawnPercent = 0; int duskPercent = 0; - switch (_page) { case 1: @@ -83,7 +80,6 @@ public class SSQStatus implements IClientOutgoingPacket break; } } - switch (currentPeriod) { case SevenSigns.PERIOD_COMP_RECRUITING: @@ -99,19 +95,15 @@ public class SSQStatus implements IClientOutgoingPacket 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 - 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); final int duskFestivalScore = SevenSigns.getInstance().getCurrentFestivalScore(SevenSigns.CABAL_DUSK); final double totalStoneScore = duskStoneScore + dawnStoneScore; - /* * Scoring seems to be proportionate to a set base value, so base this on the maximum obtainable score from festivals, which is 500. */ @@ -122,7 +114,6 @@ public class SSQStatus implements IClientOutgoingPacket duskStoneScoreProp = Math.round(((float) duskStoneScore / (float) totalStoneScore) * 500); dawnStoneScoreProp = Math.round(((float) dawnStoneScore / (float) totalStoneScore) * 500); } - final int duskTotalScore = SevenSigns.getInstance().getCurrentScore(SevenSigns.CABAL_DUSK); final int dawnTotalScore = SevenSigns.getInstance().getCurrentScore(SevenSigns.CABAL_DAWN); final int totalOverallScore = duskTotalScore + dawnTotalScore; @@ -131,19 +122,15 @@ public class SSQStatus implements IClientOutgoingPacket dawnPercent = Math.round(((float) dawnTotalScore / totalOverallScore) * 100); 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 % - /* DAWN */ packet.writeD(dawnStoneScoreProp); // Seal Stone Score packet.writeD(dawnFestivalScore); // Festival Score packet.writeD(dawnTotalScore); // Total Score - packet.writeC(dawnPercent); // Dawn % break; } 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 6ff29a30a1..587c50868c 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 @@ -56,10 +56,8 @@ public class SellList implements IClientOutgoingPacket { OutgoingPackets.SELL_LIST.writeId(packet); packet.writeD(_money); - packet.writeD(0x00); - + packet.writeD(0); packet.writeH(_selllist.size()); - for (Item item : _selllist) { packet.writeH(item.getItem().getType1()); @@ -67,11 +65,11 @@ public class SellList implements IClientOutgoingPacket packet.writeD(item.getItemId()); packet.writeD(item.getCount()); packet.writeH(item.getItem().getType2()); - packet.writeH(0x00); + packet.writeH(0); packet.writeD(item.getItem().getBodyPart()); packet.writeH(item.getEnchantLevel()); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); packet.writeD(Config.MERCHANT_ZERO_SELL_PRICE ? 0 : item.getItem().getReferencePrice() / 2); } return true; 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 8928185ce9..ffbd05182b 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 @@ -58,9 +58,8 @@ public class SellListProcure implements IClientOutgoingPacket { OutgoingPackets.SELL_LIST_PROCURE.writeId(packet); packet.writeD(_money); // money - packet.writeD(0x00); // lease ? + packet.writeD(0); // lease ? packet.writeH(_sellList.size()); // list size - for (Entry entry : _sellList.entrySet()) { final Item item = entry.getKey(); 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 42d04e3f28..4e04154474 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 @@ -40,12 +40,10 @@ public class SendMacroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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 - if (_macro != null) { packet.writeD(_macro.id); // Macro ID @@ -53,9 +51,7 @@ public class SendMacroList implements IClientOutgoingPacket packet.writeS(_macro.descr); // Desc packet.writeS(_macro.acronym); // acronym packet.writeC(_macro.icon); // icon - packet.writeC(_macro.commands.length); // count - for (int i = 0; i < _macro.commands.length; i++) { final Macro.MacroCmd cmd = _macro.commands[i]; @@ -66,7 +62,6 @@ public class SendMacroList implements IClientOutgoingPacket packet.writeS(cmd.cmd); // command name } } - // writeD(1); //unknown change of Macro edit,add,delete // packet.writeC(0); //unknown // packet.writeC(1); //count of Macros 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 16cc89bc89..ee06db8a52 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 @@ -39,7 +39,6 @@ public class ShortCutInit implements IClientOutgoingPacket { return; } - _shortCuts = _player.getAllShortCuts(); } @@ -52,50 +51,49 @@ public class ShortCutInit implements IClientOutgoingPacket { packet.writeD(sc.getType()); packet.writeD(sc.getSlot() + (sc.getPage() * 12)); - switch (sc.getType()) { case ShortCut.TYPE_ITEM: // 1 { packet.writeD(sc.getId()); - packet.writeD(0x01); + packet.writeD(1); packet.writeD(-1); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeH(0); + packet.writeH(0); break; } case ShortCut.TYPE_SKILL: // 2 { packet.writeD(sc.getId()); packet.writeD(sc.getLevel()); - packet.writeC(0x00); // C5 - packet.writeD(0x01); // C6 + packet.writeC(0); // C5 + packet.writeD(1); // C6 break; } case ShortCut.TYPE_ACTION: // 3 { packet.writeD(sc.getId()); - packet.writeD(0x01); // C6 + packet.writeD(1); // C6 break; } case ShortCut.TYPE_MACRO: // 4 { packet.writeD(sc.getId()); - packet.writeD(0x01); // C6 + packet.writeD(1); // C6 break; } case ShortCut.TYPE_RECIPE: // 5 { packet.writeD(sc.getId()); - packet.writeD(0x01); // C6 + packet.writeD(1); // C6 break; } default: { packet.writeD(sc.getId()); - packet.writeD(0x01); // C6 + packet.writeD(1); // C6 } } } 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 1a5d161862..482630c619 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 @@ -41,7 +41,6 @@ public class ShortCutRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_REGISTER.writeId(packet); - packet.writeD(_shortcut.getType()); packet.writeD(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client switch (_shortcut.getType()) @@ -55,7 +54,7 @@ public class ShortCutRegister implements IClientOutgoingPacket { packet.writeD(_shortcut.getId()); packet.writeD(_shortcut.getLevel()); - packet.writeC(0x00); // C5 + packet.writeC(0); // C5 break; } case ShortCut.TYPE_ACTION: // 3 @@ -78,7 +77,6 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeD(_shortcut.getId()); } } - packet.writeD(1); // ?? return true; } 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 b130e5a297..04e5e2a589 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 @@ -56,7 +56,7 @@ public class ShowBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - packet.writeC(0x01); // 1 to show, 0 to hide + packet.writeC(1); // 1 to show, 0 to hide packet.writeS(TOP); packet.writeS(FAV); packet.writeS(REGION); 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 59f75b1206..c4b67c7893 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 @@ -34,9 +34,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = ca
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Attackers Clans?
* d = Number of Attackers Clans
* { //repeats
@@ -73,9 +73,9 @@ public class SiegeAttackerList implements IClientOutgoingPacket { OutgoingPackets.SIEGE_ATTACKER_LIST.writeId(packet); packet.writeD(_residenceId); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _attackers.size(); if (size > 0) { @@ -89,12 +89,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getClanId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -103,8 +102,8 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(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 b8223d2bb4..7abaecc4fa 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 @@ -34,9 +34,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = 0xcb
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Defending Clans?
* d = Number of Defending Clans
* { //repeats
@@ -77,9 +77,9 @@ public class SiegeDefenderList implements IClientOutgoingPacket { OutgoingPackets.SIEGE_DEFENDER_LIST.writeId(packet); packet.writeD(_residenceId); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _defenders.size() + _waiting.size(); if (size > 0) { @@ -94,32 +94,31 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getClanId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) switch (siegeclan.getType()) { case OWNER: { - packet.writeD(0x01); // owner + packet.writeD(1); // owner break; } case DEFENDER_PENDING: { - packet.writeD(0x02); // approved + packet.writeD(2); // approved break; } case DEFENDER: { - packet.writeD(0x03); // waiting approved + packet.writeD(3); // waiting approved break; } default: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -135,8 +134,8 @@ public class SiegeDefenderList implements IClientOutgoingPacket packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) - packet.writeD(0x02); // waiting approval + 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 @@ -145,8 +144,8 @@ public class SiegeDefenderList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(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 e35e864754..6c2af43ad4 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 @@ -77,7 +77,7 @@ public class SiegeInfo implements IClientOutgoingPacket { OutgoingPackets.SIEGE_INFO.writeId(packet); packet.writeD(_residenceId); - packet.writeD((_ownerId == _player.getClanId()) && _player.isClanLeader() ? 0x01 : 0x00); + packet.writeD((_ownerId == _player.getClanId()) && _player.isClanLeader() ? 1 : 0); packet.writeD(_ownerId); if (_ownerId > 0) { @@ -101,10 +101,9 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Calendar.getInstance().getTimeInMillis() / 1000)); packet.writeD((int) _siegeDate); - packet.writeD(0x00); // number of choices? + packet.writeD(0); // number of choices? return true; } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SignsSky.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SignsSky.java index 216b329277..34fed4e306 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SignsSky.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SignsSky.java @@ -53,7 +53,6 @@ public class SignsSky implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SIGNS_SKY.writeId(packet); - if (_state == 2) { packet.writeH(258); 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 06d32a0e8d..c4927e17bd 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 @@ -83,7 +83,6 @@ public class SkillList implements IClientOutgoingPacket { ns[i] = sk; } - _skills = ns; } } @@ -93,13 +92,12 @@ public class SkillList implements IClientOutgoingPacket { OutgoingPackets.SKILL_LIST.writeId(packet); packet.writeD(_skills.length); - for (Skill temp : _skills) { packet.writeD(temp.passive ? 1 : 0); packet.writeD(temp.level); packet.writeD(temp.id); - packet.writeC(0x00); // c5 + packet.writeC(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 c683123fa3..5e86c1c154 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 @@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.network.OutgoingPackets; /** - * CDSDDSS -> (0xd5)(objId)(name)(0x00)(type)(speaker)(name) + * CDSDDSS -> (0xd5)(objId)(name)(0)(type)(speaker)(name) */ public class Snoop implements IClientOutgoingPacket { 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 213fe06beb..ac4feecd11 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 @@ -41,7 +41,7 @@ public class SpawnItem implements IClientOutgoingPacket _x = item.getX(); _y = item.getY(); _z = item.getZ(); - _stackable = item.isStackable() ? 0x01 : 0x00; + _stackable = item.isStackable() ? 1 : 0; _count = item.getCount(); } @@ -51,14 +51,13 @@ public class SpawnItem implements IClientOutgoingPacket OutgoingPackets.SPAWN_ITEM.writeId(packet); packet.writeD(_objectId); packet.writeD(_itemId); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); // only show item count if it is a stackable item packet.writeD(_stackable); packet.writeD(_count); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 return true; } } 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 eb55e279b2..07db21369c 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 @@ -44,16 +44,13 @@ public class StatusUpdate implements IClientOutgoingPacket public static final int INT = 0x06; public static final int WIT = 0x07; public static final int MEN = 0x08; - public static final int CUR_HP = 0x09; public static final int MAX_HP = 0x0a; public static final int CUR_MP = 0x0b; public static final int MAX_MP = 0x0c; - public static final int SP = 0x0d; public static final int CUR_LOAD = 0x0e; public static final int MAX_LOAD = 0x0f; - public static final int P_ATK = 0x11; public static final int ATK_SPD = 0x12; public static final int P_DEF = 0x13; @@ -65,12 +62,10 @@ public class StatusUpdate implements IClientOutgoingPacket public static final int M_DEF = 0x19; public static final int PVP_FLAG = 0x1a; public static final int KARMA = 0x1b; - public static final int CUR_CP = 0x21; public static final int MAX_CP = 0x22; private Player _actor; - private List _attributes; public int _objectId; @@ -107,12 +102,10 @@ public class StatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATUS_UPDATE.writeId(packet); - if (_actor != null) { packet.writeD(_actor.getObjectId()); packet.writeD(28); // all the attributes - packet.writeD(LEVEL); packet.writeD(_actor.getLevel()); packet.writeD(EXP); @@ -129,7 +122,6 @@ public class StatusUpdate implements IClientOutgoingPacket packet.writeD(_actor.getWIT()); packet.writeD(MEN); packet.writeD(_actor.getMEN()); - packet.writeD(CUR_HP); packet.writeD((int) _actor.getCurrentHp()); packet.writeD(MAX_HP); @@ -144,7 +136,6 @@ public class StatusUpdate implements IClientOutgoingPacket packet.writeD(_actor.getCurrentLoad()); packet.writeD(MAX_LOAD); packet.writeD(_actor.getMaxLoad()); - packet.writeD(P_ATK); packet.writeD(_actor.getPAtk(null)); packet.writeD(ATK_SPD); @@ -159,7 +150,6 @@ public class StatusUpdate implements IClientOutgoingPacket packet.writeD(_actor.getCriticalHit(null, null)); packet.writeD(M_ATK); packet.writeD(_actor.getMAtk(null, null)); - packet.writeD(CAST_SPD); packet.writeD(_actor.getMAtkSpd()); packet.writeD(M_DEF); @@ -177,7 +167,6 @@ public class StatusUpdate implements IClientOutgoingPacket { packet.writeD(_objectId); packet.writeD(_attributes.size()); - for (int i = 0; i < _attributes.size(); i++) { final Attribute temp = _attributes.get(i); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 9481217acc..59d343b945 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -33,6 +33,7 @@ public class SystemMessage implements IClientOutgoingPacket private static final int TYPE_NPC_NAME = 2; private static final int TYPE_NUMBER = 1; private static final int TYPE_TEXT = 0; + private final int _messageId; private final List _types = new ArrayList<>(); private final List _values = new ArrayList<>(); @@ -122,15 +123,12 @@ public class SystemMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SYSTEM_MESSAGE.writeId(packet); - packet.writeD(_messageId); packet.writeD(_types.size()); - for (int i = 0; i < _types.size(); i++) { final int t = _types.get(i).intValue(); packet.writeD(t); - switch (t) { case TYPE_TEXT: diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index 5e31d80225..461d458678 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -45,7 +45,7 @@ public class TeleportToLocation implements IClientOutgoingPacket packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // Fade 0, Instant 1. + packet.writeD(0); // Fade 0, Instant 1. packet.writeD(_heading); return true; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java index 1235f0fb56..5e33f4015c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java @@ -37,20 +37,17 @@ public class TradeOtherAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_OTHER_ADD.writeId(packet); - packet.writeH(1); // item count - 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(0x00); // ? - + 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(0x00); // ? - packet.writeH(0x00); + packet.writeH(0); // ? + packet.writeH(0); return true; } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java index 4b586ebfe6..79a53e29cd 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java @@ -37,20 +37,17 @@ public class TradeOwnAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_OWN_ADD.writeId(packet); - packet.writeH(1); // item count - 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(0x00); // ? - + 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(0x00); // ? - packet.writeH(0x00); + packet.writeH(0); // ? + packet.writeH(0); return true; } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index 80aa78ab2a..96b8bbbab1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -45,7 +45,6 @@ public class TradeStart implements IClientOutgoingPacket { return false; } - OutgoingPackets.TRADE_START.writeId(packet); packet.writeD(_player.getActiveTradeList().getPartner().getObjectId()); // writeD((_activeChar != null || _activeChar.getTransactionRequester() != null)? _activeChar.getTransactionRequester().getObjectId() : 0); @@ -57,12 +56,11 @@ public class TradeStart implements IClientOutgoingPacket packet.writeD(item.getItemId()); packet.writeD(item.getCount()); packet.writeH(item.getItem().getType2()); // item type2 - packet.writeH(0x00); // ? - + 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.getEnchantLevel()); // enchant level - packet.writeH(0x00); // ? - packet.writeH(0x00); + packet.writeH(0); // ? + packet.writeH(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 7320188d2d..4f121434f0 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 @@ -72,11 +72,11 @@ public class TradeUpdate implements IClientOutgoingPacket packet.writeD(item.getItem().getItemId()); packet.writeD(aveCount); packet.writeH(item.getItem().getType2()); // item type2 - packet.writeH(0x00); // ? + 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(0x00); // ? - packet.writeH(0x00); + packet.writeH(0); // ? + packet.writeH(0); } return true; } 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 bef6b65436..034635e720 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 @@ -59,17 +59,14 @@ public class UserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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); - if (_player.getClassIndex() == 0) { packet.writeD(_player.getClassId().getId()); @@ -78,7 +75,6 @@ public class UserInfo implements IClientOutgoingPacket { packet.writeD(_player.getBaseClass()); } - packet.writeD(_player.getLevel()); packet.writeQ(_player.getExp()); packet.writeD(_player.getSTR()); @@ -94,7 +90,6 @@ public class UserInfo implements IClientOutgoingPacket 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 packet.writeD(_inventory.getPaperdollObjectId(Inventory.PAPERDOLL_DHAIR)); @@ -134,39 +129,40 @@ public class UserInfo implements IClientOutgoingPacket packet.writeD(_inventory.getPaperdollItemId(Inventory.PAPERDOLL_FACE)); // c6 new h's - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); + 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(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); + 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(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); // end of c6 new h's + packet.writeD(_player.getPAtk(null)); packet.writeD(_player.getPAtkSpd()); packet.writeD(_player.getPDef(null)); @@ -174,15 +170,11 @@ public class UserInfo implements IClientOutgoingPacket 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) @@ -227,7 +219,6 @@ public class UserInfo implements IClientOutgoingPacket } packet.writeC(_player.isInPartyMatchRoom() ? 1 : 0); - if (_player.getAppearance().isInvisible()) { packet.writeD((_player.getAbnormalEffect() | Creature.ABNORMAL_EFFECT_STEALTH)); @@ -236,60 +227,40 @@ public class UserInfo implements IClientOutgoingPacket { packet.writeD(_player.getAbnormalEffect()); // C2 } - - packet.writeC(0x00); - + packet.writeC(0); packet.writeD(_player.getClanPrivileges()); - packet.writeH(_player.getRecomLeft()); // c2 recommendations remaining packet.writeH(_player.getRecomHave()); // c2 recommendations received - packet.writeD(0x00); // _player.getMountNpcId() > 0 ? _player.getMountNpcId() + 1000000 : 0 + packet.writeD(0); // _player.getMountNpcId() > 0 ? _player.getMountNpcId() + 1000000 : 0 packet.writeH(_player.getInventoryLimit()); - packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); packet.writeC(_player.isMounted() ? 0 : _player.getEnchantEffect()); - - if (_player.getTeam() == 1) - { - packet.writeC(0x01); // team circle around feet 1= Blue, 2 = red - } - else if (_player.getTeam() == 2) - { - packet.writeC(0x02); // team circle around feet 1= Blue, 2 = red - } - else - { - packet.writeC(0x00); // team circle around feet 1= Blue, 2 = red - } - + packet.writeC(_player.getTeam()); // team circle around feet 1= Blue, 2 = red packet.writeD(_player.getClanCrestLargeId()); - packet.writeC(_player.isNoble() ? 1 : 0); // 0x01: symbol on char menu ctrl+I - packet.writeC((_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) || _player.isPVPHero()) ? 1 : 0); // 0x01: Hero Aura + 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 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 + packet.writeD(_player.getAppearance().getNameColor()); - // new c5 - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + 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()); - if (_player.isCursedWeaponEquiped()) { packet.writeD(CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquipedId())); } else { - packet.writeD(0x00); + packet.writeD(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 7b3c4154db..bea058fe0b 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 @@ -41,7 +41,6 @@ public class ValidateLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); 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 9c59febb74..3f4dce2562 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 @@ -50,7 +50,6 @@ public class WareHouseDepositList implements IClientOutgoingPacket { _items.add(temp); } - // augmented and shadow items can be stored in private wh if (_whType == PRIVATE) { @@ -74,7 +73,6 @@ public class WareHouseDepositList implements IClientOutgoingPacket packet.writeH(_whType); packet.writeD(_playerAdena); packet.writeH(_items.size()); - for (Item item : _items) { packet.writeH(item.getItem().getType1()); // item type1 //unconfirmed, works @@ -82,11 +80,11 @@ public class WareHouseDepositList implements IClientOutgoingPacket packet.writeD(item.getItemId()); // unconfirmed, works packet.writeD(item.getCount()); // unconfirmed, works packet.writeH(item.getItem().getType2()); // item type2 //unconfirmed, works - packet.writeH(0x00); // ? 100 + packet.writeH(0); // ? 100 packet.writeD(item.getItem().getBodyPart()); // ? packet.writeH(item.getEnchantLevel()); // enchant level -confirmed - packet.writeH(0x00); // ? 300 - packet.writeH(0x00); // ? 200 + packet.writeH(0); // ? 300 + packet.writeH(0); // ? 200 packet.writeD(item.getObjectId()); // item id - confimed if (item.isAugmented()) { @@ -95,7 +93,7 @@ public class WareHouseDepositList implements IClientOutgoingPacket } else { - packet.writeQ(0x00); + packet.writeQ(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 d353d7edb9..00bfec8391 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 @@ -67,15 +67,15 @@ public class WareHouseWithdrawalList implements IClientOutgoingPacket for (Item item : _items) { packet.writeH(item.getItem().getType1()); // item type1 //unconfirmed, works - packet.writeD(0x00); // unconfirmed, works + packet.writeD(0); // unconfirmed, works packet.writeD(item.getItemId()); // unconfirmed, works packet.writeD(item.getCount()); // unconfirmed, works packet.writeH(item.getItem().getType2()); // item type2 //unconfirmed, works - packet.writeH(0x00); // ? + packet.writeH(0); // ? packet.writeD(item.getItem().getBodyPart()); // ? packet.writeH(item.getEnchantLevel()); // enchant level -confirmed - packet.writeH(0x00); // ? - packet.writeH(0x00); // ? + packet.writeH(0); // ? + packet.writeH(0); // ? packet.writeD(item.getObjectId()); // item id - confimed if (item.isAugmented()) { @@ -84,7 +84,7 @@ public class WareHouseWithdrawalList implements IClientOutgoingPacket } else { - packet.writeQ(0x00); + packet.writeQ(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 608eb9a006..d11bc27681 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 @@ -51,14 +51,12 @@ public class WearList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.WEAR_LIST.writeId(packet); - packet.writeC(0xc0); // ? packet.writeC(0x13); // ? - packet.writeC(0x00); // ? - packet.writeC(0x00); // ? + packet.writeC(0); // ? + packet.writeC(0); // ? packet.writeD(_money); // current money packet.writeD(_listId); - int newlength = 0; for (Item item : _list) { @@ -68,27 +66,23 @@ public class WearList implements IClientOutgoingPacket } } packet.writeH(newlength); - for (Item item : _list) { if ((item.getItem().getCrystalType() <= _expertise) && item.isEquipable()) { packet.writeD(item.getItemId()); packet.writeH(item.getItem().getType2()); // item type2 - if (item.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { packet.writeH(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 } else { - packet.writeH(0x00); // 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(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); } } - return true; } } 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 1d59c6d002..e7654ed911 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 @@ -60,7 +60,7 @@ public class AccountKicked implements IOutgoingPacket { OutgoingPackets.ACCOUNT_KICKED.writeId(packet); packet.writeD(_reason.getCode()); - return true; } } + 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 2e3a1f6163..1fe813e393 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 @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: response + * Format: d d: response */ public class GGAuth implements IOutgoingPacket { 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 4b3f71f30e..d725f45ca2 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 @@ -52,7 +52,6 @@ public class Init implements IOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.INIT.writeId(packet); - packet.writeD(_sessionId); // session id packet.writeD(0x0000c621); // protocol revision 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 8c534554a8..f4dcd22b00 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 @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: the failure reason + * Format: d d: the failure reason */ public class LoginFail implements IOutgoingPacket { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/BaseRecievePacket.java index c682cb741d..a6ed15ce32 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/BaseRecievePacket.java @@ -73,7 +73,7 @@ public abstract class BaseRecievePacket try { result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE); - result = result.substring(0, result.indexOf(0x00)); + result = result.substring(0, result.indexOf(0)); _off += (result.length() * 2) + 2; } catch (Exception e) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/BaseSendablePacket.java index a9d918de4c..8fa8491cbf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/network/BaseSendablePacket.java @@ -117,16 +117,16 @@ public abstract class BaseSendablePacket public byte[] getBytes() { // if (this instanceof Init) - // writeD(0x00); // reserve for XOR initial key + // writeD(0); // reserve for XOR initial key - writeD(0x00); // reserve for checksum + writeD(0); // reserve for checksum final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++) { - writeC(0x00); + writeC(0); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 235a80e29c..0e765ebabd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.Broadcast; import org.l2jmobius.gameserver.util.Util; /** - * Fromat:(ch) dddddc + * Format:(ch) dddddc * @author -Wooden- */ public class RequestExMagicSkillUseGround implements IClientIncomingPacket diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 1b8ddb2042..bec794bef3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -44,7 +44,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; } @@ -60,7 +59,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; setHtml(html); } @@ -77,13 +75,11 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } - if (!html.contains(""; return; } - _html = html; } @@ -96,7 +92,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } - setHtml(content); return true; } @@ -138,12 +133,10 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { player.clearHtmlActions(getScope()); } - if (_disabledValidation) { return; } - if (player != null) { Util.buildHtmlActionCache(player, getScope(), _npcObjId, _html); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index b429a53f7b..2d61c450a6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -78,7 +78,7 @@ public abstract class AbstractItemPacket implements IClientOutgoingPacket } else { - packet.writeH(0x00); + packet.writeH(0); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java index 19dd479483..ea92899b82 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java @@ -51,7 +51,6 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket protected final int _flyRunSpd; protected final int _flyWalkSpd; protected double _moveMultiplier; - protected int _rhand; protected int _lhand; protected int _chest; @@ -115,7 +114,6 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket _collisionHeight = cha.getTemplate().getFCollisionHeight(); // On every subclass _collisionRadius = cha.getTemplate().getFCollisionRadius(); // On every subclass _isAttackable = cha.isAutoAttackable(attacker); - // npc crest of owning clan/ally of castle if (cha.isNpc() && cha.isInsideZone(ZoneId.TOWN) && (Config.SHOW_CREST_WITHOUT_QUEST || cha.getCastle().getShowNpcCrest()) && (cha.getCastle().getOwnerId() != 0)) { @@ -133,7 +131,6 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket } } } - _displayEffect = cha.getDisplayEffect(); } @@ -148,7 +145,7 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); packet.writeD(_runSpd); @@ -228,30 +225,26 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket _title = (Config.CHAMP_TITLE); // On every subclass } packet.writeS(_title); - packet.writeD(0x00); // Title color 0=client default - packet.writeD(0x00); // pvp flag - packet.writeD(0x00); // karma - + packet.writeD(0); // Title color 0=client default + packet.writeD(0); // pvp flag + packet.writeD(0); // karma packet.writeD(_npc.isInvisible() ? _npc.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask() : _npc.getAbnormalVisualEffects()); packet.writeD(_clanId); // clan id packet.writeD(_clanCrest); // crest id packet.writeD(_allyId); // ally id packet.writeD(_allyCrest); // all crest - packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); // C2 packet.writeC(_npc.getTeam().getId()); - packet.writeF(_collisionRadius); packet.writeF(_collisionHeight); packet.writeD(_enchantEffect); // C4 packet.writeD(_npc.isFlying() ? 1 : 0); // C6 - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_npc.getColorEffect()); // CT1.5 Pet form and skills, Color effect - packet.writeC(_npc.isTargetable() ? 0x01 : 0x00); - packet.writeC(_npc.isShowName() ? 0x01 : 0x00); + packet.writeC(_npc.isTargetable() ? 1 : 0); + packet.writeC(_npc.isShowName() ? 1 : 0); packet.writeD(_npc.getAbnormalVisualEffectSpecial()); packet.writeD(_displayEffect); - return true; } } @@ -263,7 +256,6 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket public TrapInfo(Trap cha, Creature attacker) { super(cha, (attacker != null) && attacker.canOverrideCond(PlayerCondOverride.SEE_ALL_PLAYERS)); - _trap = cha; _displayId = cha.getTemplate().getDisplayId(); _isAttackable = cha.isAutoAttackable(attacker); @@ -289,7 +281,7 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); packet.writeD(_runSpd); @@ -314,30 +306,25 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket 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); - packet.writeD(0x00); // title color 0 = client default - + packet.writeD(0); // title color 0 = client default packet.writeD(_trap.getPvpFlag()); packet.writeD(_trap.getKarma()); - packet.writeD(_trap.isInvisible() ? _trap.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask() : _trap.getAbnormalVisualEffects()); - packet.writeD(0x00); // clan id - packet.writeD(0x00); // crest id - packet.writeD(0000); // C2 - packet.writeD(0000); // C2 - packet.writeC(0000); // C2 - + packet.writeD(0); // clan id + packet.writeD(0); // crest id + packet.writeD(0); // C2 + packet.writeD(0); // C2 + packet.writeC(0); // C2 packet.writeC(_trap.getTeam().getId()); - packet.writeF(_collisionRadius); packet.writeF(_collisionHeight); - packet.writeD(0x00); // C4 - packet.writeD(0x00); // C6 - packet.writeD(0x00); + packet.writeD(0); // C4 + packet.writeD(0); // C6 + packet.writeD(0); packet.writeD(0); // CT1.5 Pet form and skills - packet.writeC(0x01); - packet.writeC(0x01); - packet.writeD(0x00); - + packet.writeC(1); + packet.writeC(1); + packet.writeD(0); return true; } } @@ -380,7 +367,7 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); packet.writeD(_runSpd); @@ -398,38 +385,32 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket packet.writeD(_rhand); // right hand weapon packet.writeD(_chest); packet.writeD(_lhand); // left hand weapon - packet.writeC(0x01); // name above char 1=true ... ?? - packet.writeC(0x01); // always running 1=running 0=walking + packet.writeC(1); // name above char 1=true ... ?? + packet.writeC(1); // always running 1=running 0=walking packet.writeC(_summon.isInCombat() ? 1 : 0); packet.writeC(_summon.isAlikeDead() ? 1 : 0); packet.writeC(_isSummoned ? 2 : _value); // invisible ?? 0=false 1=true 2=summoned (only works if model has a summon animation) packet.writeS(_name); packet.writeS(_title); - packet.writeD(0x01); // Title color 0=client default - + packet.writeD(1); // Title color 0=client default packet.writeD(_summon.getPvpFlag()); packet.writeD(_summon.getKarma()); - packet.writeD(_gmSeeInvis && _summon.isInvisible() ? _summon.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask() : _summon.getAbnormalVisualEffects()); - - packet.writeD(0x00); // clan id - packet.writeD(0x00); // crest id - packet.writeD(0x00); // C2 - packet.writeD(0x00); // C2 + packet.writeD(0); // clan id + packet.writeD(0); // crest id + packet.writeD(0); // C2 + packet.writeD(0); // C2 packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); // C2 - packet.writeC(_summon.getTeam().getId()); - packet.writeF(_collisionRadius); packet.writeF(_collisionHeight); packet.writeD(_enchantEffect); // C4 - packet.writeD(0x00); // C6 - packet.writeD(0x00); + packet.writeD(0); // C6 + packet.writeD(0); packet.writeD(_form); // CT1.5 Pet form and skills - packet.writeC(0x01); - packet.writeC(0x01); + packet.writeC(1); + packet.writeC(1); packet.writeD(_summon.getAbnormalVisualEffectSpecial()); - return true; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index f8153897d9..8ac604bac5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -70,11 +70,9 @@ public class AcquireSkillList implements IClientOutgoingPacket { return false; } - OutgoingPackets.ACQUIRE_SKILL_LIST.writeId(packet); packet.writeD(_skillType.ordinal()); packet.writeD(_skills.size()); - for (Skill temp : _skills) { packet.writeD(temp.id); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java index 6cb71fc985..4683fb30f0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java @@ -44,7 +44,6 @@ public class AllianceInfo implements IClientOutgoingPacket _name = leader.getAllyName(); _leaderC = leader.getName(); _leaderP = leader.getLeaderName(); - final Collection allies = ClanTable.getInstance().getClanAllies(allianceId); _allies = new ClanInfo[allies.size()]; int idx = 0; @@ -57,7 +56,6 @@ public class AllianceInfo implements IClientOutgoingPacket total += ci.getTotal(); online += ci.getOnline(); } - _total = total; _online = online; } @@ -66,18 +64,16 @@ public class AllianceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_INFO.writeId(packet); - packet.writeS(_name); packet.writeD(_total); packet.writeD(_online); packet.writeS(_leaderC); packet.writeS(_leaderP); - packet.writeD(_allies.length); for (ClanInfo aci : _allies) { packet.writeS(aci.getClan().getName()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(aci.getClan().getLevel()); packet.writeS(aci.getClan().getLeaderName()); packet.writeD(aci.getTotal()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 0824b21a94..7458588987 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -96,23 +96,19 @@ public class Attack implements IClientOutgoingPacket { final Iterator it = _hits.iterator(); OutgoingPackets.ATTACK.writeId(packet); - packet.writeD(_attackerObjId); writeHit(packet, it.next()); packet.writeD(_attackerLoc.getX()); packet.writeD(_attackerLoc.getY()); packet.writeD(_attackerLoc.getZ()); - packet.writeH(_hits.size() - 1); while (it.hasNext()) { writeHit(packet, it.next()); } - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); - return true; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index a2db08f8df..c7e73df94d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -43,38 +43,34 @@ public class BuyList implements IClientOutgoingPacket @Override public boolean write(PacketWriter packet) { - OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); // writeC(0x07) ? + OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); // writeC(7) ? packet.writeQ(_money); // current money packet.writeD(_listId); - packet.writeH(_list.size()); - for (Product product : _list) { if ((product.getCount() > 0) || !product.hasLimitedStock()) { packet.writeH(product.getItem().getType1()); // item type1 - packet.writeD(0x00); // objectId + packet.writeD(0); // objectId packet.writeD(product.getItemId()); packet.writeQ(product.getCount() < 0 ? 0 : product.getCount()); packet.writeH(product.getItem().getType2()); - packet.writeH(0x00); // isEquipped - + packet.writeH(0); // isEquipped if (product.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { packet.writeD(product.getItem().getBodyPart()); - packet.writeH(0x00); // item enchant level - packet.writeH(0x00); // ? - packet.writeH(0x00); + packet.writeH(0); // item enchant level + packet.writeH(0); // ? + packet.writeH(0); } else { - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); } - if ((product.getItemId() >= 3960) && (product.getItemId() <= 4026)) { packet.writeQ((long) (product.getPrice() * Config.RATE_SIEGE_GUARDS_PRICE * (1 + _taxRate))); @@ -83,16 +79,14 @@ public class BuyList implements IClientOutgoingPacket { packet.writeQ((long) (product.getPrice() * (1 + _taxRate))); } - // T1 for (byte i = 0; i < 8; i++) { - packet.writeH(0x00); + packet.writeH(0); } - - packet.writeH(0x00); // Enchant effect 1 - packet.writeH(0x00); // Enchant effect 2 - packet.writeH(0x00); // Enchant effect 3 + packet.writeH(0); // Enchant effect 1 + packet.writeH(0); // Enchant effect 2 + packet.writeH(0); // Enchant effect 3 } } return true; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index 003cf590f7..7b62ad5424 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -50,28 +50,26 @@ public class BuyListSeed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BUY_LIST_SEED.writeId(packet); - packet.writeQ(_money); // current money packet.writeD(_manorId); // manor id - if (!_list.isEmpty()) { packet.writeH(_list.size()); // list length for (SeedProduction s : _list) { - packet.writeH(0x04); // item->type1 - packet.writeD(0x00); // objectId + packet.writeH(4); // item->type1 + packet.writeD(0); // objectId packet.writeD(s.getId()); // item id packet.writeQ(s.getAmount()); // item count - packet.writeH(0x04); // item->type2 - packet.writeH(0x00); // unknown :) + packet.writeH(4); // item->type2 + packet.writeH(0); // unknown :) packet.writeQ(s.getPrice()); // price } _list.clear(); } else { - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java index b7814157c6..f3dc872dca 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java @@ -32,7 +32,7 @@ public class CSShowComBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - packet.writeC(0x01); // c4 1 to show community 00 to hide + packet.writeC(1); // c4 1 to show community 00 to hide packet.writeB(_html); return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index d525bf2438..fbe5e39e2e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -22,17 +22,17 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ChangeWaitType implements IClientOutgoingPacket { + public static final int WT_SITTING = 0; + public static final int WT_STANDING = 1; + public static final int WT_START_FAKEDEATH = 2; + public static final int WT_STOP_FAKEDEATH = 3; + private final int _objectId; private final int _moveType; private final int _x; private final int _y; private final int _z; - public static final int WT_SITTING = 0; - public static final int WT_STANDING = 1; - public static final int WT_START_FAKEDEATH = 2; - public static final int WT_STOP_FAKEDEATH = 3; - public ChangeWaitType(Creature creature, int newMoveType) { _objectId = creature.getObjectId(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index 401d0b400c..067d878cb1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -29,7 +29,6 @@ public class CharCreateFail implements IClientOutgoingPacket public static final int REASON_CREATE_NOT_ALLOWED = 0x05; // "Characters cannot be created from this server." public static final int REASON_CHOOSE_ANOTHER_SVR = 0x06; // "Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please // choose another server." - private final int _error; public CharCreateFail(int errorCode) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index c2ba4f3959..768617e558 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -31,7 +31,7 @@ public class CharCreateOk implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_SUCCESS.writeId(packet); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index 0db6ffa70a..5a51ab105d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharDeleteFail implements IClientOutgoingPacket { - public static final int REASON_DELETION_FAILED = 0x01; - public static final int REASON_YOU_MAY_NOT_DELETE_CLAN_MEMBER = 0x02; - public static final int REASON_CLAN_LEADERS_MAY_NOT_BE_DELETED = 0x03; + public static final int REASON_DELETION_FAILED = 1; + public static final int REASON_YOU_MAY_NOT_DELETE_CLAN_MEMBER = 2; + public static final int REASON_CLAN_LEADERS_MAY_NOT_BE_DELETED = 3; private final int _error; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index dbe89a34af..df52567f51 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -30,29 +30,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { - private final Player _player; - private final Clan _clan; - private int _objId; - private int _x; - private int _y; - private int _z; - private int _heading; - private final int _mAtkSpd; - private final int _pAtkSpd; - private final int _runSpd; - private final int _walkSpd; - private final int _swimRunSpd; - private final int _swimWalkSpd; - private final int _flyRunSpd; - private final int _flyWalkSpd; - private final double _moveMultiplier; - - private final int _territoryId; - private final boolean _isDisguised; - - private int _vehicleId = 0; - private final boolean _gmSeeInvis; - private static final int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, @@ -78,6 +55,27 @@ public class CharInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_BELT }; + private final Player _player; + private final Clan _clan; + private int _objId; + private int _x; + private int _y; + private int _z; + private int _heading; + private final int _mAtkSpd; + private final int _pAtkSpd; + private final int _runSpd; + private final int _walkSpd; + private final int _swimRunSpd; + private final int _swimWalkSpd; + private final int _flyRunSpd; + private final int _flyWalkSpd; + private final double _moveMultiplier; + private final int _territoryId; + private final boolean _isDisguised; + private int _vehicleId = 0; + private final boolean _gmSeeInvis; + public CharInfo(Player player, boolean gmSeeInvis) { _player = player; @@ -147,16 +145,12 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getInventory().getTalismanSlots()); packet.writeD(_player.getInventory().canEquipCloak() ? 1 : 0); - packet.writeD(_player.getPvpFlag()); packet.writeD(_player.getKarma()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeD(_player.getPvpFlag()); packet.writeD(_player.getKarma()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -167,16 +161,12 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_player.getAttackSpeedMultiplier()); - packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); - packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeS(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle()); - if (!_player.isCursedWeaponEquipped()) { packet.writeD(_player.getClanId()); @@ -186,24 +176,19 @@ public class CharInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - // In UserInfo leader rights and siege flags, but here found nothing?? // Therefore RelationChanged packet with that info is required - packet.writeD(0x00); - + packet.writeD(0); packet.writeC(_player.isSitting() ? 0 : 1); // standing = 1 sitting = 0 packet.writeC(_player.isRunning() ? 1 : 0); // running = 1 walking = 0 packet.writeC(_player.isInCombat() ? 1 : 0); - packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 1 : 0); - packet.writeC(!_gmSeeInvis && _player.isInvisible() ? 1 : 0); // invisible = 1 visible =0 - packet.writeC(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount packet.writeC(_player.getPrivateStoreType().getId()); @@ -214,52 +199,39 @@ public class CharInfo implements IClientOutgoingPacket } packet.writeC(_player.isInPartyMatchRoom() ? 1 : 0); - packet.writeD(_gmSeeInvis ? (_player.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask()) : _player.getAbnormalVisualEffects()); - packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); - packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getMountNpcId() + 1000000); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeC(_player.isMounted() ? 0 : _player.getEnchantEffect()); - packet.writeC(_player.getTeam().getId()); - packet.writeD(_player.getClanCrestLargeId()); packet.writeC(_player.isNoble() ? 1 : 0); // Symbol on char menu ctrl+I packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // Hero Aura - packet.writeC(_player.isFishing() ? 1 : 0); // 0x01: Fishing Mode (Cant be undone by setting back to 0) + packet.writeC(_player.isFishing() ? 1 : 0); // 1: Fishing Mode (Cant be undone by setting back to 0) packet.writeD(_player.getFishx()); packet.writeD(_player.getFishy()); packet.writeD(_player.getFishz()); packet.writeD(_player.getAppearance().getNameColor()); - packet.writeD(_heading); - packet.writeD(_player.getPledgeClass()); packet.writeD(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); - packet.writeD(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_clan != null ? _clan.getReputationScore() : 0); - // T1 packet.writeD(_player.getTransformationDisplayId()); packet.writeD(_player.getAgathionId()); - // T2 - packet.writeD(0x01); - + packet.writeD(1); // T2.3 packet.writeD(_player.getAbnormalVisualEffectSpecial()); packet.writeD(_territoryId); // territory Id - packet.writeD((_isDisguised ? 0x01 : 0x00)); // is Disguised + packet.writeD((_isDisguised ? 1 : 0)); // is Disguised packet.writeD(_territoryId); // territory Id return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 8c03ee1915..ada3623370 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -40,21 +40,19 @@ public class CharSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTED.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getTitle()); packet.writeD(_sessionId); packet.writeD(_player.getClanId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x01); // active ?? + packet.writeD(1); // active ?? packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); - packet.writeF(_player.getCurrentHp()); packet.writeF(_player.getCurrentMp()); packet.writeD((int) _player.getSp()); @@ -68,19 +66,15 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_player.getMEN()); packet.writeD(_player.getDEX()); packet.writeD(_player.getWIT()); - packet.writeD(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_player.getClassId().getId()); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeB(new byte[64]); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 53e77f1175..a3840b218f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -41,6 +41,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { private static final Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); + private final String _loginName; private final int _sessionId; private int _activeId; @@ -76,13 +77,10 @@ public class CharSelectionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.size(); packet.writeD(size); // Created character count - packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) - packet.writeC(0x00); - + packet.writeC(0); long lastAccess = 0; if (_activeId == -1) { @@ -95,7 +93,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - for (int i = 0; i < size; i++) { final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); @@ -104,58 +101,45 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeS(_loginName); // Account name packet.writeD(_sessionId); // Account ID packet.writeD(charInfoPackage.getClanId()); // Clan ID - packet.writeD(0x00); // Builder level - + packet.writeD(0); // Builder level packet.writeD(charInfoPackage.getSex()); // Sex packet.writeD(charInfoPackage.getRace()); // Race packet.writeD(charInfoPackage.getBaseClassId()); - - packet.writeD(0x01); // GameServerName - + packet.writeD(1); // GameServerName packet.writeD(charInfoPackage.getX()); packet.writeD(charInfoPackage.getY()); packet.writeD(charInfoPackage.getZ()); packet.writeF(charInfoPackage.getCurrentHp()); packet.writeF(charInfoPackage.getCurrentMp()); - packet.writeD((int) charInfoPackage.getSp()); packet.writeQ(charInfoPackage.getExp()); - packet.writeD(charInfoPackage.getLevel()); - packet.writeD(charInfoPackage.getKarma()); packet.writeD(charInfoPackage.getPkKills()); packet.writeD(charInfoPackage.getPvPKills()); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); for (int slot : getPaperdollOrder()) { packet.writeD(charInfoPackage.getPaperdollItemId(slot)); } - packet.writeD(charInfoPackage.getHairStyle()); packet.writeD(charInfoPackage.getHairColor()); packet.writeD(charInfoPackage.getFace()); - packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); - packet.writeD(i == _activeId ? 0x01 : 0x00); - + packet.writeD(i == _activeId ? 1 : 0); packet.writeC(Math.min(charInfoPackage.getEnchantEffect(), 127)); packet.writeD(charInfoPackage.getAugmentationId()); - // packet.writeD(charInfoPackage.getTransformId()); // Used to display Transformations - packet.writeD(0x00); // Currently on retail when you are on character select you don't see your transformation. + packet.writeD(0); // Currently on retail when you are on character select you don't see your transformation. } return true; } @@ -164,7 +148,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); - try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate")) { @@ -177,7 +160,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (charInfopackage != null) { characterList.add(charInfopackage); - final Player player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { @@ -191,7 +173,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return characterList; } @@ -232,7 +213,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { clan.removeClanMember(objectId, 0); } - GameClient.deleteCharByObjId(objectId); return null; } @@ -251,20 +231,16 @@ public class CharSelectionInfo implements IClientOutgoingPacket charInfopackage.setHairStyle(chardata.getInt("hairstyle")); charInfopackage.setHairColor(chardata.getInt("haircolor")); charInfopackage.setSex(chardata.getInt("sex")); - charInfopackage.setExp(chardata.getLong("exp")); charInfopackage.setSp(chardata.getLong("sp")); charInfopackage.setVitalityPoints(chardata.getInt("vitality_points")); charInfopackage.setClanId(chardata.getInt("clanid")); - charInfopackage.setRace(chardata.getInt("race")); - final int baseClassId = chardata.getInt("base_class"); final int activeClassId = chardata.getInt("classid"); charInfopackage.setX(chardata.getInt("x")); charInfopackage.setY(chardata.getInt("y")); charInfopackage.setZ(chardata.getInt("z")); - final int faction = chardata.getInt("faction"); if (faction == 1) { @@ -274,7 +250,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setEvil(); } - if (Config.MULTILANG_ENABLE) { String lang = chardata.getString("language"); @@ -284,22 +259,18 @@ public class CharSelectionInfo implements IClientOutgoingPacket } charInfopackage.setHtmlPrefix("data/lang/" + lang + "/"); } - // if is in subclass, load subclass exp, sp, level info if (baseClassId != activeClassId) { loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId); } - charInfopackage.setClassId(activeClassId); - // Get the augmentation id for equipped weapon int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); if (weaponObjId < 1) { weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); } - if (weaponObjId > 0) { try (Connection con = DatabaseFactory.getConnection(); @@ -320,7 +291,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } - // Check if the base class is set to zero and also doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly. if ((baseClassId == 0) && (activeClassId > 0)) { @@ -330,7 +300,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setBaseClassId(baseClassId); } - charInfopackage.setDeleteTimer(deletetime); charInfopackage.setLastAccess(chardata.getLong("lastAccess")); return charInfopackage; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java index c25e3ee116..ac66c2fa0f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java @@ -33,7 +33,7 @@ public class ClientSetTime implements IClientOutgoingPacket { OutgoingPackets.CLIENT_SET_TIME.writeId(packet); packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // time in client minutes - packet.writeD(0x06); // constant to match the server time( this determines the speed of the client clock) + packet.writeD(6); // constant to match the server time( this determines the speed of the client clock) return true; } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java index b21e4692a7..ae5363dcd3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java @@ -68,7 +68,6 @@ public class ConfirmDlg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CONFIRM_DLG.writeId(packet); - final SMParam[] params = _systemMessage.getParams(); packet.writeD(_systemMessage.getId()); packet.writeD(params.length); @@ -117,7 +116,6 @@ public class ConfirmDlg implements IClientOutgoingPacket } } } - packet.writeD(_time); packet.writeD(_requesterId); return true; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index f0e72598ea..5f5f2ced8f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -81,7 +81,6 @@ public class CreatureSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_sender == null ? 0 : _sender.getObjectId()); packet.writeD(_chatType.getClientId()); if (_senderName != null) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index 71f097207f..2d9b28445c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -39,7 +39,7 @@ public class DeleteObject implements IClientOutgoingPacket { OutgoingPackets.DELETE_OBJECT.writeId(packet); packet.writeD(_objectId); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 return true; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index d6f61833b4..7885df99d1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -64,22 +64,19 @@ public class Die implements IClientOutgoingPacket { OutgoingPackets.DIE.writeId(packet); packet.writeD(_objectId); - packet.writeD(_canTeleport ? 0x01 : 0x00); - + packet.writeD(_canTeleport ? 1 : 0); if (_creature.isPlayer()) { if (!Olympiad.getInstance().isRegistered(_creature.getActingPlayer()) && !_creature.getActingPlayer().isOnEvent()) { _staticRes = _creature.getInventory().haveItemForSelfResurrection(); } - // Verify if player can use fixed resurrection without Feather if (_access.allowFixedRes()) { _staticRes = true; } } - if (_canTeleport && (_clan != null) && !_isJailed) { boolean isInCastleDefense = false; @@ -106,30 +103,29 @@ public class Die implements IClientOutgoingPacket isInFortDefense = true; } } - - packet.writeD(_clan.getHideoutId() > 0 ? 0x01 : 0x00); // 6d 01 00 00 00 - to hide away - packet.writeD((_clan.getCastleId() > 0) || isInCastleDefense ? 0x01 : 0x00); // 6d 02 00 00 00 - to castle - packet.writeD((TerritoryWarManager.getInstance().getHQForClan(_clan) != null) || ((siegeClan != null) && !isInCastleDefense && !isInFortDefense && !siegeClan.getFlag().isEmpty()) || ((hall != null) && (hall.getSiege() != null) && hall.getSiege().checkIsAttacker(_clan)) ? 0x01 : 0x00); // 6d - // 03 - // 00 - // 00 - // 00 - // - - // to - // siege - // HQ - packet.writeD(_sweepable ? 0x01 : 0x00); // sweepable (blue glow) - packet.writeD(_staticRes ? 0x01 : 0x00); // 6d 04 00 00 00 - to FIXED - packet.writeD((_clan.getFortId() > 0) || isInFortDefense ? 0x01 : 0x00); // 6d 05 00 00 00 - to fortress + packet.writeD(_clan.getHideoutId() > 0 ? 1 : 0); // 6d 01 00 00 00 - to hide away + packet.writeD((_clan.getCastleId() > 0) || isInCastleDefense ? 1 : 0); // 6d 02 00 00 00 - to castle + packet.writeD((TerritoryWarManager.getInstance().getHQForClan(_clan) != null) || ((siegeClan != null) && !isInCastleDefense && !isInFortDefense && !siegeClan.getFlag().isEmpty()) || ((hall != null) && (hall.getSiege() != null) && hall.getSiege().checkIsAttacker(_clan)) ? 1 : 0); // 6d + // 03 + // 00 + // 00 + // 00 + // - + // to + // siege + // HQ + packet.writeD(_sweepable ? 1 : 0); // sweepable (blue glow) + packet.writeD(_staticRes ? 1 : 0); // 6d 04 00 00 00 - to FIXED + packet.writeD((_clan.getFortId() > 0) || isInFortDefense ? 1 : 0); // 6d 05 00 00 00 - to fortress } else { - packet.writeD(0x00); // 6d 01 00 00 00 - to hide away - packet.writeD(0x00); // 6d 02 00 00 00 - to castle - packet.writeD(0x00); // 6d 03 00 00 00 - to siege HQ - packet.writeD(_sweepable ? 0x01 : 0x00); // sweepable (blue glow) - packet.writeD(_staticRes ? 0x01 : 0x00); // 6d 04 00 00 00 - to FIXED - packet.writeD(0x00); // 6d 05 00 00 00 - to fortress + packet.writeD(0); // 6d 01 00 00 00 - to hide away + packet.writeD(0); // 6d 02 00 00 00 - to castle + packet.writeD(0); // 6d 03 00 00 00 - to siege HQ + packet.writeD(_sweepable ? 1 : 0); // sweepable (blue glow) + packet.writeD(_staticRes ? 1 : 0); // 6d 04 00 00 00 - to FIXED + packet.writeD(0); // 6d 05 00 00 00 - to fortress } // TODO: protocol 152 // packet.writeC(0); // show die animation diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index 0fece14daf..5cae569545 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -43,15 +43,13 @@ public class DropItem implements IClientOutgoingPacket packet.writeD(_objectId); packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeD(_item.isStackable() ? 0x01 : 0x00); + packet.writeD(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - - packet.writeD(0x01); // unknown + packet.writeD(1); // unknown return true; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java index 6c8899ae59..a5b142c423 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java @@ -52,7 +52,7 @@ public class Earthquake implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_intensity); packet.writeD(_duration); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown return true; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java index 0f46ee9478..0ba502e611 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java @@ -50,13 +50,11 @@ public class ExAirShipInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIRSHIP_INFO.writeId(packet); - packet.writeD(_ship.getObjectId()); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(_captain); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); @@ -73,14 +71,13 @@ public class ExAirShipInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - packet.writeD(_ship.getFuel()); packet.writeD(_ship.getMaxFuel()); return true; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java index 775e4dfa7b..f8674acdcf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java @@ -41,7 +41,6 @@ public class ExAirShipTeleportList implements IClientOutgoingPacket if (_teleports != null) { packet.writeD(_teleports.length); - VehiclePathPoint[] path; VehiclePathPoint dst; for (int i = 0; i < _teleports.length; i++) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java index 9818edd67f..a8137347ec 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java @@ -37,7 +37,7 @@ public class ExBaseAttributeCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASE_ATTRIBUTE_CANCEL_RESULT.writeId(packet); - packet.writeD(0x01); // result + packet.writeD(1); // result packet.writeD(_objId); packet.writeD(_attribute); return true; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java index e5d6737699..e0e136c3cf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java @@ -63,6 +63,7 @@ public class ExBasicActionList implements IClientOutgoingPacket 1096, 1097, 1098 }; //@formatter:on + public static final int[] DEFAULT_ACTION_LIST; static { @@ -75,12 +76,10 @@ public class ExBasicActionList implements IClientOutgoingPacket { DEFAULT_ACTION_LIST[i] = i; } - for (i = count2; i-- > 0;) { DEFAULT_ACTION_LIST[count1 + i] = 1000 + i; } - for (i = count3; i-- > 0;) { DEFAULT_ACTION_LIST[count1 + count2 + i] = 5000 + i; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java index a33ec48193..43e525f05f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java @@ -26,6 +26,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBrBroadcastEventState implements IClientOutgoingPacket { + public static final int APRIL_FOOLS = 20090401; + public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) + public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) + public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) + public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) + private final int _eventId; private final int _eventState; private int _param0; @@ -36,12 +42,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket private String _param5; private String _param6; - public static final int APRIL_FOOLS = 20090401; - public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) - public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) - public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) - public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) - public ExBrBroadcastEventState(int eventId, int eventState) { _eventId = eventId; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBrGamePoint.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBrGamePoint.java index 89e8125b6b..0a98444d1f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBrGamePoint.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBrGamePoint.java @@ -48,7 +48,7 @@ public class ExBrGamePoint implements IClientOutgoingPacket OutgoingPackets.EX_BR_GAME_POINT.writeId(packet); packet.writeD(_playerObj); packet.writeQ(_points); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBrProductInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBrProductInfo.java index cca3a42e85..a46149782c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBrProductInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBrProductInfo.java @@ -40,9 +40,7 @@ public class ExBrProductInfo implements IClientOutgoingPacket { return false; } - OutgoingPackets.EX_BR_PRODUCT_INFO.writeId(packet); - packet.writeD(_product.getProductId()); // product id packet.writeD(_product.getPrice()); // points packet.writeD(1); // components size diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBrProductList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBrProductList.java index 6aa8015f8c..fb52230b20 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBrProductList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBrProductList.java @@ -35,47 +35,44 @@ public class ExBrProductList implements IClientOutgoingPacket { OutgoingPackets.EX_BR_PRODUCT_LIST.writeId(packet); packet.writeD(_itemList.size()); - for (PrimeShopProductHolder product : _itemList) { final int category = product.getCategory(); packet.writeD(product.getProductId()); // product id packet.writeH(category); // category id packet.writeD(product.getPrice()); // points - switch (category) { case 6: { - packet.writeD(0x01); // event + packet.writeD(1); // event break; } case 7: { - packet.writeD(0x02); // best + packet.writeD(2); // best break; } case 8: { - packet.writeD(0x03); // event & best + packet.writeD(3); // event & best break; } default: { - packet.writeD(0x00); // normal + packet.writeD(0); // normal break; } } - - packet.writeD(0x00); // start sale - packet.writeD(0x00); // end sale - packet.writeC(0x00); // day week - packet.writeC(0x00); // start hour - packet.writeC(0x00); // start min - packet.writeC(0x00); // end hour - packet.writeC(0x00); // end min - packet.writeD(0x00); // current stock - packet.writeD(0x00); // max stock + packet.writeD(0); // start sale + packet.writeD(0); // end sale + packet.writeC(0); // day week + packet.writeC(0); // start hour + packet.writeC(0); // start min + packet.writeC(0); // end hour + packet.writeC(0); // end min + packet.writeD(0); // current stock + packet.writeD(0); // max stock } return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBrRecentProductList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBrRecentProductList.java index 9bbd39371e..b26db6216a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBrRecentProductList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBrRecentProductList.java @@ -40,7 +40,6 @@ public class ExBrRecentProductList implements IClientOutgoingPacket public ExBrRecentProductList(Player player) { final int playerObj = player.getObjectId(); - try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("SELECT productId FROM prime_shop_transactions WHERE charId=? ORDER BY transactionTime DESC")) { @@ -70,26 +69,23 @@ public class ExBrRecentProductList implements IClientOutgoingPacket { return false; } - OutgoingPackets.EX_BR_RECENT_PRODUCT_LIST.writeId(packet); packet.writeD(_itemList.size()); - for (PrimeShopProductHolder product : _itemList) { packet.writeD(product.getProductId()); packet.writeH(product.getCategory()); packet.writeD(product.getPrice()); - packet.writeD(0x00); // category - - packet.writeD(0x00); // start sale - packet.writeD(0x00); // end sale - packet.writeC(0x00); // day week - packet.writeC(0x00); // start hour - packet.writeC(0x00); // start min - packet.writeC(0x00); // end hour - packet.writeC(0x00); // end min - packet.writeD(0x00); // current stock - packet.writeD(0x00); // max stock + packet.writeD(0); // category + packet.writeD(0); // start sale + packet.writeD(0); // end sale + packet.writeC(0); // day week + packet.writeC(0); // start hour + packet.writeC(0); // start min + packet.writeC(0); // end hour + packet.writeC(0); // end min + packet.writeD(0); // current stock + packet.writeD(0); // max stock } return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index d80712a0a5..6ab84510f7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -88,32 +88,30 @@ public class ExBuySellList implements IClientOutgoingPacket { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); packet.writeQ(_money); - packet.writeD(_buyListId); packet.writeH(_buyList.size()); for (Product item : _buyList) { packet.writeH(item.getItem().getType1()); - packet.writeD(0x00); // objectId + packet.writeD(0); // objectId packet.writeD(item.getItemId()); packet.writeQ(item.getCount() < 0 ? 0 : item.getCount()); packet.writeH(item.getItem().getType2()); - packet.writeH(0x00); // ? + packet.writeH(0); // ? if (item.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { packet.writeD(item.getItem().getBodyPart()); - packet.writeH(0x00); // item enchant level - packet.writeH(0x00); // ? - packet.writeH(0x00); + packet.writeH(0); // item enchant level + packet.writeH(0); // ? + packet.writeH(0); } else { - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); } - if ((item.getItemId() >= 3960) && (item.getItemId() <= 4026)) { packet.writeQ((long) (item.getPrice() * Config.RATE_SIEGE_GUARDS_PRICE)); @@ -122,17 +120,15 @@ public class ExBuySellList implements IClientOutgoingPacket { packet.writeQ((long) (item.getPrice() * (1 + (_taxRate / 2)))); } - // T1 for (byte i = 0; i < 8; i++) { - packet.writeH(0x00); + packet.writeH(0); } - packet.writeH(0x00); // Enchant effect 1 - packet.writeH(0x00); // Enchant effect 2 - packet.writeH(0x00); // Enchant effect 3 + packet.writeH(0); // Enchant effect 1 + packet.writeH(0); // Enchant effect 2 + packet.writeH(0); // Enchant effect 3 } - if ((_sellList != null) && !_sellList.isEmpty()) { packet.writeH(_sellList.size()); @@ -143,13 +139,12 @@ public class ExBuySellList implements IClientOutgoingPacket packet.writeD(item.getId()); packet.writeQ(item.getCount()); packet.writeH(item.getItem().getType2()); - packet.writeH(0x00); + packet.writeH(0); packet.writeD(item.getItem().getBodyPart()); packet.writeH(item.getEnchantLevel()); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); packet.writeQ(Config.MERCHANT_ZERO_SELL_PRICE ? 0 : item.getItem().getReferencePrice() / 2); - // T1 packet.writeH(item.getAttackElementType()); packet.writeH(item.getAttackElementPower()); @@ -157,16 +152,15 @@ public class ExBuySellList implements IClientOutgoingPacket { packet.writeH(item.getElementDefAttr(i)); } - packet.writeH(0x00); // Enchant effect 1 - packet.writeH(0x00); // Enchant effect 2 - packet.writeH(0x00); // Enchant effect 3 + packet.writeH(0); // Enchant effect 1 + packet.writeH(0); // Enchant effect 2 + packet.writeH(0); // Enchant effect 3 } } else { - packet.writeH(0x00); + packet.writeH(0); } - if ((_refundList != null) && !_refundList.isEmpty()) { packet.writeH(_refundList.size()); @@ -177,11 +171,10 @@ public class ExBuySellList implements IClientOutgoingPacket packet.writeD(item.getId()); packet.writeQ(item.getCount()); packet.writeH(item.getItem().getType2()); - packet.writeH(0x00); // ? + packet.writeH(0); // ? packet.writeH(item.getEnchantLevel()); - packet.writeH(0x00); // ? + packet.writeH(0); // ? packet.writeQ(Config.MERCHANT_ZERO_SELL_PRICE ? 0 : (item.getItem().getReferencePrice() / 2) * item.getCount()); - // T1 packet.writeH(item.getAttackElementType()); packet.writeH(item.getAttackElementPower()); @@ -189,18 +182,16 @@ public class ExBuySellList implements IClientOutgoingPacket { packet.writeH(item.getElementDefAttr(i)); } - packet.writeH(0x00); // Enchant effect 1 - packet.writeH(0x00); // Enchant effect 2 - packet.writeH(0x00); // Enchant effect 3 + packet.writeH(0); // Enchant effect 1 + packet.writeH(0); // Enchant effect 2 + packet.writeH(0); // Enchant effect 3 } } else { - packet.writeH(0x00); + packet.writeH(0); } - - packet.writeC(_done ? 0x01 : 0x00); - + packet.writeC(_done ? 1 : 0); return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java index 27c112776b..1d02c972b5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java @@ -54,7 +54,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLOSSEUM_FENCE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_clientState); packet.writeD(_x); @@ -62,7 +61,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_width); packet.writeD(_length); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java index be50e316bc..9bd03b9aef 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameAddPlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x01); - + packet.writeD(1); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); return true; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java index c42bda2e5c..8f551e263b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java @@ -45,8 +45,7 @@ public class ExCubeGameChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java index 226c44b8ed..82bd2919b5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java @@ -43,11 +43,10 @@ public class ExCubeGameChangeTeam implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0x05); - + packet.writeD(5); packet.writeD(_player.getObjectId()); - packet.writeD(_fromRedTeam ? 0x01 : 0x00); - packet.writeD(_fromRedTeam ? 0x00 : 0x01); + packet.writeD(_fromRedTeam ? 1 : 0); + packet.writeD(_fromRedTeam ? 0 : 1); return true; } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java index 7fe15d2b42..4739af9f53 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java @@ -39,8 +39,7 @@ public class ExCubeGameChangeTimeToStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0x03); - + packet.writeD(3); packet.writeD(_seconds); return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java index 8492a9f468..ec74b51ee3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java @@ -40,9 +40,8 @@ public class ExCubeGameEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - packet.writeD(0x01); - - packet.writeD(_isRedTeamWin ? 0x01 : 0x00); + packet.writeD(1); + packet.writeD(_isRedTeamWin ? 1 : 0); return true; } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java index c2b17be7a8..861b2db34f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java @@ -55,13 +55,11 @@ public class ExCubeGameExtendedChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeD(_playerPoints); return true; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java index 44a08d945a..56877eea1b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java @@ -43,11 +43,9 @@ public class ExCubeGameRemovePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java index 90e561d75c..81f6f22617 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java @@ -29,7 +29,7 @@ public class ExCubeGameRequestReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0x04); + packet.writeD(4); return true; } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java index 5258cc30b0..f919881aae 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java @@ -30,7 +30,6 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket // Players Lists List _bluePlayers; List _redPlayers; - // Common Values int _roomNumber; @@ -51,11 +50,9 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_roomNumber); packet.writeD(0xffffffff); - packet.writeD(_bluePlayers.size()); for (Player player : _bluePlayers) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java index 29455aa7d6..fafc52e4db 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java @@ -37,7 +37,6 @@ public class ExCursedWeaponList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet); - packet.writeD(_cursedWeaponIds.size()); for (int i : _cursedWeaponIds) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java index 39cd0941a7..ce4b6eb68d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java @@ -39,7 +39,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet); - if (!_cursedWeaponInfo.isEmpty()) { packet.writeD(_cursedWeaponInfo.size()); @@ -47,7 +46,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { packet.writeD(w.id); packet.writeD(w.activated); - packet.writeD(w.pos.getX()); packet.writeD(w.pos.getY()); packet.writeD(w.pos.getZ()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExDominionWarStart.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExDominionWarStart.java index 68e5edc391..ed1e9403f7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExDominionWarStart.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExDominionWarStart.java @@ -42,7 +42,7 @@ public class ExDominionWarStart implements IClientOutgoingPacket { OutgoingPackets.EX_DOMINION_WAR_START.writeId(packet); packet.writeD(_objId); - packet.writeD(0x01); // ?? + packet.writeD(1); // ?? packet.writeD(_terId); packet.writeD(_isDisguised ? 1 : 0); packet.writeD(_isDisguised ? _terId : 0); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index dcec2f2710..fad1f28daf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -28,7 +28,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExEnchantSkillInfo implements IClientOutgoingPacket { private final List _routes = new ArrayList<>(); // skill levels for each route - private final int _id; private final int _level; private boolean _maxEnchanted = false; @@ -37,7 +36,6 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket { _id = id; _level = level; - final EnchantSkillLearn enchantLearn = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(_id); // do we have this skill? if (enchantLearn != null) @@ -46,16 +44,13 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket if (_level > 100) { _maxEnchanted = enchantLearn.isMaxEnchant(_level); - // get detail for next level final EnchantSkillHolder esd = enchantLearn.getEnchantSkillHolder(_level); - // if it exists add it if (esd != null) { _routes.add(_level); // current enchant add firts } - final int skillLevel = (_level % 100); for (int route : enchantLearn.getAllRoutes()) { @@ -89,7 +84,6 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket packet.writeD(_maxEnchanted ? 0 : 1); packet.writeD(_level > 100 ? 1 : 0); // enchanted? packet.writeD(_routes.size()); - for (int level : _routes) { packet.writeD(level); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 8783b8b4fc..7c2fd38fab 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -20,8 +20,8 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.EnchantSkillGroupsData; import org.l2jmobius.gameserver.model.EnchantSkillGroup.EnchantSkillHolder; -import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.EnchantSkillLearn; +import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -61,12 +61,10 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket esd = enchantLearn.getFirstRouteGroup().getEnchantGroupDetails().get(0); } } - if (esd == null) { throw new IllegalArgumentException("Skill " + skillId + " dont have enchant data for level " + skillLevel); } - if (type == 0) { multi = EnchantSkillGroupsData.NORMAL_ENCHANT_COST_MULTIPLIER; @@ -85,7 +83,6 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket _type = type; _skillId = skillId; _skillLevel = skillLevel; - switch (type) { case TYPE_NORMAL_ENCHANT: @@ -117,7 +114,6 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket return; } } - if ((type != TYPE_SAFE_ENCHANT) && !Config.ES_SP_BOOK_NEEDED) { reqCount = 0; @@ -133,7 +129,7 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket packet.writeD(_skillLevel); packet.writeD(_sp * multi); // sp packet.writeD(_chance); // exp - packet.writeD(0x02); // items count? + packet.writeD(2); // items count? packet.writeD(Inventory.ADENA_ID); // Adena packet.writeD(_adenacount); // Adena count packet.writeD(bookId); // ItemId Required diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingHpRegen.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingHpRegen.java index 25dc1b2484..c9e712b700 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingHpRegen.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingHpRegen.java @@ -50,7 +50,6 @@ public class ExFishingHpRegen implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FISHING_HP_REGEN.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeD(_time); packet.writeD(_fishHP); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStart.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStart.java index 280fd49e45..5f25b56135 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStart.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStart.java @@ -51,8 +51,8 @@ public class ExFishingStart implements IClientOutgoingPacket packet.writeD(_x); // x position packet.writeD(_y); // y position packet.writeD(_z); // z position - packet.writeC(_isNightLure ? 0x01 : 0x00); // night lure - packet.writeC(0x00); // show fish rank result button + packet.writeC(_isNightLure ? 1 : 0); // night lure + packet.writeC(0); // show fish rank result button return true; } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java index bdf8014011..27c4bf08d9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java @@ -37,10 +37,9 @@ public class ExGetBookMarkInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOOKMARK_INFO.writeId(packet); - packet.writeD(0x00); // Dummy + packet.writeD(0); // Dummy packet.writeD(_player.getBookmarkSlot()); packet.writeD(_player.getTeleportBookmarks().size()); - for (TeleportBookmark tpbm : _player.getTeleportBookmarks()) { packet.writeD(tpbm.getId()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java index d0492e17fa..201e8eb49b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java @@ -46,10 +46,10 @@ public class ExGetBossRecord implements IClientOutgoingPacket packet.writeD(_totalPoints); if (_bossRecordInfo == null) { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } else { @@ -58,7 +58,7 @@ public class ExGetBossRecord implements IClientOutgoingPacket { packet.writeD(entry.getKey()); packet.writeD(entry.getValue()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? } } return true; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java index 313e0cbebe..74485f3fe2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java @@ -47,7 +47,7 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket packet.writeD(_player.getObjectId()); packet.writeD(item.getItemId()); packet.writeQ(item.getCount()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeS(item.getSender()); } return true; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index b158fbebd6..66d3004b9f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -41,7 +41,6 @@ public class ExHeroList implements IClientOutgoingPacket { OutgoingPackets.EX_HERO_LIST.writeId(packet); packet.writeD(_heroList.size()); - for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java index 758474d64a..2bb41036c3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java @@ -38,7 +38,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { throw new NullPointerException(); } - if (currentAuction.getAuctionState() != ItemAuctionState.STARTED) { _timeRemaining = 0; @@ -47,7 +46,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { _timeRemaining = (int) (currentAuction.getFinishingTimeRemaining() / 1000); // in seconds } - _refresh = refresh; _currentAuction = currentAuction; _nextAuction = nextAuction; @@ -57,15 +55,12 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_AUCTION_INFO.writeId(packet); - packet.writeC(_refresh ? 0x00 : 0x01); + packet.writeC(_refresh ? 0 : 1); packet.writeD(_currentAuction.getInstanceId()); - final ItemAuctionBid highestBid = _currentAuction.getHighestBid(); packet.writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid()); - packet.writeD(_timeRemaining); writeItem(packet, _currentAuction.getItemInfo()); - if (_nextAuction != null) { packet.writeQ(_nextAuction.getAuctionInitBid()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index f922f9f4be..760be71208 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -56,29 +56,24 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeD(0); return true; } - for (Player cha : PartyMatchWaitingList.getInstance().getPlayers()) { if ((cha == null) || (cha == _player)) { continue; } - if (!cha.isPartyWaiting()) { PartyMatchWaitingList.getInstance().removePlayer(cha); continue; } - else if ((cha.getLevel() < _minLevel) || (cha.getLevel() > _maxLevel)) { continue; } - _members.add(cha); } - - packet.writeD(0x01); // Page? + packet.writeD(1); // Page? packet.writeD(_members.size()); for (Player member : _members) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java index e981eb64ad..4667a50010 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java @@ -61,11 +61,11 @@ public class ExManagePartyRoomMember implements IClientOutgoingPacket { if ((_room.getOwner().isInParty() && _player.isInParty()) && (_room.getOwner().getParty().getLeaderObjectId() == _player.getParty().getLeaderObjectId())) { - packet.writeD(0x02); + packet.writeD(2); } else { - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java index 7101acdd70..2775a1ca79 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java @@ -40,13 +40,10 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket { return false; } - OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet); - packet.writeS(_channel.getLeader().getName()); - packet.writeD(0x00); // Channel loot 0 or 1 + packet.writeD(0); // Channel loot 0 or 1 packet.writeD(_channel.getMemberCount()); - packet.writeD(_channel.getParties().size()); for (Party p : _channel.getParties()) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java index 9c2f9b6712..f2ce8614dc 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java @@ -43,7 +43,7 @@ public class ExNoticePostArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTICE_POST_ARRIVED.writeId(packet); - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java index 1bca615f37..05f2a0c6cd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java @@ -43,7 +43,7 @@ public class ExNoticePostSent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTICE_POST_SENT.writeId(packet); - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 0a321aea6c..be2726b328 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -50,20 +50,20 @@ public class ExPartyRoomMember implements IClientOutgoingPacket packet.writeD(_room.getLocation()); if (_room.getOwner().equals(member)) { - packet.writeD(0x01); + packet.writeD(1); } else { if ((_room.getOwner().isInParty() && member.isInParty()) && (_room.getOwner().getParty().getLeaderObjectId() == member.getParty().getLeaderObjectId())) { - packet.writeD(0x02); + packet.writeD(2); } else { - packet.writeD(0x00); + packet.writeD(0); } } - packet.writeD(0x00); // TODO: Instance datas there is more if that is not 0! + packet.writeD(0); // TODO: Instance datas there is more if that is not 0! } return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java index 398ee7cfef..b4b54a6315 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java @@ -46,7 +46,7 @@ public class ExPledgeEmblem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_crestId); if (_data != null) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 671ad3c5af..2313d5fb46 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -46,7 +46,7 @@ public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket packet.writeD(_itemAug1); packet.writeD(_itemAug2); packet.writeQ(_price); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java index 735231d6ef..c25dd16b01 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java @@ -36,7 +36,7 @@ public class ExPutItemResultForVariationMake implements IClientOutgoingPacket OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_MAKE.writeId(packet); packet.writeD(_itemObjId); packet.writeD(_itemId); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 4f66777243..f85a891db1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -26,7 +26,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; /** * @author Migi, DS */ - public class ExReplyPostItemList implements IClientOutgoingPacket { Player _player; @@ -53,14 +52,12 @@ public class ExReplyPostItemList implements IClientOutgoingPacket packet.writeD(item.getItem().getBodyPart()); packet.writeH(item.getEnchantLevel()); packet.writeH(item.getCustomType2()); - packet.writeH(item.getAttackElementType()); packet.writeH(item.getAttackElementPower()); for (byte i = 0; i < 6; i++) { packet.writeH(item.getElementDefAttr(i)); } - for (int op : item.getEnchantOptions()) { packet.writeH(op); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 6ad26ac9bc..dde9a580ff 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -56,37 +56,31 @@ public class ExReplyReceivedPost implements IClientOutgoingPacket OutgoingPackets.EX_REPLY_RECEIVED_POST.writeId(packet); packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown packet.writeS(_msg.getSenderName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); for (Item item : _items) { packet.writeH(item.getItem().getType2()); - packet.writeD(0x00); // unknown + packet.writeD(0); // unknown packet.writeD(item.getId()); packet.writeQ(item.getCount()); - - packet.writeD(0x00); // unknown + packet.writeD(0); // unknown packet.writeD(item.getEnchantLevel()); packet.writeH(item.getCustomType2()); - packet.writeH(0x00); // unknown - + packet.writeH(0); // unknown packet.writeD(item.isAugmented() ? item.getAugmentation().getAugmentationId() : 0x00); - - packet.writeD(0x00); // unknown - + packet.writeD(0); // unknown packet.writeH(item.getAttackElementType()); packet.writeH(item.getAttackElementPower()); for (byte i = 0; i < 6; i++) { packet.writeH(item.getElementDefAttr(i)); } - for (int op : item.getEnchantOptions()) { packet.writeH(op); @@ -95,9 +89,8 @@ public class ExReplyReceivedPost implements IClientOutgoingPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeQ(_msg.getReqAdena()); packet.writeD(_msg.hasAttachments() ? 1 : 0); packet.writeD(_msg.getSendBySystem()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 473a646d49..5ec63afce4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -60,32 +60,27 @@ public class ExReplySentPost implements IClientOutgoingPacket packet.writeS(_msg.getReceiverName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); for (Item item : _items) { packet.writeH(item.getItem().getType2()); - packet.writeD(0x00); // unknown + packet.writeD(0); // unknown packet.writeD(item.getId()); packet.writeQ(item.getCount()); packet.writeD(item.getEnchantLevel()); packet.writeH(item.getCustomType2()); - packet.writeH(0x00); // unknown - packet.writeD(0x00); // unknown - + packet.writeH(0); // unknown + packet.writeD(0); // unknown packet.writeD(item.isAugmented() ? item.getAugmentation().getAugmentationId() : 0x00); - - packet.writeD(0x00); // unknown - + packet.writeD(0); // unknown packet.writeH(item.getAttackElementType()); packet.writeH(item.getAttackElementPower()); for (byte i = 0; i < 6; i++) { packet.writeH(item.getElementDefAttr(i)); } - for (int op : item.getEnchantOptions()) { packet.writeH(op); @@ -96,7 +91,7 @@ public class ExReplySentPost implements IClientOutgoingPacket } else { - packet.writeD(0x00); + packet.writeD(0); packet.writeQ(_msg.getReqAdena()); } return true; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index 05674e6993..b4520a0bd7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -43,14 +43,14 @@ public class ExRpItemLink implements IClientOutgoingPacket packet.writeD(_item.getItem().getBodyPart()); packet.writeH(_item.getEnchantLevel()); packet.writeH(_item.getCustomType2()); - packet.writeH(0x00); // ?? + packet.writeH(0); // ?? if (_item.isAugmented()) { packet.writeD(_item.getAugmentation().getAugmentationId()); } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(_item.getMana()); packet.writeH(_item.getAttackElementType()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index 5bbf1793be..59b6379871 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -34,7 +34,6 @@ public class ExSendManorList implements IClientOutgoingPacket { final List castles = CastleManager.getInstance().getCastles(); castles.sort(Comparator.comparing(Castle::getResidenceId)); - OutgoingPackets.EX_SEND_MANOR_LIST.writeId(packet); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java index e92b6a8201..3778d7e57c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java @@ -391,9 +391,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(65535); // has to do something with display range and angle packet.writeD(65535); // has to do something with display range and angle - packet.writeD(_points.size() + _lines.size()); - for (Point point : _points) { packet.writeC(1); // Its the type in this case Point @@ -407,7 +405,6 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(point.getY()); packet.writeD(point.getZ()); } - for (Line line : _lines) { packet.writeC(2); // Its the type in this case Line diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index b850ee78f7..0722db1826 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -40,7 +40,7 @@ public class ExShowAgitInfo implements IClientOutgoingPacket packet.writeD(ch.getId()); packet.writeS(ch.getOwnerId() <= 0 ? "" : ClanTable.getInstance().getClan(ch.getOwnerId()).getName()); // owner clan name packet.writeS(ch.getOwnerId() <= 0 ? "" : ClanTable.getInstance().getClan(ch.getOwnerId()).getLeaderName()); // leader name - packet.writeD(ch.getGrade() > 0 ? 0x00 : 0x01); // 0 - auction 1 - war clanhall 2 - ETC (rainbow spring clanhall) + packet.writeD(ch.getGrade() > 0 ? 0 : 1); // 0 - auction 1 - war clanhall 2 - ETC (rainbow spring clanhall) } return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index 7593b20862..9d90f816d1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -37,7 +37,6 @@ public class ExShowCropInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _crops = (nextPeriod && !manor.isManorApproved()) ? null : manor.getCropProcure(manorId, nextPeriod); } @@ -46,9 +45,9 @@ public class ExShowCropInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_INFO.writeId(packet); - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Crop Sales" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Crop Sales" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); + packet.writeD(0); if (_crops == null) { packet.writeD(0); @@ -66,17 +65,17 @@ public class ExShowCropInfo implements IClientOutgoingPacket if (seed == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(seed.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(seed.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(seed.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index 991620f208..992ab59eb8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -62,10 +62,8 @@ public class ExShowCropSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - CropProcure cp; for (Seed s : _seeds) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowDominionRegistry.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowDominionRegistry.java index 580a596ef1..8731d02bb5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowDominionRegistry.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowDominionRegistry.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExShowDominionRegistry implements IClientOutgoingPacket { private static final int MINID = 80; + private final int _castleId; private int _clanReq = 0x00; private int _mercReq = 0x00; @@ -48,13 +49,13 @@ public class ExShowDominionRegistry implements IClientOutgoingPacket _clanReq = TerritoryWarManager.getInstance().getRegisteredClans(castleId).size(); if (player.getClan() != null) { - _isClanRegistered = (TerritoryWarManager.getInstance().getRegisteredClans(castleId).contains(player.getClan()) ? 0x01 : 0x00); + _isClanRegistered = (TerritoryWarManager.getInstance().getRegisteredClans(castleId).contains(player.getClan()) ? 1 : 0); } } if (TerritoryWarManager.getInstance().getRegisteredMercenaries(castleId) != null) { _mercReq = TerritoryWarManager.getInstance().getRegisteredMercenaries(castleId).size(); - _isMercRegistered = (TerritoryWarManager.getInstance().getRegisteredMercenaries(castleId).contains(player.getObjectId()) ? 0x01 : 0x00); + _isMercRegistered = (TerritoryWarManager.getInstance().getRegisteredMercenaries(castleId).contains(player.getObjectId()) ? 1 : 0); } _warTime = (int) (TerritoryWarManager.getInstance().getTWStartTimeInMillis() / 1000); } @@ -94,7 +95,7 @@ public class ExShowDominionRegistry implements IClientOutgoingPacket packet.writeD(_currentTime); // Current Time packet.writeD(_isClanRegistered); // is Cancel clan registration packet.writeD(_isMercRegistered); // is Cancel mercenaries registration - packet.writeD(0x01); // unknown + packet.writeD(1); // unknown final List territoryList = TerritoryWarManager.getInstance().getAllTerritories(); packet.writeD(territoryList.size()); // Territory Count for (Territory t : territoryList) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index 022db26ade..2d5cdb4a7e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -46,7 +46,7 @@ public class ExShowFortressInfo implements IClientOutgoingPacket final Clan clan = fort.getOwnerClan(); packet.writeD(fort.getResidenceId()); packet.writeS(clan != null ? clan.getName() : ""); - packet.writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00); + packet.writeD(fort.getSiege().isInProgress() ? 1 : 0); // Time of possession packet.writeD(fort.getOwnedTime()); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index 77c6197e06..b6200b96f3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -41,11 +41,9 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_MAP_INFO.writeId(packet); - packet.writeD(_fortress.getResidenceId()); packet.writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status packet.writeD(_fortress.getFortSize()); // barracks count - final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId()); if ((commanders != null) && !commanders.isEmpty() && _fortress.getSiege().isInProgress()) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 45c420fdbe..ffff6ce908 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -50,7 +50,6 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_SIEGE_INFO.writeId(packet); - packet.writeD(_fortId); // Fortress Id packet.writeD(_size); // Total Barracks Count if (_csize > 0) @@ -63,22 +62,22 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { case 0: { - packet.writeD(0x03); + packet.writeD(3); break; } case 1: { - packet.writeD(0x02); + packet.writeD(2); break; } case 2: { - packet.writeD(0x01); + packet.writeD(1); break; } case 3: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -91,27 +90,27 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket // TODO: once control room supported, update packet.writeD(0x0x) to support 5th room case 0: { - packet.writeD(0x05); + packet.writeD(5); break; } case 1: { - packet.writeD(0x04); + packet.writeD(4); break; } case 2: { - packet.writeD(0x03); + packet.writeD(3); break; } case 3: { - packet.writeD(0x02); + packet.writeD(2); break; } case 4: { - packet.writeD(0x01); + packet.writeD(1); break; } } @@ -123,7 +122,7 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { for (int i = 0; i < _size; i++) { - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java index e34c2087d4..912839e242 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java @@ -41,7 +41,7 @@ public class ExShowManorDefaultInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_MANOR_DEFAULT_INFO.writeId(packet); - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" and "Crop Sales" buttons + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" and "Crop Sales" buttons packet.writeD(_crops.size()); for (Seed crop : _crops) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowOwnthingPos.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowOwnthingPos.java index 512dcf4034..23ff7ca046 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowOwnthingPos.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowOwnthingPos.java @@ -38,7 +38,6 @@ public class ExShowOwnthingPos implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_OWNTHING_POS.writeId(packet); - if (TerritoryWarManager.getInstance().isTWInProgress()) { final Collection territoryWardList = TerritoryWarManager.getInstance().getAllTerritoryWards(); @@ -46,7 +45,6 @@ public class ExShowOwnthingPos implements IClientOutgoingPacket for (TerritoryWard ward : territoryWardList) { packet.writeD(ward.getTerritoryId()); - if (ward.getNpc() != null) { packet.writeD(ward.getNpc().getX()); @@ -61,16 +59,16 @@ public class ExShowOwnthingPos implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } } } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 1d3312d668..d03ce2a5fd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -52,10 +52,8 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet); - packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index 9bec433213..df8e898143 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -49,18 +49,18 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getSenderName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); - packet.writeD(0x01); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); + packet.writeD(msg.isUnread() ? 1 : 0); + packet.writeD(1); + packet.writeD(msg.hasAttachments() ? 1 : 0); packet.writeD(msg.getSendBySystem()); - packet.writeD(msg.isReturned() ? 0x01 : 0x00); + packet.writeD(msg.isReturned() ? 1 : 0); } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java index 26c0482ac0..8979e3c1eb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java @@ -33,6 +33,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; */ public class ExShowScreenMessage implements IClientOutgoingPacket { + // Positions + public static final byte TOP_LEFT = 1; + public static final byte TOP_CENTER = 2; + public static final byte TOP_RIGHT = 3; + public static final byte MIDDLE_LEFT = 4; + public static final byte MIDDLE_CENTER = 5; + public static final byte MIDDLE_RIGHT = 6; + public static final byte BOTTOM_CENTER = 7; + public static final byte BOTTOM_RIGHT = 8; + private final int _type; private final int _sysMessageId; private final int _unk1; @@ -48,15 +58,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket private List _parameters; // Localisation related. private String _lang; - // Positions - public static final byte TOP_LEFT = 0x01; - public static final byte TOP_CENTER = 0x02; - public static final byte TOP_RIGHT = 0x03; - public static final byte MIDDLE_LEFT = 0x04; - public static final byte MIDDLE_CENTER = 0x05; - public static final byte MIDDLE_RIGHT = 0x06; - public static final byte BOTTOM_CENTER = 0x07; - public static final byte BOTTOM_RIGHT = 0x08; public void setLang(String lang) { @@ -237,7 +238,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SCREEN_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -256,9 +256,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(sml.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -280,9 +280,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -290,7 +290,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket } } } - packet.writeD(_type); packet.writeD(_sysMessageId); packet.writeD(_position); @@ -298,9 +297,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); // packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java index 883f6df2ed..6123b08991 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java @@ -37,7 +37,6 @@ public class ExShowSeedInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _seeds = (nextPeriod && !manor.isManorApproved()) ? null : manor.getSeedProduction(manorId, nextPeriod); } @@ -46,9 +45,9 @@ public class ExShowSeedInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_INFO.writeId(packet); - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown if (_seeds == null) { packet.writeD(0); @@ -65,17 +64,17 @@ public class ExShowSeedInfo implements IClientOutgoingPacket if (s == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(s.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(s.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(s.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java index 595bebc0ea..5a3ea4211f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java @@ -40,7 +40,6 @@ public class ExShowSeedMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_MAP_INFO.writeId(packet); - packet.writeD(ENTRANCES.length); for (Location loc : ENTRANCES) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index 49f1d448d5..44a1cbea69 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -62,10 +62,8 @@ public class ExShowSeedSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - SeedProduction sp; for (Seed s : _seeds) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 1994402da2..269bec5b97 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -47,7 +47,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _cropsItems.put(cropId, item); } } - for (CropProcure crop : CastleManorManager.getInstance().getCropProcure(_manorId, false)) { if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) @@ -61,7 +60,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_cropsItems.size()); // size for (Item item : _cropsItems.values()) @@ -70,9 +68,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket packet.writeD(item.getObjectId()); // Object id packet.writeD(item.getId()); // crop id packet.writeD(seed.getLevel()); // seed level - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(1)); // reward 1 id - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(2)); // reward 2 id if (_castleCrops.containsKey(item.getId())) { @@ -85,9 +83,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket else { packet.writeD(0xFFFFFFFF); // manor - packet.writeQ(0x00); // buy residual - packet.writeQ(0x00); // buy price - packet.writeC(0x00); // reward + packet.writeQ(0); // buy residual + packet.writeQ(0); // buy price + packet.writeC(0); // reward } packet.writeQ(item.getCount()); // my crops } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index df83c40562..df253d3e90 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -49,16 +49,16 @@ public class ExShowSentPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getReceiverName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); - packet.writeD(0x01); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); + packet.writeD(msg.isUnread() ? 1 : 0); + packet.writeD(1); + packet.writeD(msg.hasAttachments() ? 1 : 0); } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java index 4e284f82c5..86e1009bbf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java @@ -46,7 +46,6 @@ public class ExShowTrace implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TRACE.writeId(packet); - packet.writeH(0); // type broken in H5 packet.writeD(0); // time broken in H5 packet.writeH(_locations.size()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java index 169827bab3..86211c8d97 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java @@ -44,10 +44,9 @@ public class ExSpawnEmitter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SPAWN_EMITTER.writeId(packet); - packet.writeD(_npcObjectId); packet.writeD(_playerObjectId); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java index 620800c1c4..534549b4fe 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java @@ -36,7 +36,6 @@ public class ExStartScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_START_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index 121b0a04bc..e43eea2904 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -54,7 +54,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet); - packet.writeD(_inventory); packet.writeD(_warehouse); packet.writeD(_clan); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java index fa635dd253..405b32c3fb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java @@ -75,12 +75,9 @@ public class ExUISetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_UI_SETTING.writeId(packet); - packet.writeD(buffsize); packet.writeD(categories); - int category = 0; - final int numKeyCt = _uiSettings.getKeys().size(); packet.writeD(numKeyCt); for (int i = 0; i < numKeyCt; i++) @@ -96,10 +93,9 @@ public class ExUISetting implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } category++; - if (_uiSettings.getCategories().containsKey(category)) { final List catElList2 = _uiSettings.getCategories().get(category); @@ -111,10 +107,9 @@ public class ExUISetting implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } category++; - if (_uiSettings.getKeys().containsKey(i)) { final List keyElList = _uiSettings.getKeys().get(i); @@ -130,11 +125,11 @@ public class ExUISetting implements IClientOutgoingPacket } else { - packet.writeD(0x00); + packet.writeD(0); } } packet.writeD(0x11); - packet.writeD(0x10); + packet.writeD(16); return true; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java index f992b3c937..e59c651371 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java @@ -41,7 +41,6 @@ public class ExUseSharedGroupItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USE_SHARED_GROUP_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeD(_grpId); packet.writeD(_remainingTime); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java index ca13948e94..e5f802cd8c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java @@ -79,15 +79,13 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // vehicleId + packet.writeD(0); // vehicleId packet.writeD(_objId); packet.writeS(_npc.getName()); - packet.writeD(_npc.getRace().ordinal()); - packet.writeD(_npc.getTemplate().getSex() == Sex.FEMALE ? 0x01 : 0x00); + packet.writeD(_npc.getTemplate().getSex() == Sex.FEMALE ? 1 : 0); packet.writeD(_fpcHolder.getClassId()); - - packet.writeD(0x00); // Inventory.PAPERDOLL_UNDER + packet.writeD(0); // Inventory.PAPERDOLL_UNDER packet.writeD(_fpcHolder.getEquipHead()); packet.writeD(_fpcHolder.getEquipRHand()); packet.writeD(_fpcHolder.getEquipLHand()); @@ -99,33 +97,27 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_fpcHolder.getEquipRHand()); // dual hand packet.writeD(_fpcHolder.getEquipHair()); packet.writeD(_fpcHolder.getEquipHair2()); - packet.writeD(0x00); // Inventory.PAPERDOLL_RBRACELET - packet.writeD(0x00); // Inventory.PAPERDOLL_LBRACELET - packet.writeD(0x00); // Inventory.PAPERDOLL_DECO1 - packet.writeD(0x00); // Inventory.PAPERDOLL_DECO2 - packet.writeD(0x00); // Inventory.PAPERDOLL_DECO3 - packet.writeD(0x00); // Inventory.PAPERDOLL_DECO4 - packet.writeD(0x00); // Inventory.PAPERDOLL_DECO5 - packet.writeD(0x00); // Inventory.PAPERDOLL_DECO6 - packet.writeD(0x00); // Inventory.PAPERDOLL_BELT - + packet.writeD(0); // Inventory.PAPERDOLL_RBRACELET + packet.writeD(0); // Inventory.PAPERDOLL_LBRACELET + packet.writeD(0); // Inventory.PAPERDOLL_DECO1 + packet.writeD(0); // Inventory.PAPERDOLL_DECO2 + packet.writeD(0); // Inventory.PAPERDOLL_DECO3 + packet.writeD(0); // Inventory.PAPERDOLL_DECO4 + packet.writeD(0); // Inventory.PAPERDOLL_DECO5 + packet.writeD(0); // Inventory.PAPERDOLL_DECO6 + packet.writeD(0); // Inventory.PAPERDOLL_BELT for (int i = 0; i < 21; i++) { - packet.writeD(0x00); + packet.writeD(0); } - - packet.writeD(0x00); // getTalismanSlots - packet.writeD(0x01); // canEquipCloak - + packet.writeD(0); // getTalismanSlots + packet.writeD(1); // canEquipCloak packet.writeD(_npc.getScriptValue()); // getPvpFlag() packet.writeD(_npc.getKarma()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeD(_npc.getScriptValue()); // getPvpFlag() packet.writeD(_npc.getKarma()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -136,16 +128,12 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_npc.getCollisionRadius()); packet.writeF(_npc.getCollisionHeight()); - packet.writeD(_fpcHolder.getHair()); packet.writeD(_fpcHolder.getHairColor()); packet.writeD(_fpcHolder.getFace()); - packet.writeS(_npc.getTemplate().getTitle()); - if (_clan != null) { packet.writeD(_clan.getId()); @@ -155,78 +143,56 @@ public class FakePlayerInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - // In UserInfo leader rights and siege flags, but here found nothing?? // Therefore RelationChanged packet with that info is required - packet.writeD(0x00); - - packet.writeC(0x01); // isSitting() ? 0x00 : 0x01 (at some initial tests it worked) - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); - packet.writeC(_npc.isInCombat() ? 0x01 : 0x00); - - packet.writeC(_npc.isAlikeDead() ? 0x01 : 0x00); - - packet.writeC(_npc.isInvisible() ? 0x01 : 0x00); - - packet.writeC(0x00); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount - packet.writeC(0x00); // getPrivateStoreType().getId() - - packet.writeH(0x00); // getCubics().size() + packet.writeD(0); + packet.writeC(1); // isSitting() ? 0 : 1 (at some initial tests it worked) + packet.writeC(_npc.isRunning() ? 1 : 0); + packet.writeC(_npc.isInCombat() ? 1 : 0); + packet.writeC(_npc.isAlikeDead() ? 1 : 0); + packet.writeC(_npc.isInvisible() ? 1 : 0); + packet.writeC(0); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount + packet.writeC(0); // getPrivateStoreType().getId() + packet.writeH(0); // getCubics().size() // getCubics().keySet().forEach(packet::writeH); - packet.writeC(0x00); // isInPartyMatchRoom - + packet.writeC(0); // isInPartyMatchRoom packet.writeD(_npc.getAbnormalVisualEffects()); - packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : 0); - packet.writeH(_fpcHolder.getRecommends()); // Blue value for name (0 = white, 255 = pure blue) - packet.writeD(0x00); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 + packet.writeD(0); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 packet.writeD(_fpcHolder.getClassId()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeC(_fpcHolder.getWeaponEnchantLevel()); // isMounted() ? 0 : _enchantLevel - packet.writeC(_npc.getTeam().getId()); - - packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0x00); + packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0); packet.writeC(_fpcHolder.getNobleLevel()); - packet.writeC(_fpcHolder.isHero() ? 0x01 : 0x00); - - packet.writeC(_fpcHolder.isFishing() ? 0x01 : 0x00); - + packet.writeC(_fpcHolder.isHero() ? 1 : 0); + packet.writeC(_fpcHolder.isFishing() ? 1 : 0); packet.writeD(_fpcHolder.getBaitLocationX()); packet.writeD(_fpcHolder.getBaitLocationY()); packet.writeD(_fpcHolder.getBaitLocationZ()); - packet.writeD(_fpcHolder.getNameColor()); - packet.writeD(_heading); - packet.writeD(_fpcHolder.getPledgeStatus()); - packet.writeD(0x00); // getPledgeType() - + packet.writeD(0); // getPledgeType() packet.writeD(_fpcHolder.getTitleColor()); - - packet.writeD(0x00); // isCursedWeaponEquipped - - packet.writeD(0x00); // getClanId() > 0 ? getClan().getReputationScore() : 0 - + packet.writeD(0); // isCursedWeaponEquipped + packet.writeD(0); // getClanId() > 0 ? getClan().getReputationScore() : 0 // T1 - packet.writeD(0x00); // getTransformationDisplayId() + packet.writeD(0); // getTransformationDisplayId() packet.writeD(_fpcHolder.getAgathionId()); - // T2 - packet.writeD(0x01); - + packet.writeD(1); // T2.3 packet.writeD(_npc.getAbnormalVisualEffectSpecial()); - packet.writeD(0x00); // territory Id - packet.writeD(0x00); // is Disguised - packet.writeD(0x00); // territory Id + packet.writeD(0); // territory Id + packet.writeD(0); // is Disguised + packet.writeD(0); // territory Id return true; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java index 5915c933f2..e54b0989e4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java @@ -53,7 +53,6 @@ public class FlyToLocation implements IClientOutgoingPacket _destY = destY; _destZ = destZ; _type = type; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java index d09f0ff65c..4d9654a4af 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java @@ -36,7 +36,7 @@ public class FriendAddRequest implements IClientOutgoingPacket { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); packet.writeS(_requestorName); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/FriendList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/FriendList.java index 40dffceee4..cfca3fd549 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/FriendList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/FriendList.java @@ -73,8 +73,8 @@ public class FriendList implements IClientOutgoingPacket { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online } return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/FriendListExtended.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/FriendListExtended.java index 0773b14f5b..2a6c90febd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/FriendListExtended.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/FriendListExtended.java @@ -86,12 +86,10 @@ public class FriendListExtended implements IClientOutgoingPacket } continue; } - if (player1.isOnline()) { online = true; } - classid = player1.getClassId().getId(); level = player1.getLevel(); _info.add(new FriendInfo(objId, name, online, classid, level)); @@ -107,8 +105,8 @@ public class FriendListExtended implements IClientOutgoingPacket { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._classid); packet.writeD(info._level); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index b7731eb11a..95b2857ac8 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -60,7 +60,7 @@ public class GMHennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(0x01); + packet.writeD(1); } return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index 53b87064f4..18d8d40762 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -47,7 +47,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -73,22 +72,18 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); packet.writeD(_player.getPkKills()); - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollObjectId(slot)); } - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); } - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollAugmentationId(slot)); } - packet.writeD(_player.getInventory().getTalismanSlots()); // CT2.3 packet.writeD(_player.getInventory().canEquipCloak() ? 1 : 0); // CT2.3 packet.writeD((int) _player.getPAtk(null)); @@ -98,15 +93,11 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAccuracy()); packet.writeD(_player.getCriticalHit(null, null)); packet.writeD((int) _player.getMAtk(null, null)); - packet.writeD(_player.getMAtkSpd()); packet.writeD((int) _player.getPAtkSpd()); - packet.writeD((int) _player.getMDef(null, null)); - packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name packet.writeD(_player.getKarma()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -122,8 +113,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeD(_player.isGM() ? 0x01 : 0x00); // builder level - + packet.writeD(_player.isGM() ? 1 : 0); // builder level packet.writeS(_player.getTitle()); packet.writeD(_player.getClanId()); // pledge id packet.writeD(_player.getClanCrestId()); // pledge crest id @@ -133,26 +123,19 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeC(_player.hasDwarvenCraft() ? 1 : 0); packet.writeD(_player.getPkKills()); packet.writeD(_player.getPvpKills()); - packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); - - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeC(321); - packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window - - packet.writeC(_player.isNoble() ? 0x01 : 0x00); - packet.writeC(_player.isHero() ? 0x01 : 0x00); - + packet.writeC(_player.isNoble() ? 1 : 0); + packet.writeC(_player.isHero() ? 1 : 0); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); - final byte attackAttribute = _player.getAttackElement(); packet.writeH(attackAttribute); packet.writeH(_player.getAttackElementValue(attackAttribute)); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index 9021e2f780..41f151be6f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -57,7 +57,7 @@ public class GMViewItemList extends AbstractItemPacket OutgoingPackets.GM_VIEW_ITEM_LIST.writeId(packet); packet.writeS(_playerName); packet.writeD(_limit); // inventory limit - packet.writeH(0x01); // show window ?? + packet.writeH(1); // show window ?? packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index ed773400eb..fb1dc32aec 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -39,7 +39,7 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeD(_clan.getId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); packet.writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game @@ -49,16 +49,14 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 packet.writeD(_clan.getAllyCrestId()); // c2 packet.writeD(_clan.isAtWar() ? 1 : 0); // c3 - packet.writeD(0x00); // T3 Unknown + packet.writeD(0); // T3 Unknown packet.writeD(_clan.getMembers().length); - for (ClanMember member : _clan.getMembers()) { if (member != null) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java index 8d36ab1a37..dbb8844755 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -14,7 +14,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; @@ -42,7 +41,6 @@ public class GMViewSkillInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_SKILL_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeD(_skills.size()); - final boolean isDisabled = (_player.getClan() != null) ? (_player.getClan().getReputationScore() < 0) : false; for (Skill skill : _skills) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index 5b4ee64167..037b2e6b6b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -37,7 +37,6 @@ public class GetItem implements IClientOutgoingPacket OutgoingPackets.GET_ITEM.writeId(packet); packet.writeD(_playerId); packet.writeD(_item.getObjectId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java index 586888a6dc..5b0c45dfff 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java @@ -41,7 +41,6 @@ public class GmViewQuestInfo implements IClientOutgoingPacket { OutgoingPackets.GM_VIEW_QUEST_INFO.writeId(packet); packet.writeS(_player.getName()); - final List questList = _player.getAllActiveQuests(); if (questList.isEmpty()) { @@ -50,20 +49,16 @@ public class GmViewQuestInfo implements IClientOutgoingPacket packet.writeH(0); return true; } - packet.writeH(questList.size()); // quest count - for (Quest q : questList) { packet.writeD(q.getId()); - final QuestState qs = _player.getQuestState(q.getName()); if (qs == null) { packet.writeD(0); continue; } - packet.writeD(qs.getCond()); // stage of quest progress } return true; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 9ab9f0a836..0b7edbbd7f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -51,7 +51,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeQ(_player.getAdena()); // activeChar current amount of Adena packet.writeD(3); // available equip slot packet.writeD(_hennaEquipList.size()); - for (Henna henna : _hennaEquipList) { // Player must have at least one dye in inventory @@ -62,7 +61,7 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); // item Id of the dye packet.writeQ(henna.getWearCount()); // amount of dyes required packet.writeQ(henna.getWearFee()); // amount of Adena required - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // meet the requirement or not } } return true; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 484a17d676..94e4bd1530 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -60,7 +60,7 @@ public class HennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(0x01); + packet.writeD(1); } return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index ee3c55cd4b..96723d8e59 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -43,7 +43,7 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getWearCount()); // total amount of dye require packet.writeQ(_henna.getWearFee()); // total amount of Adena require to draw symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to draw or not 0 is false and 1 is true + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to draw or not 0 is false and 1 is true packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeC(_player.getINT() + _henna.getStatINT()); // equip INT diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 1a69e823fe..d98b9295e0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -43,7 +43,7 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getCancelCount()); // total amount of dye require packet.writeQ(_henna.getCancelFee()); // total amount of Adena require to remove symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to remove or not + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to remove or not packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeC(_player.getINT() - _henna.getStatINT()); // equip INT diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 1b4cfefc1e..921240fbbf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -38,9 +38,8 @@ public class HennaRemoveList implements IClientOutgoingPacket { OutgoingPackets.HENNA_UNEQUIP_LIST.writeId(packet); packet.writeQ(_player.getAdena()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(3 - _player.getHennaEmptySlots()); - for (Henna henna : _player.getHennaList()) { if (henna != null) @@ -48,10 +47,10 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(henna.getDyeId()); packet.writeD(henna.getDyeItemId()); packet.writeD(henna.getCancelCount()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(henna.getCancelFee()); - packet.writeD(0x00); - packet.writeD(0x01); + packet.writeD(0); + packet.writeD(1); } } return true; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index 983df1469c..44592de114 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -40,7 +40,7 @@ public class ItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.ITEM_LIST.writeId(packet); - packet.writeH(_showWindow ? 0x01 : 0x00); + packet.writeH(_showWindow ? 1 : 0); packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index 754490c1a9..aa15a065c2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -35,16 +35,15 @@ public class KeyPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VERSION_CHECK.writeId(packet); - packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok for (int i = 0; i < 8; i++) { packet.writeC(_key[i]); // key } - packet.writeD(0x01); + packet.writeD(1); packet.writeD(Config.SERVER_ID); // server id - packet.writeC(0x01); - packet.writeD(0x00); // obfuscation key + packet.writeC(1); + packet.writeD(0); // obfuscation key return true; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java index 484c10f0c4..62424fd03a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java @@ -40,7 +40,6 @@ public class L2FriendSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_SAY.writeId(packet); - packet.writeD(0); // ?? packet.writeS(_receiver); packet.writeS(_sender); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWating.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWating.java index 292d8011cf..7455858575 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWating.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWating.java @@ -67,13 +67,12 @@ public class ListPartyWating implements IClientOutgoingPacket OutgoingPackets.LIST_PARTY_WAITING.writeId(packet); if (size > 0) { - packet.writeD(0x01); + packet.writeD(1); } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeD(_rooms.size()); for (PartyMatchRoom room : _rooms) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java index 14e5c8f4a1..5f5448f0e6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java @@ -58,7 +58,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet); - packet.writeD(_objectId); packet.writeD(_skillId); packet.writeD(_skillLevel); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 5db308c079..0f547e86a1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -42,11 +42,9 @@ public class MonRaceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MON_RACE_INFO.writeId(packet); - packet.writeD(_unknown1); packet.writeD(_unknown2); - packet.writeD(0x08); - + packet.writeD(8); for (int i = 0; i < 8; i++) { packet.writeD(_monsters[i].getObjectId()); // npcObjectID @@ -68,11 +66,11 @@ public class MonRaceInfo implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } } - packet.writeD(0x00); - packet.writeD(0x00); // CT2.3 special effect + packet.writeD(0); + packet.writeD(0); // CT2.3 special effect } return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java index 0093b3edc9..e6386921ff 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java @@ -45,13 +45,10 @@ public class MoveToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_xDst); packet.writeD(_yDst); packet.writeD(_zDst); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java index 678ad90abb..07fe545ed6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java @@ -49,11 +49,9 @@ public class MoveToPawn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_PAWN.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetId); packet.writeD(_distance); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index c9350fa760..da3d9160de 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -56,28 +56,25 @@ public class MultiSellList implements IClientOutgoingPacket packet.writeD(_finished ? 1 : 0); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - Entry ent; while (_size-- > 0) { ent = _list.getEntries().get(_index++); packet.writeD(ent.getEntryId()); packet.writeC(ent.isStackable() ? 1 : 0); - packet.writeH(0x00); // C6 - packet.writeD(0x00); // C6 - packet.writeD(0x00); // T1 + packet.writeH(0); // C6 + packet.writeD(0); // C6 + packet.writeD(0); // T1 packet.writeH(65534); // T1 - packet.writeH(0x00); // T1 - packet.writeH(0x00); // T1 - packet.writeH(0x00); // T1 - packet.writeH(0x00); // T1 - packet.writeH(0x00); // T1 - packet.writeH(0x00); // T1 - packet.writeH(0x00); // T1 - + packet.writeH(0); // T1 + packet.writeH(0); // T1 + packet.writeH(0); // T1 + packet.writeH(0); // T1 + packet.writeH(0); // T1 + packet.writeH(0); // T1 + packet.writeH(0); // T1 packet.writeH(ent.getProducts().size()); packet.writeH(ent.getIngredients().size()); - for (Ingredient ing : ent.getProducts()) { if (ing.getTemplate() != null) @@ -97,7 +94,7 @@ public class MultiSellList implements IClientOutgoingPacket { packet.writeH(ing.getItemInfo().getEnchantLevel()); // enchant level packet.writeD(ing.getItemInfo().getAugmentId()); // augment id - packet.writeD(0x00); // mana + packet.writeD(0); // mana packet.writeH(ing.getItemInfo().getElementId()); // attack element packet.writeH(ing.getItemInfo().getElementPower()); // element power packet.writeH(ing.getItemInfo().getElementals()[0]); // fire @@ -110,19 +107,18 @@ public class MultiSellList implements IClientOutgoingPacket else { packet.writeH(ing.getEnchantLevel()); // enchant level - packet.writeD(0x00); // augment id - packet.writeD(0x00); // mana - packet.writeH(0x00); // attack element - packet.writeH(0x00); // element power - packet.writeH(0x00); // fire - packet.writeH(0x00); // water - packet.writeH(0x00); // wind - packet.writeH(0x00); // earth - packet.writeH(0x00); // holy - packet.writeH(0x00); // dark + packet.writeD(0); // augment id + packet.writeD(0); // mana + packet.writeH(0); // attack element + packet.writeH(0); // element power + packet.writeH(0); // fire + packet.writeH(0); // water + packet.writeH(0); // wind + packet.writeH(0); // earth + packet.writeH(0); // holy + packet.writeH(0); // dark } } - for (Ingredient ing : ent.getIngredients()) { packet.writeD(ing.getTemplate() != null ? ing.getTemplate().getDisplayId() : ing.getItemId()); @@ -132,7 +128,7 @@ public class MultiSellList implements IClientOutgoingPacket { packet.writeH(ing.getItemInfo().getEnchantLevel()); // enchant level packet.writeD(ing.getItemInfo().getAugmentId()); // augment id - packet.writeD(0x00); // mana + packet.writeD(0); // mana packet.writeH(ing.getItemInfo().getElementId()); // attack element packet.writeH(ing.getItemInfo().getElementPower()); // element power packet.writeH(ing.getItemInfo().getElementals()[0]); // fire @@ -145,16 +141,16 @@ public class MultiSellList implements IClientOutgoingPacket else { packet.writeH(ing.getEnchantLevel()); // enchant level - packet.writeD(0x00); // augment id - packet.writeD(0x00); // mana - packet.writeH(0x00); // attack element - packet.writeH(0x00); // element power - packet.writeH(0x00); // fire - packet.writeH(0x00); // water - packet.writeH(0x00); // wind - packet.writeH(0x00); // earth - packet.writeH(0x00); // holy - packet.writeH(0x00); // dark + packet.writeD(0); // augment id + packet.writeD(0); // mana + packet.writeH(0); // attack element + packet.writeH(0); // element power + packet.writeH(0); // fire + packet.writeH(0); // water + packet.writeH(0); // wind + packet.writeH(0); // earth + packet.writeH(0); // holy + packet.writeH(0); // dark } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java index 7dcf24defa..29265f5734 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java @@ -47,7 +47,7 @@ public class MyTargetSelected implements IClientOutgoingPacket OutgoingPackets.MY_TARGET_SELECTED.writeId(packet); packet.writeD(_objectId); packet.writeH(_color); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java index 86bc9f1a12..590e561339 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java @@ -37,14 +37,12 @@ public class NewCharacterSuccess implements IClientOutgoingPacket { OutgoingPackets.NEW_CHARACTER_SUCCESS.writeId(packet); packet.writeD(_chars.size()); - for (PlayerTemplate chr : _chars) { if (chr == null) { continue; } - // TODO: Unhardcode these packet.writeD(chr.getRace().ordinal()); packet.writeD(chr.getClassId().getId()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index c122c6ea43..eee0eb718e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -54,24 +54,20 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public NpcHtmlMessage(int npcObjId, int itemId) { super(npcObjId); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } public NpcHtmlMessage(int npcObjId, int itemId, String html) { super(npcObjId, html); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java index 13e3ed6e8c..f5d3c5ee31 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java @@ -105,11 +105,9 @@ public class NpcSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_SAY.writeId(packet); - packet.writeD(_objectId); packet.writeD(_textType.getClientId()); packet.writeD(_npcId); - if (_parameters != null) { for (int i = 0; i < _parameters.size(); i++) @@ -117,7 +115,6 @@ public class NpcSay implements IClientOutgoingPacket _text = _text.replace("$s" + (i + 1), _parameters.get(i)); } } - // Localisation related. if (_lang != null) { @@ -131,7 +128,6 @@ public class NpcSay implements IClientOutgoingPacket } } } - packet.writeS(_text); return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java index ffbfcc3f42..141348fdcc 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java @@ -36,9 +36,9 @@ public class ObservationMode implements IClientOutgoingPacket packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); - packet.writeC(0x00); // ? + packet.writeC(0); // ? packet.writeC(0xc0); // ? - packet.writeC(0x00); // ? + packet.writeC(0); // ? return true; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java index 64264d8220..1e296625ad 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java @@ -37,7 +37,7 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket { OutgoingPackets.PARTY_SMALL_WINDOW_ADD.writeId(packet); packet.writeD(_party.getLeaderObjectId()); // c3 - packet.writeD(_party.getDistributionType().getId()); // packet.writeD(0x04); ?? //c3 + packet.writeD(_party.getDistributionType().getId()); // packet.writeD(4); ?? //c3 packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); packet.writeD((int) _member.getCurrentCp()); // c4 @@ -48,8 +48,8 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket packet.writeD(_member.getMaxMp()); packet.writeD(_member.getLevel()); packet.writeD(_member.getClassId().getId()); - packet.writeD(0x00); // ? - packet.writeD(0x00); // ? + packet.writeD(0); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java index f7ef16bf6c..a1a3a3a3a5 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java @@ -39,27 +39,24 @@ public class PartySmallWindowAll implements IClientOutgoingPacket packet.writeD(_party.getLeaderObjectId()); packet.writeD(_party.getDistributionType().getId()); packet.writeD(_party.getMemberCount() - 1); - for (Player member : _party.getMembers()) { if ((member != null) && (member != _exclude)) { packet.writeD(member.getObjectId()); packet.writeS(member.getName()); - packet.writeD((int) member.getCurrentCp()); // c4 packet.writeD(member.getMaxCp()); // c4 - packet.writeD((int) member.getCurrentHp()); packet.writeD(member.getMaxHp()); packet.writeD((int) member.getCurrentMp()); packet.writeD(member.getMaxMp()); packet.writeD(member.getLevel()); packet.writeD(member.getClassId().getId()); - packet.writeD(0x00); // packet.writeD(0x01); ?? + packet.writeD(0); // packet.writeD(1); ?? packet.writeD(member.getRace().ordinal()); - packet.writeD(0x00); // T2.3 - packet.writeD(0x00); // T2.3 + packet.writeD(0); // T2.3 + packet.writeD(0); // T2.3 if (member.hasSummon()) { packet.writeD(member.getSummon().getObjectId()); @@ -74,7 +71,7 @@ public class PartySmallWindowAll implements IClientOutgoingPacket } else { - packet.writeD(0x00); + packet.writeD(0); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java index e8697924fa..eba85303cb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java @@ -35,10 +35,8 @@ public class PartySmallWindowUpdate implements IClientOutgoingPacket 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()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java index b26667d8d0..58fdbe9efd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java @@ -88,7 +88,6 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeD(0); // 1=attackable - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); @@ -110,7 +109,7 @@ public class PetInfo implements IClientOutgoingPacket packet.writeF(_summon.getTemplate().getFCollisionHeight()); packet.writeD(_summon.getWeapon()); // right hand weapon packet.writeD(_summon.getArmor()); // body armor - packet.writeD(0x00); // left hand weapon + packet.writeD(0); // left hand weapon packet.writeC(_summon.getOwner() != null ? 1 : 0); // when pet is dead and player exit game, pet doesn't show master name packet.writeC(_summon.isRunning() ? 1 : 0); // running=1 (it is always 1, walking mode is calculated from multiplier) packet.writeC(_summon.isInCombat() ? 1 : 0); // attacking 1=true @@ -137,7 +136,6 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD((int) _summon.getStat().getSp()); // sp packet.writeD(_summon.getLevel()); // level packet.writeQ(_summon.getStat().getExp()); - if (_summon.getExpForThisLevel() > _summon.getStat().getExp()) { packet.writeQ(_summon.getStat().getExp()); // 0% absolute value @@ -146,7 +144,6 @@ public class PetInfo implements IClientOutgoingPacket { packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value } - packet.writeQ(_summon.getExpForNextLevel()); // 100% absoulte value packet.writeD(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight packet.writeD(_summon.getMaxLoad()); // max weight it can carry @@ -160,12 +157,9 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD((int) _summon.getMoveSpeed()); // speed packet.writeD((int) _summon.getPAtkSpd()); // atkspeed packet.writeD(_summon.getMAtkSpd()); // casting speed - packet.writeD(_summon.getAbnormalVisualEffects()); // c2 abnormal visual effect... bleed=1; poison=2; poison & bleed=3; flame=4; packet.writeH(_summon.isMountable() ? 1 : 0); // c2 ride button - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); // c2 - // Following all added in C4. packet.writeH(0); // ?? packet.writeC(_summon.getTeam().getId()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 95619daabd..4001bd3817 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -55,19 +55,17 @@ public class PetInventoryUpdate extends AbstractInventoryUpdate packet.writeD(item.getItem().getId()); packet.writeQ(item.getCount()); packet.writeH(item.getItem().getType2()); // item type2 - packet.writeH(0x00); // ? + packet.writeH(0); // ? packet.writeH(item.getEquipped()); 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(0x00); // ? - + packet.writeH(0); // ? packet.writeH(item.getAttackElementType()); packet.writeH(item.getAttackElementPower()); for (byte i = 0; i < 6; i++) { packet.writeH(item.getElementDefAttr(i)); } - for (int op : item.getEnchantOptions()) { packet.writeH(op); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index 26e8e29e91..6ee0a345b0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -43,19 +43,17 @@ public class PetItemList implements IClientOutgoingPacket packet.writeD(item.getId()); packet.writeQ(item.getCount()); packet.writeH(item.getItem().getType2()); // item type2 - packet.writeH(0x00); // ? - packet.writeH(item.isEquipped() ? 0x01 : 0x00); + packet.writeH(0); // ? + packet.writeH(item.isEquipped() ? 1 : 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.getEnchantLevel()); // enchant level - packet.writeH(0x00); // ? - + packet.writeH(0); // ? packet.writeH(item.getAttackElementType()); packet.writeH(item.getAttackElementPower()); for (byte i = 0; i < 6; i++) { packet.writeH(item.getElementDefAttr(i)); } - for (int op : item.getEnchantOptions()) { packet.writeH(op); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java index 7b2c200b5e..570988be83 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java @@ -39,12 +39,10 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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 - // clan or subpledge name if (_member.getPledgeType() != 0) { @@ -54,7 +52,6 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket { packet.writeS(_member.getClan().getName()); } - packet.writeS(_member.getApprenticeOrSponsorName()); // name of this member's apprentice/sponsor return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index a997d41772..6032065546 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -44,8 +44,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_SUB_PLEDGE_CREATED.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); packet.writeD(_subPledge.getId()); packet.writeS(_subPledge.getName()); packet.writeS(getLeaderName()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java index 448444a8f6..67358d749b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java @@ -39,9 +39,8 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(packet); - packet.writeD(_tab); // type : 0 = Declared, 1 = Under Attack - packet.writeD(0x00); // page + packet.writeD(0); // page packet.writeD(_tab == 0 ? _clan.getWarList().size() : _clan.getAttackerList().size()); for (Integer i : _tab == 0 ? _clan.getWarList() : _clan.getAttackerList()) { @@ -50,7 +49,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket { continue; } - packet.writeS(clan.getName()); packet.writeD(_tab); // ?? packet.writeD(_tab); // ?? diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java index 1de906d958..3a7961af78 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java @@ -42,8 +42,8 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); // clan reputation score - packet.writeD(0x00); // ? - packet.writeD(0x00); // ? + packet.writeD(0); // ? + packet.writeD(0); // ? packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); // c5 packet.writeD(_clan.getAllyCrestId()); // c5 diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java index 0da5d85014..2fa9f26d4a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java @@ -54,8 +54,8 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); - packet.writeD(0x00); - packet.writeD(0x01); + packet.writeD(0); + packet.writeD(1); packet.writeD(_isOnline); // 1 = online 0 = offline packet.writeD(_pledgeType); return true; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index a3f55609dc..dac1207398 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -43,12 +43,10 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket _pledgeType = 0; // FIXME: That's wrong on retail sends this whole packet few times (depending how much sub pledges it has) writePledge(packet, 0); - for (SubPledge subPledge : _clan.getAllSubPledges()) { _player.sendPacket(new PledgeReceiveSubPledgeCreated(subPledge, _clan)); } - for (ClanMember m : _members) { if (m.getPledgeType() == 0) @@ -57,7 +55,6 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket } _player.sendPacket(new PledgeShowMemberListAdd(m)); } - // unless this is sent sometimes, the client doesn't recognise the player as the leader _player.sendPacket(new UserInfo(_player)); _player.sendPacket(new ExBrExtraUserInfo(_player)); @@ -67,13 +64,11 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket private void writePledge(PacketWriter packet, int mainOrSubpledge) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(packet); - packet.writeD(mainOrSubpledge); packet.writeD(_clan.getId()); packet.writeD(_pledgeType); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getCrestId()); // crest id .. is used again packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); @@ -81,15 +76,14 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); // 0 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(0); // 0 packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.isAtWar() ? 1 : 0); // new c3 - packet.writeD(0x00); // Territory castle ID + packet.writeD(0); // Territory castle ID packet.writeD(_clan.getSubPledgeMembersCount(_pledgeType)); - for (ClanMember m : _members) { if (m.getPledgeType() != _pledgeType) @@ -107,8 +101,8 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket } else { - packet.writeD(0x01); // no visible effect - packet.writeD(0x01); // packet.writeD(1); + packet.writeD(1); // no visible effect + packet.writeD(1); // packet.writeD(1); } packet.writeD(m.isOnline() ? m.getObjectId() : 0); // objectId = online 0 = offline packet.writeD(m.getSponsor() != 0 ? 1 : 0); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java index 12942534ef..ba7c9a8bfb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java @@ -38,8 +38,8 @@ public class PledgeStatusChanged implements IClientOutgoingPacket packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getAllyId()); packet.writeD(_clan.getAllyCrestId()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java index 9569b28a9d..09d86bd283 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java @@ -43,25 +43,19 @@ public class PrivateStoreListBuy implements IClientOutgoingPacket OutgoingPackets.PRIVATE_STORE_BUY_LIST.writeId(packet); packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(_items.size()); - for (TradeItem item : _items) { packet.writeD(item.getObjectId()); packet.writeD(item.getItem().getId()); packet.writeH(item.getEnchant()); packet.writeQ(item.getCount()); // give max possible sell amount - packet.writeQ(item.getItem().getReferencePrice()); packet.writeH(0); - packet.writeD(item.getItem().getBodyPart()); packet.writeH(item.getItem().getType2()); packet.writeQ(item.getPrice()); // buyers price - packet.writeQ(item.getStoreCount()); // maximum possible tradecount - // T1 packet.writeH(item.getAttackElementType()); packet.writeH(item.getAttackElementPower()); @@ -69,7 +63,6 @@ public class PrivateStoreListBuy implements IClientOutgoingPacket { packet.writeH(item.getElementDefAttr(i)); } - for (int op : item.getEnchantOptions()) { packet.writeH(op); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 87b2a7264b..ae419ca6e1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -43,7 +43,6 @@ public class PrivateStoreListSell implements IClientOutgoingPacket else { OutgoingPackets.PRIVATE_STORE_SELL_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); @@ -54,13 +53,12 @@ public class PrivateStoreListSell implements IClientOutgoingPacket packet.writeD(item.getObjectId()); packet.writeD(item.getItem().getId()); packet.writeQ(item.getCount()); - packet.writeH(0x00); + packet.writeH(0); packet.writeH(item.getEnchant()); packet.writeH(item.getCustomType2()); packet.writeD(item.getItem().getBodyPart()); packet.writeQ(item.getPrice()); // your price packet.writeQ(item.getItem().getReferencePrice()); // store price - // T1 packet.writeH(item.getAttackElementType()); packet.writeH(item.getAttackElementPower()); @@ -68,7 +66,6 @@ public class PrivateStoreListSell implements IClientOutgoingPacket { packet.writeH(item.getElementDefAttr(i)); } - for (int op : item.getEnchantOptions()) { packet.writeH(op); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index fc53ece03c..29a902524c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -46,7 +46,6 @@ public class PrivateStoreManageListBuy implements IClientOutgoingPacket // section 1 packet.writeD(_objId); packet.writeQ(_playerAdena); - // section2 packet.writeD(_itemList.size()); // inventory items for potential buy for (Item item : _itemList) @@ -55,10 +54,9 @@ public class PrivateStoreManageListBuy implements IClientOutgoingPacket packet.writeH(0); // show enchant level as 0, as you can't buy enchanted weapons packet.writeQ(item.getCount()); packet.writeQ(item.getReferencePrice()); - packet.writeH(0x00); + packet.writeH(0); packet.writeD(item.getItem().getBodyPart()); packet.writeH(item.getItem().getType2()); - // T1 packet.writeH(item.getAttackElementType()); packet.writeH(item.getAttackElementPower()); @@ -66,13 +64,11 @@ public class PrivateStoreManageListBuy implements IClientOutgoingPacket { packet.writeH(item.getElementDefAttr(i)); } - for (int op : item.getEnchantOptions()) { packet.writeH(op); } } - // section 3 packet.writeD(_buyList.size()); // count for all items already added for buy for (TradeItem item : _buyList) @@ -81,12 +77,11 @@ public class PrivateStoreManageListBuy implements IClientOutgoingPacket packet.writeH(0); packet.writeQ(item.getCount()); packet.writeQ(item.getItem().getReferencePrice()); - packet.writeH(0x00); + packet.writeH(0); packet.writeD(item.getItem().getBodyPart()); packet.writeH(item.getItem().getType2()); packet.writeQ(item.getPrice()); // your price packet.writeQ(item.getItem().getReferencePrice()); // fixed store price - // T1 packet.writeH(item.getAttackElementType()); packet.writeH(item.getAttackElementPower()); @@ -94,7 +89,6 @@ public class PrivateStoreManageListBuy implements IClientOutgoingPacket { packet.writeH(item.getElementDefAttr(i)); } - for (int op : item.getEnchantOptions()) { packet.writeH(op); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index 0d201062bf..722129c508 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -49,7 +49,6 @@ public class PrivateStoreManageListSell implements IClientOutgoingPacket packet.writeD(_objId); packet.writeD(_packageSale ? 1 : 0); // Package sell packet.writeQ(_playerAdena); - // section2 packet.writeD(_itemList.size()); // for potential sells for (TradeItem item : _itemList) @@ -63,7 +62,6 @@ public class PrivateStoreManageListSell implements IClientOutgoingPacket packet.writeH(item.getCustomType2()); packet.writeD(item.getItem().getBodyPart()); packet.writeQ(item.getPrice()); // store price - // T1 packet.writeH(item.getAttackElementType()); packet.writeH(item.getAttackElementPower()); @@ -71,7 +69,6 @@ public class PrivateStoreManageListSell implements IClientOutgoingPacket { packet.writeH(item.getElementDefAttr(i)); } - for (int op : item.getEnchantOptions()) { packet.writeH(op); @@ -87,11 +84,10 @@ public class PrivateStoreManageListSell implements IClientOutgoingPacket packet.writeQ(item.getCount()); packet.writeH(0); packet.writeH(item.getEnchant()); // enchant level - packet.writeH(0x00); + packet.writeH(0); packet.writeD(item.getItem().getBodyPart()); packet.writeQ(item.getPrice()); // your price packet.writeQ(item.getItem().getReferencePrice()); // store price - // T1 packet.writeH(item.getAttackElementType()); packet.writeH(item.getAttackElementPower()); @@ -99,7 +95,6 @@ public class PrivateStoreManageListSell implements IClientOutgoingPacket { packet.writeH(item.getElementDefAttr(i)); } - for (int op : item.getEnchantOptions()) { packet.writeH(op); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java index 29123c1392..ff5087c1a7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java @@ -68,7 +68,6 @@ public class QuestList implements IClientOutgoingPacket * the 10th but the 6th and 9th are not to be shown at all (not completed, either). * */ - final List quests = _player.getAllActiveQuests(); OutgoingPackets.QUEST_LIST.writeId(packet); packet.writeH(quests.size()); @@ -81,7 +80,6 @@ public class QuestList implements IClientOutgoingPacket packet.writeD(0); continue; } - final int states = qs.getInt("__compltdStateFlags"); if (states > 0) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java index 38af39e88c..5d67413b6f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java @@ -43,9 +43,8 @@ public class RecipeBookItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_BOOK_ITEM_LIST.writeId(packet); - packet.writeD(_isDwarvenCraft ? 0x00 : 0x01); // 0 = Dwarven - 1 = Common + packet.writeD(_isDwarvenCraft ? 0 : 1); // 0 = Dwarven - 1 = Common packet.writeD(_maxMp); - if (_recipes == null) { packet.writeD(0); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java index 429ce8af1e..38b0b8ea4e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java @@ -43,7 +43,6 @@ public class RecipeShopManageList implements IClientOutgoingPacket { _recipes = _seller.getCommonRecipeBook(); } - if (_seller.hasManufactureShop()) { final Iterator it = _seller.getManufactureItems().values().iterator(); @@ -65,8 +64,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket OutgoingPackets.RECIPE_SHOP_MANAGE_LIST.writeId(packet); packet.writeD(_seller.getObjectId()); packet.writeD((int) _seller.getAdena()); - packet.writeD(_isDwarven ? 0x00 : 0x01); - + packet.writeD(_isDwarven ? 0 : 1); if (_recipes == null) { packet.writeD(0); @@ -82,10 +80,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket packet.writeD(count); } } - if (!_seller.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -93,7 +90,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket for (ManufactureItem item : _seller.getManufactureItems().values()) { packet.writeD(item.getRecipeId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeQ(item.getCost()); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java index 558bb2a351..8b3cb42f47 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java @@ -42,7 +42,7 @@ public class RecipeShopSellList implements IClientOutgoingPacket packet.writeQ(_buyer.getAdena()); // Buyer Adena if (!_manufacturer.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -50,7 +50,7 @@ public class RecipeShopSellList implements IClientOutgoingPacket for (ManufactureItem temp : _manufacturer.getManufactureItems().values()) { packet.writeD(temp.getRecipeId()); - packet.writeD(0x00); // unknown + packet.writeD(0); // unknown packet.writeQ(temp.getCost()); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java index 0fea60abd3..0e43f1f423 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java @@ -46,22 +46,17 @@ public class SSQStatus implements IClientOutgoingPacket 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? - int dawnPercent = 0; int duskPercent = 0; - switch (_page) { case 1: { // [ddd cc dd ddd c ddd c] packet.writeD(SevenSigns.getInstance().getCurrentCycle()); - final int currentPeriod = SevenSigns.getInstance().getCurrentPeriod(); - switch (currentPeriod) { case SevenSigns.PERIOD_COMP_RECRUITING: @@ -85,7 +80,6 @@ public class SSQStatus implements IClientOutgoingPacket break; } } - switch (currentPeriod) { case SevenSigns.PERIOD_COMP_RECRUITING: @@ -101,19 +95,15 @@ public class SSQStatus implements IClientOutgoingPacket break; } } - packet.writeC(SevenSigns.getInstance().getPlayerCabal(_objectId)); packet.writeC(SevenSigns.getInstance().getPlayerSeal(_objectId)); - packet.writeQ(SevenSigns.getInstance().getPlayerStoneContrib(_objectId)); // Seal Stones Turned-In packet.writeQ(SevenSigns.getInstance().getPlayerAdenaCollect(_objectId)); // Ancient Adena to Collect - 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); final int duskFestivalScore = SevenSigns.getInstance().getCurrentFestivalScore(SevenSigns.CABAL_DUSK); final double totalStoneScore = duskStoneScore + dawnStoneScore; - /* * Scoring seems to be proportionate to a set base value, so base this on the maximum obtainable score from festivals, which is 500. */ @@ -124,7 +114,6 @@ public class SSQStatus implements IClientOutgoingPacket duskStoneScoreProp = Math.round(((float) duskStoneScore / (float) totalStoneScore) * 500); dawnStoneScoreProp = Math.round(((float) dawnStoneScore / (float) totalStoneScore) * 500); } - final int duskTotalScore = SevenSigns.getInstance().getCurrentScore(SevenSigns.CABAL_DUSK); final int dawnTotalScore = SevenSigns.getInstance().getCurrentScore(SevenSigns.CABAL_DAWN); final int totalOverallScore = duskTotalScore + dawnTotalScore; @@ -133,19 +122,15 @@ public class SSQStatus implements IClientOutgoingPacket dawnPercent = Math.round(((float) dawnTotalScore / totalOverallScore) * 100); duskPercent = Math.round(((float) duskTotalScore / totalOverallScore) * 100); } - /* DUSK */ packet.writeQ(duskStoneScoreProp); // Seal Stone Score packet.writeQ(duskFestivalScore); // Festival Score packet.writeQ(duskTotalScore); // Total Score - packet.writeC(duskPercent); // Dusk % - /* DAWN */ packet.writeQ(dawnStoneScoreProp); // Seal Stone Score packet.writeQ(dawnFestivalScore); // Festival Score packet.writeQ(dawnTotalScore); // Total Score - packet.writeC(dawnPercent); // Dawn % break; } @@ -153,26 +138,20 @@ public class SSQStatus implements IClientOutgoingPacket { // c cc hc [cd (dc (S))] packet.writeH(1); - packet.writeC(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]); - final int duskScore = SevenSignsFestival.getInstance().getHighestScore(SevenSigns.CABAL_DUSK, i); final int dawnScore = SevenSignsFestival.getInstance().getHighestScore(SevenSigns.CABAL_DAWN, i); - // Dusk Score \\ packet.writeQ(duskScore); - StatSet highScoreData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DUSK, i); String[] partyMembers = highScoreData.getString("members").split(","); if (partyMembers != null) { packet.writeC(partyMembers.length); - for (String partyMember : partyMembers) { packet.writeS(partyMember); @@ -182,16 +161,13 @@ public class SSQStatus implements IClientOutgoingPacket { packet.writeC(0); } - // Dawn Score \\ packet.writeQ(dawnScore); - highScoreData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DAWN, i); partyMembers = highScoreData.getString("members").split(","); if (partyMembers != null) { packet.writeC(partyMembers.length); - for (String partyMember : partyMembers) { packet.writeS(partyMember); @@ -210,14 +186,12 @@ public class SSQStatus implements IClientOutgoingPacket 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 - 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)); - if (totalDuskMembers == 0) { if (totalDawnMembers == 0) @@ -252,7 +226,6 @@ public class SSQStatus implements IClientOutgoingPacket // c cc [cc (ccD)] CT 2.3 update packet.writeC(winningCabal); // Overall predicted winner packet.writeC(3); // Total number of seals - for (int i = 1; i < 4; i++) { final int dawnProportion = SevenSigns.getInstance().getSealProportion(i, SevenSigns.CABAL_DAWN); @@ -261,7 +234,6 @@ public class SSQStatus implements IClientOutgoingPacket duskPercent = Math.round((duskProportion / (totalDuskMembers == 0 ? 1 : (float) totalDuskMembers)) * 100); final int sealOwner = SevenSigns.getInstance().getSealOwner(i); packet.writeC(i); - switch (sealOwner) { case SevenSigns.CABAL_NULL: diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 9fcd06bdff..13ef62f55f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -50,9 +50,8 @@ public class SellListProcure implements IClientOutgoingPacket { OutgoingPackets.SELL_LIST_PROCURE.writeId(packet); packet.writeQ(_money); // money - packet.writeD(0x00); // lease ? + packet.writeD(0); // lease ? packet.writeH(_sellList.size()); // list size - for (Entry entry : _sellList.entrySet()) { final Item item = entry.getKey(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java index 60cae76a6e..b21bfacf0c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java @@ -38,12 +38,10 @@ public class SendMacroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MACRO_LIST.writeId(packet); - packet.writeD(_rev); // macro change revision (changes after each macro edition) - packet.writeC(0x00); // unknown + packet.writeC(0); // unknown packet.writeC(_count); // count of Macros packet.writeC(_macro != null ? 1 : 0); // unknown - if (_macro != null) { packet.writeD(_macro.getId()); // Macro ID @@ -51,9 +49,7 @@ public class SendMacroList implements IClientOutgoingPacket packet.writeS(_macro.getDescr()); // Desc packet.writeS(_macro.getAcronym()); // acronym packet.writeC(_macro.getIcon()); // icon - packet.writeC(_macro.getCommands().size()); // count - int i = 1; for (MacroCmd cmd : _macro.getCommands()) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java index 66de6cb8a8..1513a0e3d1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java @@ -69,8 +69,8 @@ public class ServerObjectInfo implements IClientOutgoingPacket packet.writeF(_collisionHeight); packet.writeD((int) (_isAttackable ? _activeChar.getCurrentHp() : 0)); packet.writeD(_isAttackable ? _activeChar.getMaxHp() : 0); - packet.writeD(0x01); // object type - packet.writeD(0x00); // special effects + packet.writeD(1); // object type + packet.writeD(0); // special effects return true; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index 1b3708b964..ab6507f0c7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -53,11 +53,10 @@ public class ShopPreviewList implements IClientOutgoingPacket OutgoingPackets.SHOP_PREVIEW_LIST.writeId(packet); packet.writeC(0xC0); // ? packet.writeC(0x13); // ? - packet.writeC(0x00); // ? - packet.writeC(0x00); // ? + packet.writeC(0); // ? + packet.writeC(0); // ? packet.writeQ(_money); // current money packet.writeD(_listId); - int newlength = 0; for (Product product : _list) { @@ -67,23 +66,20 @@ public class ShopPreviewList implements IClientOutgoingPacket } } packet.writeH(newlength); - for (Product product : _list) { if ((product.getItem().getCrystalType().getLevel() <= _expertise) && product.getItem().isEquipable()) { packet.writeD(product.getItemId()); packet.writeH(product.getItem().getType2()); // item type2 - if (product.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { packet.writeH(product.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } else { - packet.writeH(0x00); // 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(0); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } - packet.writeQ(Config.WEAR_PRICE); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index 36f5356bb1..4cc3d06565 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -33,7 +33,6 @@ public class ShortCutInit implements IClientOutgoingPacket { return; } - _shortCuts = player.getAllShortCuts(); } @@ -46,26 +45,25 @@ public class ShortCutInit implements IClientOutgoingPacket { packet.writeD(sc.getType().ordinal()); packet.writeD(sc.getSlot() + (sc.getPage() * 12)); - switch (sc.getType()) { case ITEM: { packet.writeD(sc.getId()); - packet.writeD(0x01); + packet.writeD(1); packet.writeD(sc.getSharedReuseGroup()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeH(0); + packet.writeH(0); break; } case SKILL: { packet.writeD(sc.getId()); packet.writeD(sc.getLevel()); - packet.writeC(0x00); // C5 - packet.writeD(0x01); // C6 + packet.writeC(0); // C5 + packet.writeD(1); // C6 break; } case ACTION: @@ -74,7 +72,7 @@ public class ShortCutInit implements IClientOutgoingPacket case BOOKMARK: { packet.writeD(sc.getId()); - packet.writeD(0x01); // C6 + packet.writeD(1); // C6 } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java index 6a0906771c..dac2bd8488 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java @@ -46,16 +46,16 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeD(_shortcut.getId()); packet.writeD(_shortcut.getCharacterType()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeD(0x00); // unknown - packet.writeD(0x00); // unknown - packet.writeD(0x00); // item augment id + packet.writeD(0); // unknown + packet.writeD(0); // unknown + packet.writeD(0); // item augment id break; } case SKILL: { packet.writeD(_shortcut.getId()); packet.writeD(_shortcut.getLevel()); - packet.writeC(0x00); // C5 + packet.writeC(0); // C5 packet.writeD(_shortcut.getCharacterType()); break; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java index 44ffdf4e01..7d0069def6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = ca
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Attackers Clans?
* d = Number of Attackers Clans
* { //repeats
@@ -67,13 +67,12 @@ public class SiegeAttackerList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(packet); - if (_castle != null) { packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _castle.getSiege().getAttackerClans().size(); if (size > 0) { @@ -87,12 +86,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -101,16 +99,16 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } else { packet.writeD(_hall.getId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final Collection attackers = _hall.getSiege().getAttackerClans(); final int size = attackers.size(); if (size > 0) @@ -124,12 +122,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -138,8 +135,8 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index edb7e824aa..a3adecc0a6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -28,9 +28,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = 0xcb
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Defending Clans?
* d = Number of Defending Clans
* { //repeats
@@ -60,9 +60,9 @@ public class SiegeDefenderList implements IClientOutgoingPacket { OutgoingPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(packet); packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _castle.getSiege().getDefenderClans().size() + _castle.getSiege().getDefenderWaitingClans().size(); if (size > 0) { @@ -77,32 +77,31 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) switch (siegeclan.getType()) { case OWNER: { - packet.writeD(0x01); // owner + packet.writeD(1); // owner break; } case DEFENDER_PENDING: { - packet.writeD(0x02); // approved + packet.writeD(2); // approved break; } case DEFENDER: { - packet.writeD(0x03); // waiting approved + packet.writeD(3); // waiting approved break; } default: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -118,8 +117,8 @@ public class SiegeDefenderList implements IClientOutgoingPacket packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) - packet.writeD(0x02); // waiting approval + 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 @@ -128,8 +127,8 @@ public class SiegeDefenderList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 62cceeee49..c78f0085db 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -71,9 +71,8 @@ public class SiegeInfo implements IClientOutgoingPacket if (_castle != null) { packet.writeD(_castle.getResidenceId()); - final int ownerId = _castle.getOwnerId(); - packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 0x01 : 0x00); + packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0); packet.writeD(ownerId); if (ownerId > 0) { @@ -97,7 +96,6 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { @@ -105,7 +103,7 @@ public class SiegeInfo implements IClientOutgoingPacket cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis()); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(Config.SIEGE_HOUR_LIST.size()); for (int hour : Config.SIEGE_HOUR_LIST) { @@ -116,15 +114,14 @@ public class SiegeInfo implements IClientOutgoingPacket else { packet.writeD((int) (_castle.getSiegeDate().getTimeInMillis() / 1000)); - packet.writeD(0x00); + packet.writeD(0); } } else { packet.writeD(_hall.getId()); - final int ownerId = _hall.getOwnerId(); - packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 0x01 : 0x00); + packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0); packet.writeD(ownerId); if (ownerId > 0) { @@ -148,10 +145,9 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Calendar.getInstance().getTimeInMillis() / 1000)); packet.writeD((int) ((CHSiegeManager.getInstance().getSiegableHall(_hall.getId()).getNextSiegeTime()) / 1000)); - packet.writeD(0x00); // number of choices? + packet.writeD(0); // number of choices? } return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java index 329d02cfa9..f482f8541f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java @@ -54,7 +54,6 @@ public class SkillList implements IClientOutgoingPacket { OutgoingPackets.SKILL_LIST.writeId(packet); packet.writeD(_skills.size()); - for (Skill temp : _skills) { packet.writeD(temp.passive ? 1 : 0); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index de54232b51..ed4615c403 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -41,10 +41,9 @@ public class Snoop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SNOOP.writeId(packet); - packet.writeD(_convoId); packet.writeS(_name); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_type.getClientId()); packet.writeS(_speaker); packet.writeS(_msg); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java index aeff5f3aaa..620185f2ef 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java @@ -37,15 +37,6 @@ import org.l2jmobius.gameserver.network.PacketLogger; public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket { - public static final int PRIVATE = 1; - public static final int CLAN = 2; - public static final int CASTLE = 3; // not sure - public static final int FREIGHT = 4; // not sure - - private long _playerAdena; - private List _objects = new ArrayList<>(); - private int _whType; - public enum WarehouseListType { WEAPON, @@ -66,6 +57,11 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket ALL } + public static final int PRIVATE = 1; + public static final int CLAN = 2; + public static final int CASTLE = 3; // not sure + public static final int FREIGHT = 4; // not sure + /** sort order A..Z */ public static final byte A2Z = 1; /** sort order Z..A */ @@ -81,6 +77,10 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket /** Maximum Items to put into list */ public static final int MAX_SORT_LIST_ITEMS = 300; + private long _playerAdena; + private List _objects = new ArrayList<>(); + private int _whType; + /** * This will instantiate the Warehouselist the Player asked for * @param player who calls for the itemlist @@ -98,7 +98,6 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket PacketLogger.warning("Error while sending withdraw request to: " + player.getName()); return; } - switch (itemtype) { case WEAPON: @@ -168,7 +167,6 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket break; } } - try { switch (sortorder) @@ -302,7 +300,6 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket private static class WarehouseItemRecipeComparator implements Comparator { private int order = 0; - private RecipeData rd = null; protected WarehouseItemRecipeComparator(int sortOrder) @@ -336,7 +333,6 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket { return (order == A2Z ? Z2A : A2Z); } - final Integer i1 = rp1.getLevel(); final Integer i2 = rp2.getLevel(); return (order == A2Z ? i1.compareTo(i2) : i2.compareTo(i1)); @@ -346,7 +342,6 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket return 0; } } - final String s1 = o1.getItemName(); final String s2 = o2.getItemName(); return (order == A2Z ? s1.compareTo(s2) : s2.compareTo(s1)); @@ -711,14 +706,12 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.WAREHOUSE_WITHDRAW_LIST.writeId(packet); - /* * 0x01-Private Warehouse 0x02-Clan Warehouse 0x03-Castle Warehouse 0x04-Warehouse */ packet.writeH(_whType); packet.writeQ(_playerAdena); packet.writeH(_objects.size()); - for (WarehouseItem item : _objects) { packet.writeH(item.getItem().getType1()); @@ -729,7 +722,7 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket packet.writeH(item.getCustomType1()); packet.writeD(item.getItem().getBodyPart()); packet.writeH(item.getEnchantLevel()); - packet.writeH(0x00); + packet.writeH(0); packet.writeH(item.getCustomType2()); packet.writeD(item.getObjectId()); if (item.isAugmented()) @@ -739,19 +732,16 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket } else { - packet.writeQ(0x00); + packet.writeQ(0); } - packet.writeH(item.getAttackElementType()); packet.writeH(item.getAttackElementPower()); for (byte i = 0; i < 6; i++) { packet.writeH(item.getElementDefAttr(i)); } - packet.writeD(item.getMana()); packet.writeD(item.getTime()); - for (int op : item.getEnchantOptions()) { packet.writeH(op); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index c2fedd99c0..f2b0fadabd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -33,16 +33,15 @@ public class SpawnItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPAWN_ITEM.writeId(packet); - packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeD(_item.isStackable() ? 0x01 : 0x00); + packet.writeD(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 return true; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index 245cf97793..417f278a96 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -33,16 +33,13 @@ public class StatusUpdate implements IClientOutgoingPacket public static final int INT = 0x06; public static final int WIT = 0x07; public static final int MEN = 0x08; - public static final int CUR_HP = 0x09; public static final int MAX_HP = 0x0a; public static final int CUR_MP = 0x0b; public static final int MAX_MP = 0x0c; - public static final int SP = 0x0d; public static final int CUR_LOAD = 0x0e; public static final int MAX_LOAD = 0x0f; - public static final int P_ATK = 0x11; public static final int ATK_SPD = 0x12; public static final int P_DEF = 0x13; @@ -54,7 +51,6 @@ public class StatusUpdate implements IClientOutgoingPacket public static final int M_DEF = 0x19; public static final int PVP_FLAG = 0x1a; public static final int KARMA = 0x1b; - public static final int CUR_CP = 0x21; public static final int MAX_CP = 0x22; @@ -110,7 +106,6 @@ public class StatusUpdate implements IClientOutgoingPacket OutgoingPackets.STATUS_UPDATE.writeId(packet); packet.writeD(_objectId); packet.writeD(_attributes.size()); - for (Attribute temp : _attributes) { packet.writeD(temp.id); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 0e0cb96669..2e7a839cde 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -150,7 +150,6 @@ public class SystemMessage implements IClientOutgoingPacket _smId.setParamCount(_paramIndex + 1); PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } - _params[_paramIndex++] = param; } @@ -255,7 +254,6 @@ public class SystemMessage implements IClientOutgoingPacket { return addString(item.getName()); } - append(new SMParam(TYPE_ITEM_NAME, id)); return this; } @@ -342,7 +340,6 @@ public class SystemMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SYSTEM_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -354,15 +351,13 @@ public class SystemMessage implements IClientOutgoingPacket { params[i] = _params[i].getValue(); } - packet.writeD(SystemMessageId.S1_2.getId()); - packet.writeD(0x01); + packet.writeD(1); packet.writeD(TYPE_TEXT); packet.writeS(sml.getLocalisation(params)); return true; } } - packet.writeD(_smId.getId()); packet.writeD(_params.length); for (SMParam param : _params) @@ -372,7 +367,6 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } - packet.writeD(param.getType()); switch (param.getType()) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java index a235ce0bfb..d357efbb0e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java @@ -52,7 +52,7 @@ public class TargetSelected implements IClientOutgoingPacket packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java index adef8a9132..3d7208c06f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java @@ -46,7 +46,7 @@ public class TargetUnselected implements IClientOutgoingPacket packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? return true; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index 7ac753ba7b..461d458678 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -41,12 +41,11 @@ public class TeleportToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TELEPORT_TO_LOCATION.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // Fade 0, Instant 1. + packet.writeD(0); // Fade 0, Instant 1. packet.writeD(_heading); return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java index 0d1b782ab7..aca6635010 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java @@ -36,7 +36,6 @@ public class TradeOtherAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_OTHER_ADD.writeId(packet); - packet.writeH(1); // item count packet.writeH(_item.getItem().getType1()); // item type1 packet.writeD(_item.getObjectId()); @@ -44,12 +43,10 @@ public class TradeOtherAdd implements IClientOutgoingPacket packet.writeQ(_item.getCount()); packet.writeH(_item.getItem().getType2()); // item type2 packet.writeH(_item.getCustomType1()); - packet.writeD(_item.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand packet.writeH(_item.getEnchant()); // enchant level - packet.writeH(0x00); + packet.writeH(0); packet.writeH(_item.getCustomType2()); - // T1 packet.writeH(_item.getAttackElementType()); packet.writeH(_item.getAttackElementPower()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java index 17f234b2ea..0a73510273 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java @@ -36,7 +36,6 @@ public class TradeOwnAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_OWN_ADD.writeId(packet); - packet.writeH(1); // items added count packet.writeH(_item.getItem().getType1()); // item type1 packet.writeD(_item.getObjectId()); @@ -44,12 +43,10 @@ public class TradeOwnAdd implements IClientOutgoingPacket packet.writeQ(_item.getCount()); packet.writeH(_item.getItem().getType2()); // item type2 packet.writeH(_item.getCustomType1()); - packet.writeD(_item.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand packet.writeH(_item.getEnchant()); // enchant level - packet.writeH(0x00); + packet.writeH(0); packet.writeH(_item.getCustomType2()); - // T1 packet.writeH(_item.getAttackElementType()); packet.writeH(_item.getAttackElementPower()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c74e7b494a..09f3efb6a4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -43,7 +43,6 @@ public class TradeStart implements IClientOutgoingPacket { return false; } - OutgoingPackets.TRADE_START.writeId(packet); packet.writeD(_player.getActiveTradeList().getPartner().getObjectId()); packet.writeH(_itemList.size()); @@ -54,13 +53,11 @@ public class TradeStart implements IClientOutgoingPacket packet.writeD(item.getId()); packet.writeQ(item.getCount()); packet.writeH(item.getItem().getType2()); // item type2 - packet.writeH(0x00); // ? - + 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.getEnchantLevel()); // enchant level - packet.writeH(0x00); + packet.writeH(0); packet.writeH(item.getCustomType2()); - // T1 packet.writeH(item.getAttackElementType()); packet.writeH(item.getAttackElementPower()); @@ -68,7 +65,6 @@ public class TradeStart implements IClientOutgoingPacket { packet.writeH(item.getElementDefAttr(i)); } - for (int op : item.getEnchantOptions()) { packet.writeH(op); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index f23934ba66..f167e53566 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -33,7 +33,6 @@ public class UserInfo implements IClientOutgoingPacket private int _territoryId; private final boolean _isDisguised; private int _airShipHelm; - private final int _runSpd; private final int _walkSpd; private final int _swimRunSpd; @@ -45,7 +44,6 @@ public class UserInfo implements IClientOutgoingPacket public UserInfo(Player player) { _player = player; - final int _territoryId = TerritoryWarManager.getInstance().getRegisteredTerritoryId(player); _relation = _player.isClanLeader() ? 0x40 : 0; if (_player.getSiegeState() == 1) @@ -72,7 +70,6 @@ public class UserInfo implements IClientOutgoingPacket { _airShipHelm = 0; } - _moveMultiplier = player.getMovementSpeedMultiplier(); _runSpd = (int) Math.round(player.getRunSpeed() / _moveMultiplier); _walkSpd = (int) Math.round(player.getWalkSpeed() / _moveMultiplier); @@ -86,19 +83,15 @@ public class UserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.USER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); packet.writeD(_player.getVehicle() != null ? _player.getVehicle().getObjectId() : 0); - packet.writeD(_player.getObjectId()); packet.writeS(_player.getAppearance().getVisibleName()); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); - packet.writeD(_player.getBaseClass()); - packet.writeD(_player.getLevel()); packet.writeQ(_player.getExp()); packet.writeD(_player.getSTR()); @@ -114,7 +107,6 @@ public class UserInfo implements IClientOutgoingPacket packet.writeD((int) _player.getSp()); packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); - packet.writeD(_player.getActiveWeaponItem() != null ? 40 : 20); // 20 no weapon, 40 weapon equipped for (int slot : getPaperdollOrder()) @@ -141,15 +133,11 @@ public class UserInfo implements IClientOutgoingPacket packet.writeD(_player.getAccuracy()); packet.writeD(_player.getCriticalHit(null, null)); packet.writeD((int) _player.getMAtk(null, null)); - packet.writeD(_player.getMAtkSpd()); packet.writeD((int) _player.getPAtkSpd()); - packet.writeD((int) _player.getMDef(null, null)); - packet.writeD(_player.getPvpFlag()); packet.writeD(_player.getKarma()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -160,10 +148,8 @@ public class UserInfo implements IClientOutgoingPacket packet.writeD(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_player.getAttackSpeedMultiplier()); - packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); - packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); @@ -196,48 +182,37 @@ public class UserInfo implements IClientOutgoingPacket } packet.writeC(_player.isInPartyMatchRoom() ? 1 : 0); - packet.writeD(_player.isInvisible() ? _player.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask() : _player.getAbnormalVisualEffects()); packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); - packet.writeD(_player.getClanPrivileges().getBitmask()); - packet.writeH(_player.getRecomLeft()); // c2 recommendations remaining packet.writeH(_player.getRecomHave()); // c2 recommendations received packet.writeD(_player.getMountNpcId() > 0 ? _player.getMountNpcId() + 1000000 : 0); packet.writeH(_player.getInventoryLimit()); - packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); packet.writeC(_player.isMounted() || (_airShipHelm != 0) ? 0 : _player.getEnchantEffect()); - packet.writeC(_player.getTeam().getId()); - packet.writeD(_player.getClanCrestLargeId()); - packet.writeC(_player.isNoble() ? 1 : 0); // 0x01: symbol on char menu ctrl+I - packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // 0x01: Hero Aura + packet.writeC(_player.isNoble() ? 1 : 0); // 1: symbol on char menu ctrl+I + packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // 1: Hero Aura 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 + packet.writeD(_player.getAppearance().getNameColor()); - // new c5 - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window packet.writeD(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); - packet.writeD(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - // T1 Starts packet.writeD(_player.getTransformationDisplayId()); - final byte attackAttribute = _player.getAttackElement(); packet.writeH(attackAttribute); packet.writeH(_player.getAttackElementValue(attackAttribute)); @@ -247,16 +222,14 @@ public class UserInfo implements IClientOutgoingPacket packet.writeH(_player.getDefenseElementValue(Elementals.EARTH)); packet.writeH(_player.getDefenseElementValue(Elementals.HOLY)); packet.writeH(_player.getDefenseElementValue(Elementals.DARK)); - packet.writeD(_player.getAgathionId()); - // T2 Starts packet.writeD(_player.getFame()); // Fame packet.writeD(_player.isMinimapAllowed() ? 1 : 0); // Minimap on Hellbound packet.writeD(_player.getVitalityPoints()); // Vitality Points packet.writeD(_player.getAbnormalVisualEffectSpecial()); packet.writeD(_territoryId); // CT2.3 - packet.writeD((_isDisguised ? 0x01 : 0x00)); // CT2.3 + packet.writeD((_isDisguised ? 1 : 0)); // CT2.3 packet.writeD(_territoryId); // CT2.3 return true; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 770813c5a8..80f6f85825 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -30,6 +30,7 @@ public class WareHouseDepositList implements IClientOutgoingPacket public static final int CLAN = 4; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private final long _playerAdena; private final List _items = new ArrayList<>(); /** @@ -46,7 +47,6 @@ public class WareHouseDepositList implements IClientOutgoingPacket { _whType = type; _playerAdena = player.getAdena(); - final boolean isPrivate = _whType == PRIVATE; for (Item temp : player.getInventory().getAvailableItems(true, isPrivate, false)) { @@ -64,7 +64,6 @@ public class WareHouseDepositList implements IClientOutgoingPacket packet.writeH(_whType); packet.writeQ(_playerAdena); packet.writeH(_items.size()); - for (Item item : _items) { packet.writeH(item.getItem().getType1()); @@ -75,7 +74,7 @@ public class WareHouseDepositList implements IClientOutgoingPacket packet.writeH(item.getCustomType1()); packet.writeD(item.getItem().getBodyPart()); packet.writeH(item.getEnchantLevel()); - packet.writeH(0x00); + packet.writeH(0); packet.writeH(item.getCustomType2()); packet.writeD(item.getObjectId()); if (item.isAugmented()) @@ -85,20 +84,17 @@ public class WareHouseDepositList implements IClientOutgoingPacket } else { - packet.writeQ(0x00); + packet.writeQ(0); } - packet.writeH(item.getAttackElementType()); packet.writeH(item.getAttackElementPower()); for (byte i = 0; i < 6; i++) { packet.writeH(item.getElementDefAttr(i)); } - packet.writeD(item.getMana()); // T2 packet.writeD(item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1); - for (int op : item.getEnchantOptions()) { packet.writeH(op); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 3f7b5b02b4..ad5240175c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -30,6 +30,7 @@ public class WareHouseWithdrawalList implements IClientOutgoingPacket public static final int CLAN = 4; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private long _playerAdena; private Collection _items; /** @@ -49,7 +50,6 @@ public class WareHouseWithdrawalList implements IClientOutgoingPacket PacketLogger.warning("Error while sending withdraw request to: " + player.getName()); return; } - _playerAdena = player.getAdena(); _items = player.getActiveWarehouse().getItems(); _whType = type; @@ -62,7 +62,6 @@ public class WareHouseWithdrawalList implements IClientOutgoingPacket packet.writeH(_whType); packet.writeQ(_playerAdena); packet.writeH(_items.size()); - for (Item item : _items) { packet.writeH(item.getItem().getType1()); @@ -73,7 +72,7 @@ public class WareHouseWithdrawalList implements IClientOutgoingPacket packet.writeH(item.getCustomType1()); packet.writeD(item.getItem().getBodyPart()); packet.writeH(item.getEnchantLevel()); - packet.writeH(0x00); + packet.writeH(0); packet.writeH(item.getCustomType2()); packet.writeD(item.getObjectId()); if (item.isAugmented()) @@ -83,20 +82,17 @@ public class WareHouseWithdrawalList implements IClientOutgoingPacket } else { - packet.writeQ(0x00); + packet.writeQ(0); } - packet.writeH(item.getAttackElementType()); packet.writeH(item.getAttackElementPower()); for (byte i = 0; i < 6; i++) { packet.writeH(item.getElementDefAttr(i)); } - packet.writeD(item.getMana()); // T2 packet.writeD(item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1); - for (int op : item.getEnchantOptions()) { packet.writeH(op); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java index 1d59c6d002..e7654ed911 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java @@ -60,7 +60,7 @@ public class AccountKicked implements IOutgoingPacket { OutgoingPackets.ACCOUNT_KICKED.writeId(packet); packet.writeD(_reason.getCode()); - return true; } } + diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 2e3a1f6163..1fe813e393 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: response + * Format: d d: response */ public class GGAuth implements IOutgoingPacket { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/network/serverpackets/Init.java index 4b3f71f30e..d725f45ca2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/network/serverpackets/Init.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/network/serverpackets/Init.java @@ -52,7 +52,6 @@ public class Init implements IOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.INIT.writeId(packet); - packet.writeD(_sessionId); // session id packet.writeD(0x0000c621); // protocol revision diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index 8c534554a8..f4dcd22b00 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: the failure reason + * Format: d d: the failure reason */ public class LoginFail implements IOutgoingPacket { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/BaseRecievePacket.java index c682cb741d..a6ed15ce32 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/BaseRecievePacket.java @@ -73,7 +73,7 @@ public abstract class BaseRecievePacket try { result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE); - result = result.substring(0, result.indexOf(0x00)); + result = result.substring(0, result.indexOf(0)); _off += (result.length() * 2) + 2; } catch (Exception e) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/BaseSendablePacket.java index a9d918de4c..8fa8491cbf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/network/BaseSendablePacket.java @@ -117,16 +117,16 @@ public abstract class BaseSendablePacket public byte[] getBytes() { // if (this instanceof Init) - // writeD(0x00); // reserve for XOR initial key + // writeD(0); // reserve for XOR initial key - writeD(0x00); // reserve for checksum + writeD(0); // reserve for checksum final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++) { - writeC(0x00); + writeC(0); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 235a80e29c..0e765ebabd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.Broadcast; import org.l2jmobius.gameserver.util.Util; /** - * Fromat:(ch) dddddc + * Format:(ch) dddddc * @author -Wooden- */ public class RequestExMagicSkillUseGround implements IClientIncomingPacket diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 1b8ddb2042..bec794bef3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -44,7 +44,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; } @@ -60,7 +59,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; setHtml(html); } @@ -77,13 +75,11 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } - if (!html.contains(""; return; } - _html = html; } @@ -96,7 +92,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } - setHtml(content); return true; } @@ -138,12 +133,10 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { player.clearHtmlActions(getScope()); } - if (_disabledValidation) { return; } - if (player != null) { Util.buildHtmlActionCache(player, getScope(), _npcObjId, _html); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 271b496ea9..660f96f592 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -83,7 +83,7 @@ public abstract class AbstractItemPacket implements IClientOutgoingPacket } else { - packet.writeH(0x00); + packet.writeH(0); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java index cb7d92d06b..f8411c697f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractNpcInfo.java @@ -51,7 +51,6 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket protected final int _flyRunSpd; protected final int _flyWalkSpd; protected double _moveMultiplier; - protected int _rhand; protected int _lhand; protected int _chest; @@ -115,7 +114,6 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket _collisionHeight = cha.getTemplate().getFCollisionHeight(); // On every subclass _collisionRadius = cha.getTemplate().getFCollisionRadius(); // On every subclass _isAttackable = cha.isAutoAttackable(attacker); - // npc crest of owning clan/ally of castle if (cha.isNpc() && cha.isInsideZone(ZoneId.TOWN) && (Config.SHOW_CREST_WITHOUT_QUEST || cha.getCastle().getShowNpcCrest()) && (cha.getCastle().getOwnerId() != 0)) { @@ -133,7 +131,6 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket } } } - _displayEffect = cha.getDisplayEffect(); } @@ -148,7 +145,7 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); packet.writeD(_runSpd); @@ -230,30 +227,26 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket _title = (Config.CHAMP_TITLE); // On every subclass } packet.writeS(_title); - packet.writeD(0x00); // Title color 0=client default - packet.writeD(0x00); // pvp flag - packet.writeD(0x00); // karma - + packet.writeD(0); // Title color 0=client default + packet.writeD(0); // pvp flag + packet.writeD(0); // karma packet.writeD(_npc.isInvisible() ? _npc.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask() : _npc.getAbnormalVisualEffects()); packet.writeD(_clanId); // clan id packet.writeD(_clanCrest); // crest id packet.writeD(_allyId); // ally id packet.writeD(_allyCrest); // all crest - packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); // C2 packet.writeC(_npc.getTeam().getId()); - packet.writeF(_collisionRadius); packet.writeF(_collisionHeight); packet.writeD(_enchantEffect); // C4 packet.writeD(_npc.isFlying() ? 1 : 0); // C6 - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_npc.getColorEffect()); // CT1.5 Pet form and skills, Color effect - packet.writeC(_npc.isTargetable() ? 0x01 : 0x00); - packet.writeC(_npc.isShowName() ? 0x01 : 0x00); + packet.writeC(_npc.isTargetable() ? 1 : 0); + packet.writeC(_npc.isShowName() ? 1 : 0); packet.writeD(_npc.getAbnormalVisualEffectSpecial()); packet.writeD(_displayEffect); - return true; } } @@ -265,7 +258,6 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket public TrapInfo(Trap cha, Creature attacker) { super(cha, (attacker != null) && attacker.canOverrideCond(PlayerCondOverride.SEE_ALL_PLAYERS)); - _trap = cha; _displayId = cha.getTemplate().getDisplayId(); _isAttackable = cha.isAutoAttackable(attacker); @@ -291,7 +283,7 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); packet.writeD(_runSpd); @@ -318,30 +310,25 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket packet.writeS(_name); packet.writeD(-1); // High Five NPCString ID packet.writeS(_title); - packet.writeD(0x00); // title color 0 = client default - + packet.writeD(0); // title color 0 = client default packet.writeD(_trap.getPvpFlag()); packet.writeD(_trap.getKarma()); - packet.writeD(_trap.isInvisible() ? _trap.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask() : _trap.getAbnormalVisualEffects()); - packet.writeD(0x00); // clan id - packet.writeD(0x00); // crest id - packet.writeD(0000); // C2 - packet.writeD(0000); // C2 - packet.writeC(0000); // C2 - + packet.writeD(0); // clan id + packet.writeD(0); // crest id + packet.writeD(0); // C2 + packet.writeD(0); // C2 + packet.writeC(0); // C2 packet.writeC(_trap.getTeam().getId()); - packet.writeF(_collisionRadius); packet.writeF(_collisionHeight); - packet.writeD(0x00); // C4 - packet.writeD(0x00); // C6 - packet.writeD(0x00); + packet.writeD(0); // C4 + packet.writeD(0); // C6 + packet.writeD(0); packet.writeD(0); // CT1.5 Pet form and skills - packet.writeC(0x01); - packet.writeC(0x01); - packet.writeD(0x00); - + packet.writeC(1); + packet.writeC(1); + packet.writeD(0); return true; } } @@ -384,7 +371,7 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); packet.writeD(_runSpd); @@ -402,8 +389,8 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket packet.writeD(_rhand); // right hand weapon packet.writeD(_chest); packet.writeD(_lhand); // left hand weapon - packet.writeC(0x01); // name above char 1=true ... ?? - packet.writeC(0x01); // always running 1=running 0=walking + packet.writeC(1); // name above char 1=true ... ?? + packet.writeC(1); // always running 1=running 0=walking packet.writeC(_summon.isInCombat() ? 1 : 0); packet.writeC(_summon.isAlikeDead() ? 1 : 0); packet.writeC(_isSummoned ? 2 : _value); // invisible ?? 0=false 1=true 2=summoned (only works if model has a summon animation) @@ -411,31 +398,25 @@ public abstract class AbstractNpcInfo implements IClientOutgoingPacket packet.writeS(_name); packet.writeD(-1); // High Five NPCString ID packet.writeS(_title); - packet.writeD(0x01); // Title color 0=client default - + packet.writeD(1); // Title color 0=client default packet.writeD(_summon.getPvpFlag()); packet.writeD(_summon.getKarma()); - packet.writeD(_gmSeeInvis && _summon.isInvisible() ? _summon.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask() : _summon.getAbnormalVisualEffects()); - - packet.writeD(0x00); // clan id - packet.writeD(0x00); // crest id - packet.writeD(0x00); // C2 - packet.writeD(0x00); // C2 + packet.writeD(0); // clan id + packet.writeD(0); // crest id + packet.writeD(0); // C2 + packet.writeD(0); // C2 packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); // C2 - packet.writeC(_summon.getTeam().getId()); - packet.writeF(_collisionRadius); packet.writeF(_collisionHeight); packet.writeD(_enchantEffect); // C4 - packet.writeD(0x00); // C6 - packet.writeD(0x00); + packet.writeD(0); // C6 + packet.writeD(0); packet.writeD(_form); // CT1.5 Pet form and skills - packet.writeC(0x01); - packet.writeC(0x01); + packet.writeC(1); + packet.writeC(1); packet.writeD(_summon.getAbnormalVisualEffectSpecial()); - return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java index f8153897d9..8ac604bac5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java @@ -70,11 +70,9 @@ public class AcquireSkillList implements IClientOutgoingPacket { return false; } - OutgoingPackets.ACQUIRE_SKILL_LIST.writeId(packet); packet.writeD(_skillType.ordinal()); packet.writeD(_skills.size()); - for (Skill temp : _skills) { packet.writeD(temp.id); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java index 6cb71fc985..4683fb30f0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java @@ -44,7 +44,6 @@ public class AllianceInfo implements IClientOutgoingPacket _name = leader.getAllyName(); _leaderC = leader.getName(); _leaderP = leader.getLeaderName(); - final Collection allies = ClanTable.getInstance().getClanAllies(allianceId); _allies = new ClanInfo[allies.size()]; int idx = 0; @@ -57,7 +56,6 @@ public class AllianceInfo implements IClientOutgoingPacket total += ci.getTotal(); online += ci.getOnline(); } - _total = total; _online = online; } @@ -66,18 +64,16 @@ public class AllianceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_INFO.writeId(packet); - packet.writeS(_name); packet.writeD(_total); packet.writeD(_online); packet.writeS(_leaderC); packet.writeS(_leaderP); - packet.writeD(_allies.length); for (ClanInfo aci : _allies) { packet.writeS(aci.getClan().getName()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(aci.getClan().getLevel()); packet.writeS(aci.getClan().getLeaderName()); packet.writeD(aci.getTotal()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 0824b21a94..7458588987 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -96,23 +96,19 @@ public class Attack implements IClientOutgoingPacket { final Iterator it = _hits.iterator(); OutgoingPackets.ATTACK.writeId(packet); - packet.writeD(_attackerObjId); writeHit(packet, it.next()); packet.writeD(_attackerLoc.getX()); packet.writeD(_attackerLoc.getY()); packet.writeD(_attackerLoc.getZ()); - packet.writeH(_hits.size() - 1); while (it.hasNext()) { writeHit(packet, it.next()); } - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); - return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index 58d6e99d40..0882d902b8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -43,12 +43,10 @@ public class BuyList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - packet.writeD(0x00); + packet.writeD(0); packet.writeQ(_money); // current money packet.writeD(_listId); - packet.writeH(_list.size()); - for (Product product : _list) { if ((product.getCount() > 0) || !product.hasLimitedStock()) @@ -59,24 +57,23 @@ public class BuyList implements IClientOutgoingPacket packet.writeQ(product.getCount() < 0 ? 0 : product.getCount()); packet.writeH(product.getItem().getType2()); packet.writeH(product.getItem().getType1()); // Custom Type 1 - packet.writeH(0x00); // isEquipped + packet.writeH(0); // isEquipped packet.writeD(product.getItem().getBodyPart()); // Body Part packet.writeH(product.getItem().getDefaultEnchantLevel()); // Enchant - packet.writeH(0x00); // Custom Type - packet.writeD(0x00); // Augment + packet.writeH(0); // Custom Type + packet.writeD(0); // Augment packet.writeD(-1); // Mana packet.writeD(-9999); // Time - packet.writeH(0x00); // Element Type - packet.writeH(0x00); // Element Power + packet.writeH(0); // Element Type + packet.writeH(0); // Element Power for (byte i = 0; i < 6; i++) { - packet.writeH(0x00); + packet.writeH(0); } // Enchant Effects - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); if ((product.getItemId() >= 3960) && (product.getItemId() <= 4026)) { packet.writeQ((long) (product.getPrice() * Config.RATE_SIEGE_GUARDS_PRICE * (1 + _taxRate))); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index 6c9c62a183..b9e260b1e9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -50,10 +50,8 @@ public class BuyListSeed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BUY_LIST_SEED.writeId(packet); - packet.writeQ(_money); // current money packet.writeD(_manorId); // manor id - if (!_list.isEmpty()) { packet.writeH(_list.size()); // list length @@ -61,34 +59,34 @@ public class BuyListSeed implements IClientOutgoingPacket { packet.writeD(s.getId()); packet.writeD(s.getId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeQ(s.getAmount()); // item count - packet.writeH(0x05); // Custom Type 2 - packet.writeH(0x00); // Custom Type 1 - packet.writeH(0x00); // Equipped - packet.writeD(0x00); // Body Part - packet.writeH(0x00); // Enchant - packet.writeH(0x00); // Custom Type - packet.writeD(0x00); // Augment + packet.writeH(5); // Custom Type 2 + packet.writeH(0); // Custom Type 1 + packet.writeH(0); // Equipped + packet.writeD(0); // Body Part + packet.writeH(0); // Enchant + packet.writeH(0); // Custom Type + packet.writeD(0); // Augment packet.writeD(-1); // Mana packet.writeD(-9999); // Time - packet.writeH(0x00); // Element Type - packet.writeH(0x00); // Element Power + packet.writeH(0); // Element Type + packet.writeH(0); // Element Power for (byte i = 0; i < 6; i++) { - packet.writeH(0x00); + packet.writeH(0); } // Enchant Effects - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); packet.writeQ(s.getPrice()); // price } _list.clear(); } else { - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java index b7814157c6..f3dc872dca 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java @@ -32,7 +32,7 @@ public class CSShowComBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - packet.writeC(0x01); // c4 1 to show community 00 to hide + packet.writeC(1); // c4 1 to show community 00 to hide packet.writeB(_html); return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index d525bf2438..fbe5e39e2e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -22,17 +22,17 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ChangeWaitType implements IClientOutgoingPacket { + public static final int WT_SITTING = 0; + public static final int WT_STANDING = 1; + public static final int WT_START_FAKEDEATH = 2; + public static final int WT_STOP_FAKEDEATH = 3; + private final int _objectId; private final int _moveType; private final int _x; private final int _y; private final int _z; - public static final int WT_SITTING = 0; - public static final int WT_STANDING = 1; - public static final int WT_START_FAKEDEATH = 2; - public static final int WT_STOP_FAKEDEATH = 3; - public ChangeWaitType(Creature creature, int newMoveType) { _objectId = creature.getObjectId(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index 401d0b400c..067d878cb1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -29,7 +29,6 @@ public class CharCreateFail implements IClientOutgoingPacket public static final int REASON_CREATE_NOT_ALLOWED = 0x05; // "Characters cannot be created from this server." public static final int REASON_CHOOSE_ANOTHER_SVR = 0x06; // "Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please // choose another server." - private final int _error; public CharCreateFail(int errorCode) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index c2ba4f3959..768617e558 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -31,7 +31,7 @@ public class CharCreateOk implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_SUCCESS.writeId(packet); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index 0db6ffa70a..5a51ab105d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -21,9 +21,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharDeleteFail implements IClientOutgoingPacket { - public static final int REASON_DELETION_FAILED = 0x01; - public static final int REASON_YOU_MAY_NOT_DELETE_CLAN_MEMBER = 0x02; - public static final int REASON_CLAN_LEADERS_MAY_NOT_BE_DELETED = 0x03; + public static final int REASON_DELETION_FAILED = 1; + public static final int REASON_YOU_MAY_NOT_DELETE_CLAN_MEMBER = 2; + public static final int REASON_CLAN_LEADERS_MAY_NOT_BE_DELETED = 3; private final int _error; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 3b04778c3b..365b77ba7f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -29,26 +29,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { - private final Player _player; - private final Clan _clan; - private int _objId; - private int _x; - private int _y; - private int _z; - private int _heading; - private final int _mAtkSpd; - private final int _pAtkSpd; - private final int _runSpd; - private final int _walkSpd; - private final int _swimRunSpd; - private final int _swimWalkSpd; - private final int _flyRunSpd; - private final int _flyWalkSpd; - private final double _moveMultiplier; - - private int _vehicleId = 0; - private final boolean _gmSeeInvis; - private static final int[] PAPERDOLL_ORDER = new int[] { Inventory.PAPERDOLL_UNDER, @@ -74,6 +54,25 @@ public class CharInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_BELT }; + private final Player _player; + private final Clan _clan; + private int _objId; + private int _x; + private int _y; + private int _z; + private int _heading; + private final int _mAtkSpd; + private final int _pAtkSpd; + private final int _runSpd; + private final int _walkSpd; + private final int _swimRunSpd; + private final int _swimWalkSpd; + private final int _flyRunSpd; + private final int _flyWalkSpd; + private final double _moveMultiplier; + private int _vehicleId = 0; + private final boolean _gmSeeInvis; + public CharInfo(Player player, boolean gmSeeInvis) { _player = player; @@ -141,15 +140,11 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getInventory().getTalismanSlots()); packet.writeD(_player.getInventory().canEquipCloak() ? 1 : 0); - packet.writeD(_player.getPvpFlag()); packet.writeD(_player.getKarma()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - - packet.writeD(0x00); // ? - + packet.writeD(0); // ? packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -160,16 +155,12 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_player.getAttackSpeedMultiplier()); - packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); - packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeS(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle()); - if (!_player.isCursedWeaponEquipped()) { packet.writeD(_player.getClanId()); @@ -179,20 +170,16 @@ public class CharInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - packet.writeC(_player.isSitting() ? 0 : 1); // standing = 1 sitting = 0 packet.writeC(_player.isRunning() ? 1 : 0); // running = 1 walking = 0 packet.writeC(_player.isInCombat() ? 1 : 0); - packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 1 : 0); - packet.writeC(!_gmSeeInvis && _player.isInvisible() ? 1 : 0); // invisible = 1 visible =0 - packet.writeC(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount packet.writeC(_player.getPrivateStoreType().getId()); @@ -203,48 +190,35 @@ public class CharInfo implements IClientOutgoingPacket } packet.writeC(_player.isInPartyMatchRoom() ? 1 : 0); - packet.writeD(_gmSeeInvis ? (_player.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask()) : _player.getAbnormalVisualEffects()); - packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); - packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getMountNpcId() + 1000000); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeC(_player.isMounted() ? 0 : _player.getEnchantEffect()); - packet.writeC(_player.getTeam().getId()); - packet.writeD(_player.getClanCrestLargeId()); packet.writeC(_player.isNoble() ? 1 : 0); // Symbol on char menu ctrl+I packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // Hero Aura - packet.writeC(_player.isFishing() ? 1 : 0); // 0x01: Fishing Mode (Cant be undone by setting back to 0) + packet.writeC(_player.isFishing() ? 1 : 0); // 1: Fishing Mode (Cant be undone by setting back to 0) packet.writeD(_player.getFishx()); packet.writeD(_player.getFishy()); packet.writeD(_player.getFishz()); packet.writeD(_player.getAppearance().getNameColor()); - packet.writeD(_heading); - packet.writeD(_player.getPledgeClass()); packet.writeD(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); - packet.writeD(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_clan != null ? _clan.getReputationScore() : 0); - // T1 packet.writeD(_player.getTransformationDisplayId()); packet.writeD(_player.getAgathionId()); - // T2 - packet.writeD(0x01); - + packet.writeD(1); // T2.3 packet.writeD(_player.getAbnormalVisualEffectSpecial()); return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 8c03ee1915..ada3623370 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -40,21 +40,19 @@ public class CharSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTED.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getTitle()); packet.writeD(_sessionId); packet.writeD(_player.getClanId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x01); // active ?? + packet.writeD(1); // active ?? packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); - packet.writeF(_player.getCurrentHp()); packet.writeF(_player.getCurrentMp()); packet.writeD((int) _player.getSp()); @@ -68,19 +66,15 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_player.getMEN()); packet.writeD(_player.getDEX()); packet.writeD(_player.getWIT()); - packet.writeD(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_player.getClassId().getId()); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeB(new byte[64]); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index fe0eabe113..d3b734922b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -42,6 +42,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { private static final Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); + private final String _loginName; private final int _sessionId; private int _activeId; @@ -77,13 +78,10 @@ public class CharSelectionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.size(); packet.writeD(size); // Created character count - packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) - packet.writeC(0x00); - + packet.writeC(0); long lastAccess = 0; if (_activeId == -1) { @@ -96,7 +94,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - for (int i = 0; i < size; i++) { final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); @@ -105,67 +102,53 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeS(_loginName); // Account name packet.writeD(_sessionId); // Account ID packet.writeD(charInfoPackage.getClanId()); // Clan ID - packet.writeD(0x00); // Builder level - + packet.writeD(0); // Builder level packet.writeD(charInfoPackage.getSex()); // Sex packet.writeD(charInfoPackage.getRace()); // Race packet.writeD(charInfoPackage.getBaseClassId()); - - packet.writeD(0x01); // GameServerName - + packet.writeD(1); // GameServerName packet.writeD(charInfoPackage.getX()); packet.writeD(charInfoPackage.getY()); packet.writeD(charInfoPackage.getZ()); packet.writeF(charInfoPackage.getCurrentHp()); packet.writeF(charInfoPackage.getCurrentMp()); - packet.writeD((int) charInfoPackage.getSp()); packet.writeQ(charInfoPackage.getExp()); packet.writeF((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel()))); // High // Five packet.writeD(charInfoPackage.getLevel()); - packet.writeD(charInfoPackage.getKarma()); packet.writeD(charInfoPackage.getPkKills()); packet.writeD(charInfoPackage.getPvPKills()); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); for (int slot : getPaperdollOrder()) { packet.writeD(charInfoPackage.getPaperdollItemId(slot)); } - packet.writeD(charInfoPackage.getHairStyle()); packet.writeD(charInfoPackage.getHairColor()); packet.writeD(charInfoPackage.getFace()); - packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); - packet.writeD(i == _activeId ? 0x01 : 0x00); - + packet.writeD(i == _activeId ? 1 : 0); packet.writeC(Math.min(charInfoPackage.getEnchantEffect(), 127)); packet.writeD(charInfoPackage.getAugmentationId()); - // packet.writeD(charInfoPackage.getTransformId()); // Used to display Transformations - packet.writeD(0x00); // Currently on retail when you are on character select you don't see your transformation. - - packet.writeD(0x00); // Pet NpcId - packet.writeD(0x00); // Pet level - packet.writeD(0x00); // Pet Food - packet.writeD(0x00); // Pet Food Level - packet.writeF(0x00); // Current pet HP - packet.writeF(0x00); // Current pet MP - + packet.writeD(0); // Currently on retail when you are on character select you don't see your transformation. + packet.writeD(0); // Pet NpcId + packet.writeD(0); // Pet level + packet.writeD(0); // Pet Food + packet.writeD(0); // Pet Food Level + packet.writeF(0); // Current pet HP + packet.writeF(0); // Current pet MP packet.writeD(charInfoPackage.getVitalityPoints()); // Vitality } return true; @@ -175,7 +158,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); - try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate")) { @@ -188,7 +170,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (charInfopackage != null) { characterList.add(charInfopackage); - final Player player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { @@ -202,7 +183,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return characterList; } @@ -243,7 +223,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { clan.removeClanMember(objectId, 0); } - GameClient.deleteCharByObjId(objectId); return null; } @@ -262,20 +241,16 @@ public class CharSelectionInfo implements IClientOutgoingPacket charInfopackage.setHairStyle(chardata.getInt("hairstyle")); charInfopackage.setHairColor(chardata.getInt("haircolor")); charInfopackage.setSex(chardata.getInt("sex")); - charInfopackage.setExp(chardata.getLong("exp")); charInfopackage.setSp(chardata.getLong("sp")); charInfopackage.setVitalityPoints(chardata.getInt("vitality_points")); charInfopackage.setClanId(chardata.getInt("clanid")); - charInfopackage.setRace(chardata.getInt("race")); - final int baseClassId = chardata.getInt("base_class"); final int activeClassId = chardata.getInt("classid"); charInfopackage.setX(chardata.getInt("x")); charInfopackage.setY(chardata.getInt("y")); charInfopackage.setZ(chardata.getInt("z")); - final int faction = chardata.getInt("faction"); if (faction == 1) { @@ -285,7 +260,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setEvil(); } - if (Config.MULTILANG_ENABLE) { String lang = chardata.getString("language"); @@ -295,22 +269,18 @@ public class CharSelectionInfo implements IClientOutgoingPacket } charInfopackage.setHtmlPrefix("data/lang/" + lang + "/"); } - // if is in subclass, load subclass exp, sp, level info if (baseClassId != activeClassId) { loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId); } - charInfopackage.setClassId(activeClassId); - // Get the augmentation id for equipped weapon int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); if (weaponObjId < 1) { weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); } - if (weaponObjId > 0) { try (Connection con = DatabaseFactory.getConnection(); @@ -331,7 +301,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } - // Check if the base class is set to zero and also doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly. if ((baseClassId == 0) && (activeClassId > 0)) { @@ -341,7 +310,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setBaseClassId(baseClassId); } - charInfopackage.setDeleteTimer(deletetime); charInfopackage.setLastAccess(chardata.getLong("lastAccess")); return charInfopackage; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java index c25e3ee116..ac66c2fa0f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java @@ -33,7 +33,7 @@ public class ClientSetTime implements IClientOutgoingPacket { OutgoingPackets.CLIENT_SET_TIME.writeId(packet); packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // time in client minutes - packet.writeD(0x06); // constant to match the server time( this determines the speed of the client clock) + packet.writeD(6); // constant to match the server time( this determines the speed of the client clock) return true; } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java index b21e4692a7..ae5363dcd3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java @@ -68,7 +68,6 @@ public class ConfirmDlg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CONFIRM_DLG.writeId(packet); - final SMParam[] params = _systemMessage.getParams(); packet.writeD(_systemMessage.getId()); packet.writeD(params.length); @@ -117,7 +116,6 @@ public class ConfirmDlg implements IClientOutgoingPacket } } } - packet.writeD(_time); packet.writeD(_requesterId); return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 5372d73b62..3414f6765d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -81,7 +81,6 @@ public class CreatureSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_sender == null ? 0 : _sender.getObjectId()); packet.writeD(_chatType.getClientId()); if (_senderName != null) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index 71f097207f..2d9b28445c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -39,7 +39,7 @@ public class DeleteObject implements IClientOutgoingPacket { OutgoingPackets.DELETE_OBJECT.writeId(packet); packet.writeD(_objectId); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index d47bcb8c25..fe1514e996 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -64,22 +64,19 @@ public class Die implements IClientOutgoingPacket { OutgoingPackets.DIE.writeId(packet); packet.writeD(_objectId); - packet.writeD(_canTeleport ? 0x01 : 0x00); - + packet.writeD(_canTeleport ? 1 : 0); if (_creature.isPlayer()) { if (!OlympiadManager.getInstance().isRegistered(_creature.getActingPlayer()) && !_creature.getActingPlayer().isOnEvent()) { _staticRes = _creature.getInventory().haveItemForSelfResurrection(); } - // Verify if player can use fixed resurrection without Feather if (_access.allowFixedRes()) { _staticRes = true; } } - if (_canTeleport && (_clan != null) && !_isJailed) { boolean isInCastleDefense = false; @@ -106,30 +103,29 @@ public class Die implements IClientOutgoingPacket isInFortDefense = true; } } - - packet.writeD(_clan.getHideoutId() > 0 ? 0x01 : 0x00); // 6d 01 00 00 00 - to hide away - packet.writeD((_clan.getCastleId() > 0) || isInCastleDefense ? 0x01 : 0x00); // 6d 02 00 00 00 - to castle - packet.writeD((TerritoryWarManager.getInstance().getHQForClan(_clan) != null) || ((siegeClan != null) && !isInCastleDefense && !isInFortDefense && !siegeClan.getFlag().isEmpty()) || ((hall != null) && (hall.getSiege() != null) && hall.getSiege().checkIsAttacker(_clan)) ? 0x01 : 0x00); // 6d - // 03 - // 00 - // 00 - // 00 - // - - // to - // siege - // HQ - packet.writeD(_sweepable ? 0x01 : 0x00); // sweepable (blue glow) - packet.writeD(_staticRes ? 0x01 : 0x00); // 6d 04 00 00 00 - to FIXED - packet.writeD((_clan.getFortId() > 0) || isInFortDefense ? 0x01 : 0x00); // 6d 05 00 00 00 - to fortress + packet.writeD(_clan.getHideoutId() > 0 ? 1 : 0); // 6d 01 00 00 00 - to hide away + packet.writeD((_clan.getCastleId() > 0) || isInCastleDefense ? 1 : 0); // 6d 02 00 00 00 - to castle + packet.writeD((TerritoryWarManager.getInstance().getHQForClan(_clan) != null) || ((siegeClan != null) && !isInCastleDefense && !isInFortDefense && !siegeClan.getFlag().isEmpty()) || ((hall != null) && (hall.getSiege() != null) && hall.getSiege().checkIsAttacker(_clan)) ? 1 : 0); // 6d + // 03 + // 00 + // 00 + // 00 + // - + // to + // siege + // HQ + packet.writeD(_sweepable ? 1 : 0); // sweepable (blue glow) + packet.writeD(_staticRes ? 1 : 0); // 6d 04 00 00 00 - to FIXED + packet.writeD((_clan.getFortId() > 0) || isInFortDefense ? 1 : 0); // 6d 05 00 00 00 - to fortress } else { - packet.writeD(0x00); // 6d 01 00 00 00 - to hide away - packet.writeD(0x00); // 6d 02 00 00 00 - to castle - packet.writeD(0x00); // 6d 03 00 00 00 - to siege HQ - packet.writeD(_sweepable ? 0x01 : 0x00); // sweepable (blue glow) - packet.writeD(_staticRes ? 0x01 : 0x00); // 6d 04 00 00 00 - to FIXED - packet.writeD(0x00); // 6d 05 00 00 00 - to fortress + packet.writeD(0); // 6d 01 00 00 00 - to hide away + packet.writeD(0); // 6d 02 00 00 00 - to castle + packet.writeD(0); // 6d 03 00 00 00 - to siege HQ + packet.writeD(_sweepable ? 1 : 0); // sweepable (blue glow) + packet.writeD(_staticRes ? 1 : 0); // 6d 04 00 00 00 - to FIXED + packet.writeD(0); // 6d 05 00 00 00 - to fortress } // TODO: protocol 152 // packet.writeC(0); // show die animation diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index 0fece14daf..5cae569545 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -43,15 +43,13 @@ public class DropItem implements IClientOutgoingPacket packet.writeD(_objectId); packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeD(_item.isStackable() ? 0x01 : 0x00); + packet.writeD(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - - packet.writeD(0x01); // unknown + packet.writeD(1); // unknown return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java index 6c8899ae59..a5b142c423 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java @@ -52,7 +52,7 @@ public class Earthquake implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_intensity); packet.writeD(_duration); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java index 099e302827..c9463026e0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java @@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class Ex2ndPasswordAck implements IClientOutgoingPacket { - int _response; + public static final int SUCCESS = 0; + public static final int WRONG_PATTERN = 1; - public static final int SUCCESS = 0x00; - public static final int WRONG_PATTERN = 0x01; + int _response; public Ex2ndPasswordAck(int response) { @@ -38,9 +38,9 @@ public class Ex2ndPasswordAck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_ACK.writeId(packet); - packet.writeC(0x00); - packet.writeD(_response == WRONG_PATTERN ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeC(0); + packet.writeD(_response == WRONG_PATTERN ? 1 : 0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java index 41bcf50771..5f85e645dc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class Ex2ndPasswordCheck implements IClientOutgoingPacket { - public static final int PASSWORD_NEW = 0x00; - public static final int PASSWORD_PROMPT = 0x01; - public static final int PASSWORD_OK = 0x02; + public static final int PASSWORD_NEW = 0; + public static final int PASSWORD_PROMPT = 1; + public static final int PASSWORD_OK = 2; private final int _windowType; @@ -40,7 +40,7 @@ public class Ex2ndPasswordCheck implements IClientOutgoingPacket { OutgoingPackets.EX_2ND_PASSWORD_CHECK.writeId(packet); packet.writeD(_windowType); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java index bf98aa5761..c01508cf05 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java @@ -24,9 +24,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class Ex2ndPasswordVerify implements IClientOutgoingPacket { - public static final int PASSWORD_OK = 0x00; - public static final int PASSWORD_WRONG = 0x01; - public static final int PASSWORD_BAN = 0x02; + public static final int PASSWORD_OK = 0; + public static final int PASSWORD_WRONG = 1; + public static final int PASSWORD_BAN = 2; private final int _wrongTentatives; private final int _mode; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java index 0f46ee9478..0ba502e611 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java @@ -50,13 +50,11 @@ public class ExAirShipInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIRSHIP_INFO.writeId(packet); - packet.writeD(_ship.getObjectId()); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(_captain); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); @@ -73,14 +71,13 @@ public class ExAirShipInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - packet.writeD(_ship.getFuel()); packet.writeD(_ship.getMaxFuel()); return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java index 775e4dfa7b..f8674acdcf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java @@ -41,7 +41,6 @@ public class ExAirShipTeleportList implements IClientOutgoingPacket if (_teleports != null) { packet.writeD(_teleports.length); - VehiclePathPoint[] path; VehiclePathPoint dst; for (int i = 0; i < _teleports.length; i++) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java index 9818edd67f..a8137347ec 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java @@ -37,7 +37,7 @@ public class ExBaseAttributeCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASE_ATTRIBUTE_CANCEL_RESULT.writeId(packet); - packet.writeD(0x01); // result + packet.writeD(1); // result packet.writeD(_objId); packet.writeD(_attribute); return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java index e5d6737699..e0e136c3cf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java @@ -63,6 +63,7 @@ public class ExBasicActionList implements IClientOutgoingPacket 1096, 1097, 1098 }; //@formatter:on + public static final int[] DEFAULT_ACTION_LIST; static { @@ -75,12 +76,10 @@ public class ExBasicActionList implements IClientOutgoingPacket { DEFAULT_ACTION_LIST[i] = i; } - for (i = count2; i-- > 0;) { DEFAULT_ACTION_LIST[count1 + i] = 1000 + i; } - for (i = count3; i-- > 0;) { DEFAULT_ACTION_LIST[count1 + count2 + i] = 5000 + i; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java index a33ec48193..43e525f05f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java @@ -26,6 +26,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBrBroadcastEventState implements IClientOutgoingPacket { + public static final int APRIL_FOOLS = 20090401; + public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) + public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) + public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) + public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) + private final int _eventId; private final int _eventState; private int _param0; @@ -36,12 +42,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket private String _param5; private String _param6; - public static final int APRIL_FOOLS = 20090401; - public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) - public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) - public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) - public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) - public ExBrBroadcastEventState(int eventId, int eventState) { _eventId = eventId; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrGamePoint.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrGamePoint.java index 89e8125b6b..0a98444d1f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrGamePoint.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrGamePoint.java @@ -48,7 +48,7 @@ public class ExBrGamePoint implements IClientOutgoingPacket OutgoingPackets.EX_BR_GAME_POINT.writeId(packet); packet.writeD(_playerObj); packet.writeQ(_points); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrProductInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrProductInfo.java index cca3a42e85..a46149782c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrProductInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrProductInfo.java @@ -40,9 +40,7 @@ public class ExBrProductInfo implements IClientOutgoingPacket { return false; } - OutgoingPackets.EX_BR_PRODUCT_INFO.writeId(packet); - packet.writeD(_product.getProductId()); // product id packet.writeD(_product.getPrice()); // points packet.writeD(1); // components size diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrProductList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrProductList.java index 6aa8015f8c..fb52230b20 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrProductList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrProductList.java @@ -35,47 +35,44 @@ public class ExBrProductList implements IClientOutgoingPacket { OutgoingPackets.EX_BR_PRODUCT_LIST.writeId(packet); packet.writeD(_itemList.size()); - for (PrimeShopProductHolder product : _itemList) { final int category = product.getCategory(); packet.writeD(product.getProductId()); // product id packet.writeH(category); // category id packet.writeD(product.getPrice()); // points - switch (category) { case 6: { - packet.writeD(0x01); // event + packet.writeD(1); // event break; } case 7: { - packet.writeD(0x02); // best + packet.writeD(2); // best break; } case 8: { - packet.writeD(0x03); // event & best + packet.writeD(3); // event & best break; } default: { - packet.writeD(0x00); // normal + packet.writeD(0); // normal break; } } - - packet.writeD(0x00); // start sale - packet.writeD(0x00); // end sale - packet.writeC(0x00); // day week - packet.writeC(0x00); // start hour - packet.writeC(0x00); // start min - packet.writeC(0x00); // end hour - packet.writeC(0x00); // end min - packet.writeD(0x00); // current stock - packet.writeD(0x00); // max stock + packet.writeD(0); // start sale + packet.writeD(0); // end sale + packet.writeC(0); // day week + packet.writeC(0); // start hour + packet.writeC(0); // start min + packet.writeC(0); // end hour + packet.writeC(0); // end min + packet.writeD(0); // current stock + packet.writeD(0); // max stock } return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrRecentProductList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrRecentProductList.java index 9bbd39371e..b26db6216a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrRecentProductList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBrRecentProductList.java @@ -40,7 +40,6 @@ public class ExBrRecentProductList implements IClientOutgoingPacket public ExBrRecentProductList(Player player) { final int playerObj = player.getObjectId(); - try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("SELECT productId FROM prime_shop_transactions WHERE charId=? ORDER BY transactionTime DESC")) { @@ -70,26 +69,23 @@ public class ExBrRecentProductList implements IClientOutgoingPacket { return false; } - OutgoingPackets.EX_BR_RECENT_PRODUCT_LIST.writeId(packet); packet.writeD(_itemList.size()); - for (PrimeShopProductHolder product : _itemList) { packet.writeD(product.getProductId()); packet.writeH(product.getCategory()); packet.writeD(product.getPrice()); - packet.writeD(0x00); // category - - packet.writeD(0x00); // start sale - packet.writeD(0x00); // end sale - packet.writeC(0x00); // day week - packet.writeC(0x00); // start hour - packet.writeC(0x00); // start min - packet.writeC(0x00); // end hour - packet.writeC(0x00); // end min - packet.writeD(0x00); // current stock - packet.writeD(0x00); // max stock + packet.writeD(0); // category + packet.writeD(0); // start sale + packet.writeD(0); // end sale + packet.writeC(0); // day week + packet.writeC(0); // start hour + packet.writeC(0); // start min + packet.writeC(0); // end hour + packet.writeC(0); // end min + packet.writeD(0); // current stock + packet.writeD(0); // max stock } return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 534f14ac95..f5d724d3c6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -47,8 +47,7 @@ public class ExBuySellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - packet.writeD(0x01); - + packet.writeD(1); if ((_sellList != null)) { packet.writeH(_sellList.size()); @@ -60,9 +59,8 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - if ((_refundList != null) && !_refundList.isEmpty()) { packet.writeH(_refundList.size()); @@ -76,10 +74,9 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - - packet.writeC(_done ? 0x01 : 0x00); + packet.writeC(_done ? 1 : 0); return true; } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java index 27c112776b..1d02c972b5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java @@ -54,7 +54,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLOSSEUM_FENCE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_clientState); packet.writeD(_x); @@ -62,7 +61,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_width); packet.writeD(_length); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java index db29c854b2..5e2c21f67b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java @@ -38,7 +38,7 @@ public class ExConfirmAddingContact implements IClientOutgoingPacket { OutgoingPackets.EX_CONFIRM_ADDING_POST_FRIEND.writeId(packet); packet.writeS(_charName); - packet.writeD(_added ? 0x01 : 0x00); + packet.writeD(_added ? 1 : 0); return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java index be50e316bc..9bd03b9aef 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameAddPlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x01); - + packet.writeD(1); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java index c42bda2e5c..8f551e263b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java @@ -45,8 +45,7 @@ public class ExCubeGameChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java index 226c44b8ed..82bd2919b5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java @@ -43,11 +43,10 @@ public class ExCubeGameChangeTeam implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0x05); - + packet.writeD(5); packet.writeD(_player.getObjectId()); - packet.writeD(_fromRedTeam ? 0x01 : 0x00); - packet.writeD(_fromRedTeam ? 0x00 : 0x01); + packet.writeD(_fromRedTeam ? 1 : 0); + packet.writeD(_fromRedTeam ? 0 : 1); return true; } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java index 7fe15d2b42..4739af9f53 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java @@ -39,8 +39,7 @@ public class ExCubeGameChangeTimeToStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0x03); - + packet.writeD(3); packet.writeD(_seconds); return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java index 8492a9f468..ec74b51ee3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java @@ -40,9 +40,8 @@ public class ExCubeGameEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - packet.writeD(0x01); - - packet.writeD(_isRedTeamWin ? 0x01 : 0x00); + packet.writeD(1); + packet.writeD(_isRedTeamWin ? 1 : 0); return true; } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java index c2b17be7a8..861b2db34f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java @@ -55,13 +55,11 @@ public class ExCubeGameExtendedChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeD(_playerPoints); return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java index 44a08d945a..56877eea1b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java @@ -43,11 +43,9 @@ public class ExCubeGameRemovePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java index 90e561d75c..81f6f22617 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java @@ -29,7 +29,7 @@ public class ExCubeGameRequestReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0x04); + packet.writeD(4); return true; } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java index 5258cc30b0..f919881aae 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java @@ -30,7 +30,6 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket // Players Lists List _bluePlayers; List _redPlayers; - // Common Values int _roomNumber; @@ -51,11 +50,9 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_roomNumber); packet.writeD(0xffffffff); - packet.writeD(_bluePlayers.size()); for (Player player : _bluePlayers) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java index 29455aa7d6..fafc52e4db 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java @@ -37,7 +37,6 @@ public class ExCursedWeaponList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet); - packet.writeD(_cursedWeaponIds.size()); for (int i : _cursedWeaponIds) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java index 39cd0941a7..ce4b6eb68d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java @@ -39,7 +39,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet); - if (!_cursedWeaponInfo.isEmpty()) { packet.writeD(_cursedWeaponInfo.size()); @@ -47,7 +46,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { packet.writeD(w.id); packet.writeD(w.activated); - packet.writeD(w.pos.getX()); packet.writeD(w.pos.getY()); packet.writeD(w.pos.getZ()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDominionWarStart.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDominionWarStart.java index 68e5edc391..ed1e9403f7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDominionWarStart.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExDominionWarStart.java @@ -42,7 +42,7 @@ public class ExDominionWarStart implements IClientOutgoingPacket { OutgoingPackets.EX_DOMINION_WAR_START.writeId(packet); packet.writeD(_objId); - packet.writeD(0x01); // ?? + packet.writeD(1); // ?? packet.writeD(_terId); packet.writeD(_isDisguised ? 1 : 0); packet.writeD(_isDisguised ? _terId : 0); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index dcec2f2710..fad1f28daf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -28,7 +28,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExEnchantSkillInfo implements IClientOutgoingPacket { private final List _routes = new ArrayList<>(); // skill levels for each route - private final int _id; private final int _level; private boolean _maxEnchanted = false; @@ -37,7 +36,6 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket { _id = id; _level = level; - final EnchantSkillLearn enchantLearn = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(_id); // do we have this skill? if (enchantLearn != null) @@ -46,16 +44,13 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket if (_level > 100) { _maxEnchanted = enchantLearn.isMaxEnchant(_level); - // get detail for next level final EnchantSkillHolder esd = enchantLearn.getEnchantSkillHolder(_level); - // if it exists add it if (esd != null) { _routes.add(_level); // current enchant add firts } - final int skillLevel = (_level % 100); for (int route : enchantLearn.getAllRoutes()) { @@ -89,7 +84,6 @@ public class ExEnchantSkillInfo implements IClientOutgoingPacket packet.writeD(_maxEnchanted ? 0 : 1); packet.writeD(_level > 100 ? 1 : 0); // enchanted? packet.writeD(_routes.size()); - for (int level : _routes) { packet.writeD(level); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 8783b8b4fc..7c2fd38fab 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -20,8 +20,8 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.EnchantSkillGroupsData; import org.l2jmobius.gameserver.model.EnchantSkillGroup.EnchantSkillHolder; -import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.EnchantSkillLearn; +import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -61,12 +61,10 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket esd = enchantLearn.getFirstRouteGroup().getEnchantGroupDetails().get(0); } } - if (esd == null) { throw new IllegalArgumentException("Skill " + skillId + " dont have enchant data for level " + skillLevel); } - if (type == 0) { multi = EnchantSkillGroupsData.NORMAL_ENCHANT_COST_MULTIPLIER; @@ -85,7 +83,6 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket _type = type; _skillId = skillId; _skillLevel = skillLevel; - switch (type) { case TYPE_NORMAL_ENCHANT: @@ -117,7 +114,6 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket return; } } - if ((type != TYPE_SAFE_ENCHANT) && !Config.ES_SP_BOOK_NEEDED) { reqCount = 0; @@ -133,7 +129,7 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket packet.writeD(_skillLevel); packet.writeD(_sp * multi); // sp packet.writeD(_chance); // exp - packet.writeD(0x02); // items count? + packet.writeD(2); // items count? packet.writeD(Inventory.ADENA_ID); // Adena packet.writeD(_adenacount); // Adena count packet.writeD(bookId); // ItemId Required diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingHpRegen.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingHpRegen.java index 25dc1b2484..c9e712b700 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingHpRegen.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingHpRegen.java @@ -50,7 +50,6 @@ public class ExFishingHpRegen implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FISHING_HP_REGEN.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeD(_time); packet.writeD(_fishHP); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStart.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStart.java index 280fd49e45..5f25b56135 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStart.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExFishingStart.java @@ -51,8 +51,8 @@ public class ExFishingStart implements IClientOutgoingPacket packet.writeD(_x); // x position packet.writeD(_y); // y position packet.writeD(_z); // z position - packet.writeC(_isNightLure ? 0x01 : 0x00); // night lure - packet.writeC(0x00); // show fish rank result button + packet.writeC(_isNightLure ? 1 : 0); // night lure + packet.writeC(0); // show fish rank result button return true; } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java index bdf8014011..27c4bf08d9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java @@ -37,10 +37,9 @@ public class ExGetBookMarkInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOOKMARK_INFO.writeId(packet); - packet.writeD(0x00); // Dummy + packet.writeD(0); // Dummy packet.writeD(_player.getBookmarkSlot()); packet.writeD(_player.getTeleportBookmarks().size()); - for (TeleportBookmark tpbm : _player.getTeleportBookmarks()) { packet.writeD(tpbm.getId()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java index d0492e17fa..201e8eb49b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java @@ -46,10 +46,10 @@ public class ExGetBossRecord implements IClientOutgoingPacket packet.writeD(_totalPoints); if (_bossRecordInfo == null) { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } else { @@ -58,7 +58,7 @@ public class ExGetBossRecord implements IClientOutgoingPacket { packet.writeD(entry.getKey()); packet.writeD(entry.getValue()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? } } return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java index 313e0cbebe..74485f3fe2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java @@ -47,7 +47,7 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket packet.writeD(_player.getObjectId()); packet.writeD(item.getItemId()); packet.writeQ(item.getCount()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeS(item.getSender()); } return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index b158fbebd6..66d3004b9f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -41,7 +41,6 @@ public class ExHeroList implements IClientOutgoingPacket { OutgoingPackets.EX_HERO_LIST.writeId(packet); packet.writeD(_heroList.size()); - for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java index 758474d64a..2bb41036c3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java @@ -38,7 +38,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { throw new NullPointerException(); } - if (currentAuction.getAuctionState() != ItemAuctionState.STARTED) { _timeRemaining = 0; @@ -47,7 +46,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { _timeRemaining = (int) (currentAuction.getFinishingTimeRemaining() / 1000); // in seconds } - _refresh = refresh; _currentAuction = currentAuction; _nextAuction = nextAuction; @@ -57,15 +55,12 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_AUCTION_INFO.writeId(packet); - packet.writeC(_refresh ? 0x00 : 0x01); + packet.writeC(_refresh ? 0 : 1); packet.writeD(_currentAuction.getInstanceId()); - final ItemAuctionBid highestBid = _currentAuction.getHighestBid(); packet.writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid()); - packet.writeD(_timeRemaining); writeItem(packet, _currentAuction.getItemInfo()); - if (_nextAuction != null) { packet.writeQ(_nextAuction.getAuctionInitBid()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index f922f9f4be..760be71208 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -56,29 +56,24 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket packet.writeD(0); return true; } - for (Player cha : PartyMatchWaitingList.getInstance().getPlayers()) { if ((cha == null) || (cha == _player)) { continue; } - if (!cha.isPartyWaiting()) { PartyMatchWaitingList.getInstance().removePlayer(cha); continue; } - else if ((cha.getLevel() < _minLevel) || (cha.getLevel() > _maxLevel)) { continue; } - _members.add(cha); } - - packet.writeD(0x01); // Page? + packet.writeD(1); // Page? packet.writeD(_members.size()); for (Player member : _members) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java index e981eb64ad..4667a50010 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java @@ -61,11 +61,11 @@ public class ExManagePartyRoomMember implements IClientOutgoingPacket { if ((_room.getOwner().isInParty() && _player.isInParty()) && (_room.getOwner().getParty().getLeaderObjectId() == _player.getParty().getLeaderObjectId())) { - packet.writeD(0x02); + packet.writeD(2); } else { - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java index 7101acdd70..2775a1ca79 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java @@ -40,13 +40,10 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket { return false; } - OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet); - packet.writeS(_channel.getLeader().getName()); - packet.writeD(0x00); // Channel loot 0 or 1 + packet.writeD(0); // Channel loot 0 or 1 packet.writeD(_channel.getMemberCount()); - packet.writeD(_channel.getParties().size()); for (Party p : _channel.getParties()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java index 1a254cefcf..949e1ed934 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java @@ -38,7 +38,7 @@ public class ExNevitAdventTimeChange implements IClientOutgoingPacket { OutgoingPackets.EX_NAVIT_ADVENT_TIME_CHANGE.writeId(packet); // state 0 - pause 1 - started - packet.writeC(_paused ? 0x00 : 0x01); + packet.writeC(_paused ? 0 : 1); // left time in ms max is 16000 its 4m and state is automatically changed to quit packet.writeD(_time); return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java index 9c2f9b6712..f2ce8614dc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java @@ -43,7 +43,7 @@ public class ExNoticePostArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTICE_POST_ARRIVED.writeId(packet); - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java index 1bca615f37..05f2a0c6cd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java @@ -43,7 +43,7 @@ public class ExNoticePostSent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTICE_POST_SENT.writeId(packet); - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java index 5914093af6..9256ef6f70 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java @@ -56,18 +56,15 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - packet.writeD(0x00); // Type 0 = Match List, 1 = Match Result - + packet.writeD(0); // Type 0 = Match List, 1 = Match Result packet.writeD(_games.size()); - packet.writeD(0x00); - + packet.writeD(0); for (OlympiadGameTask curGame : _games) { final AbstractOlympiadGame game = curGame.getGame(); if (game != null) { packet.writeD(game.getStadiumId()); // Stadium Id (Arena 1 = 0) - if (game instanceof OlympiadGameNonClassed) { packet.writeD(1); @@ -84,8 +81,7 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket { packet.writeD(0); } - - packet.writeD(curGame.isRunning() ? 0x02 : 0x01); // (1 = Standby, 2 = Playing) + packet.writeD(curGame.isRunning() ? 2 : 1); // (1 = Standby, 2 = Playing) packet.writeS(game.getPlayerNames()[0]); // Player 1 Name packet.writeS(game.getPlayerNames()[1]); // Player 2 Name } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java index b19365fb88..fecab74e40 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java @@ -53,8 +53,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - packet.writeD(0x01); // Type 0 = Match List, 1 = Match Result - + packet.writeD(1); // Type 0 = Match List, 1 = Match Result packet.writeD(_tie ? 1 : 0); // 0 - win, 1 - tie packet.writeS(_winnerList.get(0).getName()); packet.writeD(_winTeam); @@ -69,7 +68,6 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); } - packet.writeD(_loseTeam); packet.writeD(_loserList.size()); for (OlympiadInfo info : _loserList) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java index 990f2b2c56..7c0eae6ce4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java @@ -90,7 +90,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket packet.writeS(_par.getName()); packet.writeD(_par.getBaseClass()); } - packet.writeD(_curHp); packet.writeD(_maxHp); packet.writeD(_curCp); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 0a321aea6c..be2726b328 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -50,20 +50,20 @@ public class ExPartyRoomMember implements IClientOutgoingPacket packet.writeD(_room.getLocation()); if (_room.getOwner().equals(member)) { - packet.writeD(0x01); + packet.writeD(1); } else { if ((_room.getOwner().isInParty() && member.isInParty()) && (_room.getOwner().getParty().getLeaderObjectId() == member.getParty().getLeaderObjectId())) { - packet.writeD(0x02); + packet.writeD(2); } else { - packet.writeD(0x00); + packet.writeD(0); } } - packet.writeD(0x00); // TODO: Instance datas there is more if that is not 0! + packet.writeD(0); // TODO: Instance datas there is more if that is not 0! } return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java index 398ee7cfef..b4b54a6315 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java @@ -46,7 +46,7 @@ public class ExPledgeEmblem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_crestId); if (_data != null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 671ad3c5af..2313d5fb46 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -46,7 +46,7 @@ public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket packet.writeD(_itemAug1); packet.writeD(_itemAug2); packet.writeQ(_price); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java index 735231d6ef..c25dd16b01 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java @@ -36,7 +36,7 @@ public class ExPutItemResultForVariationMake implements IClientOutgoingPacket OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_MAKE.writeId(packet); packet.writeD(_itemObjId); packet.writeD(_itemId); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 953ae56e86..d2f27b9074 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -26,7 +26,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; /** * @author Migi, DS */ - public class ExReplyPostItemList extends AbstractItemPacket { Player _player; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index f54fc2e0d7..04fe99aeb9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -56,11 +56,10 @@ public class ExReplyReceivedPost extends AbstractItemPacket OutgoingPackets.EX_REPLY_RECEIVED_POST.writeId(packet); packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown packet.writeS(_msg.getSenderName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -72,9 +71,8 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeQ(_msg.getReqAdena()); packet.writeD(_msg.hasAttachments() ? 1 : 0); packet.writeD(_msg.getSendBySystem()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 9d03163f8c..0afc1a6dd6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -60,7 +60,6 @@ public class ExReplySentPost extends AbstractItemPacket packet.writeS(_msg.getReceiverName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -74,7 +73,7 @@ public class ExReplySentPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); packet.writeQ(_msg.getReqAdena()); } return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index f1b33489ed..e16c9bf03c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -42,7 +42,7 @@ public class ExRpItemLink implements IClientOutgoingPacket packet.writeQ(_item.getCount()); packet.writeH(_item.getItem().getType2()); packet.writeH(_item.getCustomType1()); - packet.writeH(_item.isEquipped() ? 0x01 : 0x00); + packet.writeH(_item.isEquipped() ? 1 : 0); packet.writeD(_item.getItem().getBodyPart()); packet.writeH(_item.getEnchantLevel()); packet.writeH(_item.getCustomType2()); @@ -52,7 +52,7 @@ public class ExRpItemLink implements IClientOutgoingPacket } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(_item.getMana()); packet.writeD(_item.isTimeLimitedItem() ? (int) (_item.getRemainingTime() / 1000) : -9999); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index 5bbf1793be..59b6379871 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -34,7 +34,6 @@ public class ExSendManorList implements IClientOutgoingPacket { final List castles = CastleManager.getInstance().getCastles(); castles.sort(Comparator.comparing(Castle::getResidenceId)); - OutgoingPackets.EX_SEND_MANOR_LIST.writeId(packet); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java index e92b6a8201..3778d7e57c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java @@ -391,9 +391,7 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(65535); // has to do something with display range and angle packet.writeD(65535); // has to do something with display range and angle - packet.writeD(_points.size() + _lines.size()); - for (Point point : _points) { packet.writeC(1); // Its the type in this case Point @@ -407,7 +405,6 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(point.getY()); packet.writeD(point.getZ()); } - for (Line line : _lines) { packet.writeC(2); // Its the type in this case Line diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index b850ee78f7..0722db1826 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -40,7 +40,7 @@ public class ExShowAgitInfo implements IClientOutgoingPacket packet.writeD(ch.getId()); packet.writeS(ch.getOwnerId() <= 0 ? "" : ClanTable.getInstance().getClan(ch.getOwnerId()).getName()); // owner clan name packet.writeS(ch.getOwnerId() <= 0 ? "" : ClanTable.getInstance().getClan(ch.getOwnerId()).getLeaderName()); // leader name - packet.writeD(ch.getGrade() > 0 ? 0x00 : 0x01); // 0 - auction 1 - war clanhall 2 - ETC (rainbow spring clanhall) + packet.writeD(ch.getGrade() > 0 ? 0 : 1); // 0 - auction 1 - war clanhall 2 - ETC (rainbow spring clanhall) } return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index 7593b20862..9d90f816d1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -37,7 +37,6 @@ public class ExShowCropInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _crops = (nextPeriod && !manor.isManorApproved()) ? null : manor.getCropProcure(manorId, nextPeriod); } @@ -46,9 +45,9 @@ public class ExShowCropInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_INFO.writeId(packet); - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Crop Sales" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Crop Sales" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); + packet.writeD(0); if (_crops == null) { packet.writeD(0); @@ -66,17 +65,17 @@ public class ExShowCropInfo implements IClientOutgoingPacket if (seed == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(seed.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(seed.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(seed.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index 991620f208..992ab59eb8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -62,10 +62,8 @@ public class ExShowCropSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - CropProcure cp; for (Seed s : _seeds) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowDominionRegistry.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowDominionRegistry.java index 580a596ef1..8731d02bb5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowDominionRegistry.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowDominionRegistry.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExShowDominionRegistry implements IClientOutgoingPacket { private static final int MINID = 80; + private final int _castleId; private int _clanReq = 0x00; private int _mercReq = 0x00; @@ -48,13 +49,13 @@ public class ExShowDominionRegistry implements IClientOutgoingPacket _clanReq = TerritoryWarManager.getInstance().getRegisteredClans(castleId).size(); if (player.getClan() != null) { - _isClanRegistered = (TerritoryWarManager.getInstance().getRegisteredClans(castleId).contains(player.getClan()) ? 0x01 : 0x00); + _isClanRegistered = (TerritoryWarManager.getInstance().getRegisteredClans(castleId).contains(player.getClan()) ? 1 : 0); } } if (TerritoryWarManager.getInstance().getRegisteredMercenaries(castleId) != null) { _mercReq = TerritoryWarManager.getInstance().getRegisteredMercenaries(castleId).size(); - _isMercRegistered = (TerritoryWarManager.getInstance().getRegisteredMercenaries(castleId).contains(player.getObjectId()) ? 0x01 : 0x00); + _isMercRegistered = (TerritoryWarManager.getInstance().getRegisteredMercenaries(castleId).contains(player.getObjectId()) ? 1 : 0); } _warTime = (int) (TerritoryWarManager.getInstance().getTWStartTimeInMillis() / 1000); } @@ -94,7 +95,7 @@ public class ExShowDominionRegistry implements IClientOutgoingPacket packet.writeD(_currentTime); // Current Time packet.writeD(_isClanRegistered); // is Cancel clan registration packet.writeD(_isMercRegistered); // is Cancel mercenaries registration - packet.writeD(0x01); // unknown + packet.writeD(1); // unknown final List territoryList = TerritoryWarManager.getInstance().getAllTerritories(); packet.writeD(territoryList.size()); // Territory Count for (Territory t : territoryList) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index 022db26ade..2d5cdb4a7e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -46,7 +46,7 @@ public class ExShowFortressInfo implements IClientOutgoingPacket final Clan clan = fort.getOwnerClan(); packet.writeD(fort.getResidenceId()); packet.writeS(clan != null ? clan.getName() : ""); - packet.writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00); + packet.writeD(fort.getSiege().isInProgress() ? 1 : 0); // Time of possession packet.writeD(fort.getOwnedTime()); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index 77c6197e06..b6200b96f3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -41,11 +41,9 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_MAP_INFO.writeId(packet); - packet.writeD(_fortress.getResidenceId()); packet.writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status packet.writeD(_fortress.getFortSize()); // barracks count - final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId()); if ((commanders != null) && !commanders.isEmpty() && _fortress.getSiege().isInProgress()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 45c420fdbe..ffff6ce908 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -50,7 +50,6 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_SIEGE_INFO.writeId(packet); - packet.writeD(_fortId); // Fortress Id packet.writeD(_size); // Total Barracks Count if (_csize > 0) @@ -63,22 +62,22 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { case 0: { - packet.writeD(0x03); + packet.writeD(3); break; } case 1: { - packet.writeD(0x02); + packet.writeD(2); break; } case 2: { - packet.writeD(0x01); + packet.writeD(1); break; } case 3: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -91,27 +90,27 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket // TODO: once control room supported, update packet.writeD(0x0x) to support 5th room case 0: { - packet.writeD(0x05); + packet.writeD(5); break; } case 1: { - packet.writeD(0x04); + packet.writeD(4); break; } case 2: { - packet.writeD(0x03); + packet.writeD(3); break; } case 3: { - packet.writeD(0x02); + packet.writeD(2); break; } case 4: { - packet.writeD(0x01); + packet.writeD(1); break; } } @@ -123,7 +122,7 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { for (int i = 0; i < _size; i++) { - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java index e34c2087d4..912839e242 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java @@ -41,7 +41,7 @@ public class ExShowManorDefaultInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_MANOR_DEFAULT_INFO.writeId(packet); - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" and "Crop Sales" buttons + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" and "Crop Sales" buttons packet.writeD(_crops.size()); for (Seed crop : _crops) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowOwnthingPos.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowOwnthingPos.java index 72bba32867..1b2940db30 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowOwnthingPos.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowOwnthingPos.java @@ -38,7 +38,6 @@ public class ExShowOwnthingPos implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_OWNTHING_POS.writeId(packet); - if (TerritoryWarManager.getInstance().isTWInProgress()) { final Collection territoryWardList = TerritoryWarManager.getInstance().getAllTerritoryWards(); @@ -46,7 +45,6 @@ public class ExShowOwnthingPos implements IClientOutgoingPacket for (TerritoryWard ward : territoryWardList) { packet.writeD(ward.getTerritoryId()); - if (ward.getNpc() != null) { packet.writeD(ward.getNpc().getX()); @@ -61,15 +59,15 @@ public class ExShowOwnthingPos implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 1d3312d668..d03ce2a5fd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -52,10 +52,8 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet); - packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index 29a81f6c1f..d2cb23b2bc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -49,19 +49,19 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getSenderName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); - packet.writeD(0x01); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(msg.isReturned() ? 0x01 : 0x00); + packet.writeD(msg.isUnread() ? 1 : 0); + packet.writeD(1); + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(msg.isReturned() ? 1 : 0); packet.writeD(msg.getSendBySystem()); - packet.writeD(0x00); + packet.writeD(0); } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java index 1bf8311e5a..5e069233af 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java @@ -33,6 +33,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; */ public class ExShowScreenMessage implements IClientOutgoingPacket { + // Positions + public static final byte TOP_LEFT = 1; + public static final byte TOP_CENTER = 2; + public static final byte TOP_RIGHT = 3; + public static final byte MIDDLE_LEFT = 4; + public static final byte MIDDLE_CENTER = 5; + public static final byte MIDDLE_RIGHT = 6; + public static final byte BOTTOM_CENTER = 7; + public static final byte BOTTOM_RIGHT = 8; + private final int _type; private final int _sysMessageId; private final int _unk1; @@ -48,15 +58,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket private List _parameters; // Localisation related. private String _lang; - // Positions - public static final byte TOP_LEFT = 0x01; - public static final byte TOP_CENTER = 0x02; - public static final byte TOP_RIGHT = 0x03; - public static final byte MIDDLE_LEFT = 0x04; - public static final byte MIDDLE_CENTER = 0x05; - public static final byte MIDDLE_RIGHT = 0x06; - public static final byte BOTTOM_CENTER = 0x07; - public static final byte BOTTOM_RIGHT = 0x08; public void setLang(String lang) { @@ -237,7 +238,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SCREEN_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -256,9 +256,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(sml.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -280,9 +280,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -290,7 +290,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket } } } - packet.writeD(_type); packet.writeD(_sysMessageId); packet.writeD(_position); @@ -298,9 +297,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java index 883f6df2ed..6123b08991 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java @@ -37,7 +37,6 @@ public class ExShowSeedInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _seeds = (nextPeriod && !manor.isManorApproved()) ? null : manor.getSeedProduction(manorId, nextPeriod); } @@ -46,9 +45,9 @@ public class ExShowSeedInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_INFO.writeId(packet); - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown if (_seeds == null) { packet.writeD(0); @@ -65,17 +64,17 @@ public class ExShowSeedInfo implements IClientOutgoingPacket if (s == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(s.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(s.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(s.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java index 595bebc0ea..5a3ea4211f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java @@ -40,7 +40,6 @@ public class ExShowSeedMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_MAP_INFO.writeId(packet); - packet.writeD(ENTRANCES.length); for (Location loc : ENTRANCES) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index 49f1d448d5..44a1cbea69 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -62,10 +62,8 @@ public class ExShowSeedSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - SeedProduction sp; for (Seed s : _seeds) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 1994402da2..269bec5b97 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -47,7 +47,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _cropsItems.put(cropId, item); } } - for (CropProcure crop : CastleManorManager.getInstance().getCropProcure(_manorId, false)) { if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) @@ -61,7 +60,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_cropsItems.size()); // size for (Item item : _cropsItems.values()) @@ -70,9 +68,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket packet.writeD(item.getObjectId()); // Object id packet.writeD(item.getId()); // crop id packet.writeD(seed.getLevel()); // seed level - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(1)); // reward 1 id - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(2)); // reward 2 id if (_castleCrops.containsKey(item.getId())) { @@ -85,9 +83,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket else { packet.writeD(0xFFFFFFFF); // manor - packet.writeQ(0x00); // buy residual - packet.writeQ(0x00); // buy price - packet.writeC(0x00); // reward + packet.writeQ(0); // buy residual + packet.writeQ(0); // buy price + packet.writeC(0); // reward } packet.writeQ(item.getCount()); // my crops } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index df83c40562..df253d3e90 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -49,16 +49,16 @@ public class ExShowSentPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getReceiverName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); - packet.writeD(0x01); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); + packet.writeD(msg.isUnread() ? 1 : 0); + packet.writeD(1); + packet.writeD(msg.hasAttachments() ? 1 : 0); } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java index 4e284f82c5..86e1009bbf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java @@ -46,7 +46,6 @@ public class ExShowTrace implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TRACE.writeId(packet); - packet.writeH(0); // type broken in H5 packet.writeD(0); // time broken in H5 packet.writeH(_locations.size()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java index 169827bab3..86211c8d97 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java @@ -44,10 +44,9 @@ public class ExSpawnEmitter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SPAWN_EMITTER.writeId(packet); - packet.writeD(_npcObjectId); packet.writeD(_playerObjectId); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java index 620800c1c4..534549b4fe 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java @@ -36,7 +36,6 @@ public class ExStartScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_START_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index 121b0a04bc..e43eea2904 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -54,7 +54,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet); - packet.writeD(_inventory); packet.writeD(_warehouse); packet.writeD(_clan); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java index fa635dd253..405b32c3fb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java @@ -75,12 +75,9 @@ public class ExUISetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_UI_SETTING.writeId(packet); - packet.writeD(buffsize); packet.writeD(categories); - int category = 0; - final int numKeyCt = _uiSettings.getKeys().size(); packet.writeD(numKeyCt); for (int i = 0; i < numKeyCt; i++) @@ -96,10 +93,9 @@ public class ExUISetting implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } category++; - if (_uiSettings.getCategories().containsKey(category)) { final List catElList2 = _uiSettings.getCategories().get(category); @@ -111,10 +107,9 @@ public class ExUISetting implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } category++; - if (_uiSettings.getKeys().containsKey(i)) { final List keyElList = _uiSettings.getKeys().get(i); @@ -130,11 +125,11 @@ public class ExUISetting implements IClientOutgoingPacket } else { - packet.writeD(0x00); + packet.writeD(0); } } packet.writeD(0x11); - packet.writeD(0x10); + packet.writeD(16); return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java index f992b3c937..e59c651371 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java @@ -41,7 +41,6 @@ public class ExUseSharedGroupItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USE_SHARED_GROUP_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeD(_grpId); packet.writeD(_remainingTime); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java index a8bf43c235..475ba76f28 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java @@ -79,15 +79,13 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // vehicleId + packet.writeD(0); // vehicleId packet.writeD(_objId); packet.writeS(_npc.getName()); - packet.writeD(_npc.getRace().ordinal()); - packet.writeD(_npc.getTemplate().getSex() == Sex.FEMALE ? 0x01 : 0x00); + packet.writeD(_npc.getTemplate().getSex() == Sex.FEMALE ? 1 : 0); packet.writeD(_fpcHolder.getClassId()); - - packet.writeD(0x00); // Inventory.PAPERDOLL_UNDER + packet.writeD(0); // Inventory.PAPERDOLL_UNDER packet.writeD(_fpcHolder.getEquipHead()); packet.writeD(_fpcHolder.getEquipRHand()); packet.writeD(_fpcHolder.getEquipLHand()); @@ -99,32 +97,26 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_fpcHolder.getEquipRHand()); // dual hand packet.writeD(_fpcHolder.getEquipHair()); packet.writeD(_fpcHolder.getEquipHair2()); - packet.writeD(0x00); // Inventory.PAPERDOLL_RBRACELET - packet.writeD(0x00); // Inventory.PAPERDOLL_LBRACELET - packet.writeD(0x00); // Inventory.PAPERDOLL_DECO1 - packet.writeD(0x00); // Inventory.PAPERDOLL_DECO2 - packet.writeD(0x00); // Inventory.PAPERDOLL_DECO3 - packet.writeD(0x00); // Inventory.PAPERDOLL_DECO4 - packet.writeD(0x00); // Inventory.PAPERDOLL_DECO5 - packet.writeD(0x00); // Inventory.PAPERDOLL_DECO6 - packet.writeD(0x00); // Inventory.PAPERDOLL_BELT - + packet.writeD(0); // Inventory.PAPERDOLL_RBRACELET + packet.writeD(0); // Inventory.PAPERDOLL_LBRACELET + packet.writeD(0); // Inventory.PAPERDOLL_DECO1 + packet.writeD(0); // Inventory.PAPERDOLL_DECO2 + packet.writeD(0); // Inventory.PAPERDOLL_DECO3 + packet.writeD(0); // Inventory.PAPERDOLL_DECO4 + packet.writeD(0); // Inventory.PAPERDOLL_DECO5 + packet.writeD(0); // Inventory.PAPERDOLL_DECO6 + packet.writeD(0); // Inventory.PAPERDOLL_BELT for (int i = 0; i < 21; i++) { - packet.writeD(0x00); + packet.writeD(0); } - - packet.writeD(0x00); // getTalismanSlots - packet.writeD(0x01); // canEquipCloak - + packet.writeD(0); // getTalismanSlots + packet.writeD(1); // canEquipCloak packet.writeD(_npc.getScriptValue()); // getPvpFlag() packet.writeD(_npc.getKarma()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - - packet.writeD(0x00); // ? - + packet.writeD(0); // ? packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -135,16 +127,12 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_npc.getCollisionRadius()); packet.writeF(_npc.getCollisionHeight()); - packet.writeD(_fpcHolder.getHair()); packet.writeD(_fpcHolder.getHairColor()); packet.writeD(_fpcHolder.getFace()); - packet.writeS(_npc.getTemplate().getTitle()); - if (_clan != null) { packet.writeD(_clan.getId()); @@ -154,69 +142,48 @@ public class FakePlayerInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - - packet.writeC(0x01); // isSitting() ? 0x00 : 0x01 (at some initial tests it worked) - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); - packet.writeC(_npc.isInCombat() ? 0x01 : 0x00); - - packet.writeC(_npc.isAlikeDead() ? 0x01 : 0x00); - - packet.writeC(_npc.isInvisible() ? 0x01 : 0x00); - - packet.writeC(0x00); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount - packet.writeC(0x00); // getPrivateStoreType().getId() - - packet.writeH(0x00); // getCubics().size() + packet.writeC(1); // isSitting() ? 0 : 1 (at some initial tests it worked) + packet.writeC(_npc.isRunning() ? 1 : 0); + packet.writeC(_npc.isInCombat() ? 1 : 0); + packet.writeC(_npc.isAlikeDead() ? 1 : 0); + packet.writeC(_npc.isInvisible() ? 1 : 0); + packet.writeC(0); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount + packet.writeC(0); // getPrivateStoreType().getId() + packet.writeH(0); // getCubics().size() // getCubics().keySet().forEach(packet::writeH); - packet.writeC(0x00); // isInPartyMatchRoom - + packet.writeC(0); // isInPartyMatchRoom packet.writeD(_npc.getAbnormalVisualEffects()); - packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : 0); - packet.writeH(_fpcHolder.getRecommends()); // Blue value for name (0 = white, 255 = pure blue) - packet.writeD(0x00); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 + packet.writeD(0); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 packet.writeD(_fpcHolder.getClassId()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeC(_fpcHolder.getWeaponEnchantLevel()); // isMounted() ? 0 : _enchantLevel - packet.writeC(_npc.getTeam().getId()); - - packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0x00); + packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0); packet.writeC(_fpcHolder.getNobleLevel()); - packet.writeC(_fpcHolder.isHero() ? 0x01 : 0x00); - - packet.writeC(_fpcHolder.isFishing() ? 0x01 : 0x00); - + packet.writeC(_fpcHolder.isHero() ? 1 : 0); + packet.writeC(_fpcHolder.isFishing() ? 1 : 0); packet.writeD(_fpcHolder.getBaitLocationX()); packet.writeD(_fpcHolder.getBaitLocationY()); packet.writeD(_fpcHolder.getBaitLocationZ()); - packet.writeD(_fpcHolder.getNameColor()); - packet.writeD(_heading); - packet.writeD(_fpcHolder.getPledgeStatus()); - packet.writeD(0x00); // getPledgeType() - + packet.writeD(0); // getPledgeType() packet.writeD(_fpcHolder.getTitleColor()); - - packet.writeD(0x00); // isCursedWeaponEquipped - - packet.writeD(0x00); // getClanId() > 0 ? getClan().getReputationScore() : 0 - + packet.writeD(0); // isCursedWeaponEquipped + packet.writeD(0); // getClanId() > 0 ? getClan().getReputationScore() : 0 // T1 - packet.writeD(0x00); // getTransformationDisplayId() + packet.writeD(0); // getTransformationDisplayId() packet.writeD(_fpcHolder.getAgathionId()); - // T2 - packet.writeD(0x01); - + packet.writeD(1); // T2.3 packet.writeD(_npc.getAbnormalVisualEffectSpecial()); return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java index 5915c933f2..e54b0989e4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java @@ -53,7 +53,6 @@ public class FlyToLocation implements IClientOutgoingPacket _destY = destY; _destZ = destZ; _type = type; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java index d09f0ff65c..4d9654a4af 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java @@ -36,7 +36,7 @@ public class FriendAddRequest implements IClientOutgoingPacket { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); packet.writeS(_requestorName); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendList.java index 40dffceee4..cfca3fd549 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendList.java @@ -73,8 +73,8 @@ public class FriendList implements IClientOutgoingPacket { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online } return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendListExtended.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendListExtended.java index 0773b14f5b..2a6c90febd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendListExtended.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/FriendListExtended.java @@ -86,12 +86,10 @@ public class FriendListExtended implements IClientOutgoingPacket } continue; } - if (player1.isOnline()) { online = true; } - classid = player1.getClassId().getId(); level = player1.getLevel(); _info.add(new FriendInfo(objId, name, online, classid, level)); @@ -107,8 +105,8 @@ public class FriendListExtended implements IClientOutgoingPacket { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._classid); packet.writeD(info._level); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index b7731eb11a..95b2857ac8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -60,7 +60,7 @@ public class GMHennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(0x01); + packet.writeD(1); } return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index 3e613cabe5..d5351e99ba 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -48,7 +48,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -75,22 +74,18 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); packet.writeD(_player.getPkKills()); - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollObjectId(slot)); } - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); } - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollAugmentationId(slot)); } - packet.writeD(_player.getInventory().getTalismanSlots()); // CT2.3 packet.writeD(_player.getInventory().canEquipCloak() ? 1 : 0); // CT2.3 packet.writeD((int) _player.getPAtk(null)); @@ -100,15 +95,11 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAccuracy()); packet.writeD(_player.getCriticalHit(null, null)); packet.writeD((int) _player.getMAtk(null, null)); - packet.writeD(_player.getMAtkSpd()); packet.writeD((int) _player.getPAtkSpd()); - packet.writeD((int) _player.getMDef(null, null)); - packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name packet.writeD(_player.getKarma()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -124,8 +115,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeD(_player.isGM() ? 0x01 : 0x00); // builder level - + packet.writeD(_player.isGM() ? 1 : 0); // builder level packet.writeS(_player.getTitle()); packet.writeD(_player.getClanId()); // pledge id packet.writeD(_player.getClanCrestId()); // pledge crest id @@ -135,26 +125,19 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeC(_player.hasDwarvenCraft() ? 1 : 0); packet.writeD(_player.getPkKills()); packet.writeD(_player.getPvpKills()); - packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); - - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeC(321); - packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window - - packet.writeC(_player.isNoble() ? 0x01 : 0x00); - packet.writeC(_player.isHero() ? 0x01 : 0x00); - + packet.writeC(_player.isNoble() ? 1 : 0); + packet.writeC(_player.isHero() ? 1 : 0); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); - final byte attackAttribute = _player.getAttackElement(); packet.writeH(attackAttribute); packet.writeH(_player.getAttackElementValue(attackAttribute)); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index 9021e2f780..41f151be6f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -57,7 +57,7 @@ public class GMViewItemList extends AbstractItemPacket OutgoingPackets.GM_VIEW_ITEM_LIST.writeId(packet); packet.writeS(_playerName); packet.writeD(_limit); // inventory limit - packet.writeH(0x01); // show window ?? + packet.writeH(1); // show window ?? packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index ed773400eb..fb1dc32aec 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -39,7 +39,7 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeD(_clan.getId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); packet.writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game @@ -49,16 +49,14 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 packet.writeD(_clan.getAllyCrestId()); // c2 packet.writeD(_clan.isAtWar() ? 1 : 0); // c3 - packet.writeD(0x00); // T3 Unknown + packet.writeD(0); // T3 Unknown packet.writeD(_clan.getMembers().length); - for (ClanMember member : _clan.getMembers()) { if (member != null) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java index 8d36ab1a37..dbb8844755 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -14,7 +14,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - package org.l2jmobius.gameserver.network.serverpackets; import java.util.Collection; @@ -42,7 +41,6 @@ public class GMViewSkillInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_SKILL_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeD(_skills.size()); - final boolean isDisabled = (_player.getClan() != null) ? (_player.getClan().getReputationScore() < 0) : false; for (Skill skill : _skills) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index 5b4ee64167..037b2e6b6b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -37,7 +37,6 @@ public class GetItem implements IClientOutgoingPacket OutgoingPackets.GET_ITEM.writeId(packet); packet.writeD(_playerId); packet.writeD(_item.getObjectId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java index 586888a6dc..5b0c45dfff 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java @@ -41,7 +41,6 @@ public class GmViewQuestInfo implements IClientOutgoingPacket { OutgoingPackets.GM_VIEW_QUEST_INFO.writeId(packet); packet.writeS(_player.getName()); - final List questList = _player.getAllActiveQuests(); if (questList.isEmpty()) { @@ -50,20 +49,16 @@ public class GmViewQuestInfo implements IClientOutgoingPacket packet.writeH(0); return true; } - packet.writeH(questList.size()); // quest count - for (Quest q : questList) { packet.writeD(q.getId()); - final QuestState qs = _player.getQuestState(q.getName()); if (qs == null) { packet.writeD(0); continue; } - packet.writeD(qs.getCond()); // stage of quest progress } return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 9ab9f0a836..0b7edbbd7f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -51,7 +51,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeQ(_player.getAdena()); // activeChar current amount of Adena packet.writeD(3); // available equip slot packet.writeD(_hennaEquipList.size()); - for (Henna henna : _hennaEquipList) { // Player must have at least one dye in inventory @@ -62,7 +61,7 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); // item Id of the dye packet.writeQ(henna.getWearCount()); // amount of dyes required packet.writeQ(henna.getWearFee()); // amount of Adena required - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // meet the requirement or not } } return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 484a17d676..94e4bd1530 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -60,7 +60,7 @@ public class HennaInfo implements IClientOutgoingPacket for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(0x01); + packet.writeD(1); } return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index ee3c55cd4b..96723d8e59 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -43,7 +43,7 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getWearCount()); // total amount of dye require packet.writeQ(_henna.getWearFee()); // total amount of Adena require to draw symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to draw or not 0 is false and 1 is true + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to draw or not 0 is false and 1 is true packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeC(_player.getINT() + _henna.getStatINT()); // equip INT diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 1a69e823fe..d98b9295e0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -43,7 +43,7 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getCancelCount()); // total amount of dye require packet.writeQ(_henna.getCancelFee()); // total amount of Adena require to remove symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to remove or not + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to remove or not packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeC(_player.getINT() - _henna.getStatINT()); // equip INT diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 1b4cfefc1e..921240fbbf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -38,9 +38,8 @@ public class HennaRemoveList implements IClientOutgoingPacket { OutgoingPackets.HENNA_UNEQUIP_LIST.writeId(packet); packet.writeQ(_player.getAdena()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(3 - _player.getHennaEmptySlots()); - for (Henna henna : _player.getHennaList()) { if (henna != null) @@ -48,10 +47,10 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(henna.getDyeId()); packet.writeD(henna.getDyeItemId()); packet.writeD(henna.getCancelCount()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(henna.getCancelFee()); - packet.writeD(0x00); - packet.writeD(0x01); + packet.writeD(0); + packet.writeD(1); } } return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index 71d4ae1a14..7372d89f23 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -47,7 +47,7 @@ public class ItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.ITEM_LIST.writeId(packet); - packet.writeH(_showWindow ? 0x01 : 0x00); + packet.writeH(_showWindow ? 1 : 0); packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index 754490c1a9..aa15a065c2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -35,16 +35,15 @@ public class KeyPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VERSION_CHECK.writeId(packet); - packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok for (int i = 0; i < 8; i++) { packet.writeC(_key[i]); // key } - packet.writeD(0x01); + packet.writeD(1); packet.writeD(Config.SERVER_ID); // server id - packet.writeC(0x01); - packet.writeD(0x00); // obfuscation key + packet.writeC(1); + packet.writeD(0); // obfuscation key return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java index 484c10f0c4..62424fd03a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java @@ -40,7 +40,6 @@ public class L2FriendSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_SAY.writeId(packet); - packet.writeD(0); // ?? packet.writeS(_receiver); packet.writeS(_sender); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWating.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWating.java index 65fd1a9b85..9d23424aad 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWating.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWating.java @@ -67,13 +67,12 @@ public class ListPartyWating implements IClientOutgoingPacket OutgoingPackets.LIST_PARTY_WAITING.writeId(packet); if (size > 0) { - packet.writeD(0x01); + packet.writeD(1); } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeD(_rooms.size()); for (PartyMatchRoom room : _rooms) { @@ -94,7 +93,7 @@ public class ListPartyWating implements IClientOutgoingPacket } else { - packet.writeD(0x00); + packet.writeD(0); packet.writeS("Not Found"); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java index 14e5c8f4a1..5f5448f0e6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java @@ -58,7 +58,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet); - packet.writeD(_objectId); packet.writeD(_skillId); packet.writeD(_skillLevel); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 5db308c079..0f547e86a1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -42,11 +42,9 @@ public class MonRaceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MON_RACE_INFO.writeId(packet); - packet.writeD(_unknown1); packet.writeD(_unknown2); - packet.writeD(0x08); - + packet.writeD(8); for (int i = 0; i < 8; i++) { packet.writeD(_monsters[i].getObjectId()); // npcObjectID @@ -68,11 +66,11 @@ public class MonRaceInfo implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } } - packet.writeD(0x00); - packet.writeD(0x00); // CT2.3 special effect + packet.writeD(0); + packet.writeD(0); // CT2.3 special effect } return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java index 0093b3edc9..e6386921ff 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java @@ -45,13 +45,10 @@ public class MoveToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_xDst); packet.writeD(_yDst); packet.writeD(_zDst); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java index 678ad90abb..07fe545ed6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java @@ -49,11 +49,9 @@ public class MoveToPawn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_PAWN.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetId); packet.writeD(_distance); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index c9350fa760..da3d9160de 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -56,28 +56,25 @@ public class MultiSellList implements IClientOutgoingPacket packet.writeD(_finished ? 1 : 0); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - Entry ent; while (_size-- > 0) { ent = _list.getEntries().get(_index++); packet.writeD(ent.getEntryId()); packet.writeC(ent.isStackable() ? 1 : 0); - packet.writeH(0x00); // C6 - packet.writeD(0x00); // C6 - packet.writeD(0x00); // T1 + packet.writeH(0); // C6 + packet.writeD(0); // C6 + packet.writeD(0); // T1 packet.writeH(65534); // T1 - packet.writeH(0x00); // T1 - packet.writeH(0x00); // T1 - packet.writeH(0x00); // T1 - packet.writeH(0x00); // T1 - packet.writeH(0x00); // T1 - packet.writeH(0x00); // T1 - packet.writeH(0x00); // T1 - + packet.writeH(0); // T1 + packet.writeH(0); // T1 + packet.writeH(0); // T1 + packet.writeH(0); // T1 + packet.writeH(0); // T1 + packet.writeH(0); // T1 + packet.writeH(0); // T1 packet.writeH(ent.getProducts().size()); packet.writeH(ent.getIngredients().size()); - for (Ingredient ing : ent.getProducts()) { if (ing.getTemplate() != null) @@ -97,7 +94,7 @@ public class MultiSellList implements IClientOutgoingPacket { packet.writeH(ing.getItemInfo().getEnchantLevel()); // enchant level packet.writeD(ing.getItemInfo().getAugmentId()); // augment id - packet.writeD(0x00); // mana + packet.writeD(0); // mana packet.writeH(ing.getItemInfo().getElementId()); // attack element packet.writeH(ing.getItemInfo().getElementPower()); // element power packet.writeH(ing.getItemInfo().getElementals()[0]); // fire @@ -110,19 +107,18 @@ public class MultiSellList implements IClientOutgoingPacket else { packet.writeH(ing.getEnchantLevel()); // enchant level - packet.writeD(0x00); // augment id - packet.writeD(0x00); // mana - packet.writeH(0x00); // attack element - packet.writeH(0x00); // element power - packet.writeH(0x00); // fire - packet.writeH(0x00); // water - packet.writeH(0x00); // wind - packet.writeH(0x00); // earth - packet.writeH(0x00); // holy - packet.writeH(0x00); // dark + packet.writeD(0); // augment id + packet.writeD(0); // mana + packet.writeH(0); // attack element + packet.writeH(0); // element power + packet.writeH(0); // fire + packet.writeH(0); // water + packet.writeH(0); // wind + packet.writeH(0); // earth + packet.writeH(0); // holy + packet.writeH(0); // dark } } - for (Ingredient ing : ent.getIngredients()) { packet.writeD(ing.getTemplate() != null ? ing.getTemplate().getDisplayId() : ing.getItemId()); @@ -132,7 +128,7 @@ public class MultiSellList implements IClientOutgoingPacket { packet.writeH(ing.getItemInfo().getEnchantLevel()); // enchant level packet.writeD(ing.getItemInfo().getAugmentId()); // augment id - packet.writeD(0x00); // mana + packet.writeD(0); // mana packet.writeH(ing.getItemInfo().getElementId()); // attack element packet.writeH(ing.getItemInfo().getElementPower()); // element power packet.writeH(ing.getItemInfo().getElementals()[0]); // fire @@ -145,16 +141,16 @@ public class MultiSellList implements IClientOutgoingPacket else { packet.writeH(ing.getEnchantLevel()); // enchant level - packet.writeD(0x00); // augment id - packet.writeD(0x00); // mana - packet.writeH(0x00); // attack element - packet.writeH(0x00); // element power - packet.writeH(0x00); // fire - packet.writeH(0x00); // water - packet.writeH(0x00); // wind - packet.writeH(0x00); // earth - packet.writeH(0x00); // holy - packet.writeH(0x00); // dark + packet.writeD(0); // augment id + packet.writeD(0); // mana + packet.writeH(0); // attack element + packet.writeH(0); // element power + packet.writeH(0); // fire + packet.writeH(0); // water + packet.writeH(0); // wind + packet.writeH(0); // earth + packet.writeH(0); // holy + packet.writeH(0); // dark } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java index 7dcf24defa..29265f5734 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java @@ -47,7 +47,7 @@ public class MyTargetSelected implements IClientOutgoingPacket OutgoingPackets.MY_TARGET_SELECTED.writeId(packet); packet.writeD(_objectId); packet.writeH(_color); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java index 86bc9f1a12..590e561339 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java @@ -37,14 +37,12 @@ public class NewCharacterSuccess implements IClientOutgoingPacket { OutgoingPackets.NEW_CHARACTER_SUCCESS.writeId(packet); packet.writeD(_chars.size()); - for (PlayerTemplate chr : _chars) { if (chr == null) { continue; } - // TODO: Unhardcode these packet.writeD(chr.getRace().ordinal()); packet.writeD(chr.getClassId().getId()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index c122c6ea43..eee0eb718e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -54,24 +54,20 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public NpcHtmlMessage(int npcObjId, int itemId) { super(npcObjId); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } public NpcHtmlMessage(int npcObjId, int itemId, String html) { super(npcObjId, html); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java index d3328ade97..fc6d0d4a3a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java @@ -106,7 +106,6 @@ public class NpcSay implements IClientOutgoingPacket { _parameters = new ArrayList<>(); } - for (String item : params) { if ((item != null) && (item.length() > 0)) @@ -127,11 +126,9 @@ public class NpcSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_SAY.writeId(packet); - packet.writeD(_objectId); packet.writeD(_textType.getClientId()); packet.writeD(_npcId); - // Localisation related. if (_lang != null) { @@ -147,7 +144,6 @@ public class NpcSay implements IClientOutgoingPacket } } } - packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java index ffbfcc3f42..141348fdcc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java @@ -36,9 +36,9 @@ public class ObservationMode implements IClientOutgoingPacket packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); - packet.writeC(0x00); // ? + packet.writeC(0); // ? packet.writeC(0xc0); // ? - packet.writeC(0x00); // ? + packet.writeC(0); // ? return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java index 64264d8220..1e296625ad 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java @@ -37,7 +37,7 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket { OutgoingPackets.PARTY_SMALL_WINDOW_ADD.writeId(packet); packet.writeD(_party.getLeaderObjectId()); // c3 - packet.writeD(_party.getDistributionType().getId()); // packet.writeD(0x04); ?? //c3 + packet.writeD(_party.getDistributionType().getId()); // packet.writeD(4); ?? //c3 packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); packet.writeD((int) _member.getCurrentCp()); // c4 @@ -48,8 +48,8 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket packet.writeD(_member.getMaxMp()); packet.writeD(_member.getLevel()); packet.writeD(_member.getClassId().getId()); - packet.writeD(0x00); // ? - packet.writeD(0x00); // ? + packet.writeD(0); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java index f7ef16bf6c..a1a3a3a3a5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java @@ -39,27 +39,24 @@ public class PartySmallWindowAll implements IClientOutgoingPacket packet.writeD(_party.getLeaderObjectId()); packet.writeD(_party.getDistributionType().getId()); packet.writeD(_party.getMemberCount() - 1); - for (Player member : _party.getMembers()) { if ((member != null) && (member != _exclude)) { packet.writeD(member.getObjectId()); packet.writeS(member.getName()); - packet.writeD((int) member.getCurrentCp()); // c4 packet.writeD(member.getMaxCp()); // c4 - packet.writeD((int) member.getCurrentHp()); packet.writeD(member.getMaxHp()); packet.writeD((int) member.getCurrentMp()); packet.writeD(member.getMaxMp()); packet.writeD(member.getLevel()); packet.writeD(member.getClassId().getId()); - packet.writeD(0x00); // packet.writeD(0x01); ?? + packet.writeD(0); // packet.writeD(1); ?? packet.writeD(member.getRace().ordinal()); - packet.writeD(0x00); // T2.3 - packet.writeD(0x00); // T2.3 + packet.writeD(0); // T2.3 + packet.writeD(0); // T2.3 if (member.hasSummon()) { packet.writeD(member.getSummon().getObjectId()); @@ -74,7 +71,7 @@ public class PartySmallWindowAll implements IClientOutgoingPacket } else { - packet.writeD(0x00); + packet.writeD(0); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java index e8697924fa..eba85303cb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java @@ -35,10 +35,8 @@ public class PartySmallWindowUpdate implements IClientOutgoingPacket 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()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java index d778237e99..c0ccab3314 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PetInfo.java @@ -88,7 +88,6 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeD(0); // 1=attackable - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); @@ -110,7 +109,7 @@ public class PetInfo implements IClientOutgoingPacket packet.writeF(_summon.getTemplate().getFCollisionHeight()); packet.writeD(_summon.getWeapon()); // right hand weapon packet.writeD(_summon.getArmor()); // body armor - packet.writeD(0x00); // left hand weapon + packet.writeD(0); // left hand weapon packet.writeC(_summon.getOwner() != null ? 1 : 0); // when pet is dead and player exit game, pet doesn't show master name packet.writeC(_summon.isRunning() ? 1 : 0); // running=1 (it is always 1, walking mode is calculated from multiplier) packet.writeC(_summon.isInCombat() ? 1 : 0); // attacking 1=true @@ -139,7 +138,6 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD((int) _summon.getStat().getSp()); // sp packet.writeD(_summon.getLevel()); // level packet.writeQ(_summon.getStat().getExp()); - if (_summon.getExpForThisLevel() > _summon.getStat().getExp()) { packet.writeQ(_summon.getStat().getExp()); // 0% absolute value @@ -148,7 +146,6 @@ public class PetInfo implements IClientOutgoingPacket { packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value } - packet.writeQ(_summon.getExpForNextLevel()); // 100% absoulte value packet.writeD(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight packet.writeD(_summon.getMaxLoad()); // max weight it can carry @@ -162,12 +159,9 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD((int) _summon.getMoveSpeed()); // speed packet.writeD((int) _summon.getPAtkSpd()); // atkspeed packet.writeD(_summon.getMAtkSpd()); // casting speed - packet.writeD(_summon.getAbnormalVisualEffects()); // c2 abnormal visual effect... bleed=1; poison=2; poison & bleed=3; flame=4; packet.writeH(_summon.isMountable() ? 1 : 0); // c2 ride button - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); // c2 - // Following all added in C4. packet.writeH(0); // ?? packet.writeC(_summon.getTeam().getId()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java index 7b2c200b5e..570988be83 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java @@ -39,12 +39,10 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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 - // clan or subpledge name if (_member.getPledgeType() != 0) { @@ -54,7 +52,6 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket { packet.writeS(_member.getClan().getName()); } - packet.writeS(_member.getApprenticeOrSponsorName()); // name of this member's apprentice/sponsor return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index a997d41772..6032065546 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -44,8 +44,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_SUB_PLEDGE_CREATED.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); packet.writeD(_subPledge.getId()); packet.writeS(_subPledge.getName()); packet.writeS(getLeaderName()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java index 448444a8f6..67358d749b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java @@ -39,9 +39,8 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(packet); - packet.writeD(_tab); // type : 0 = Declared, 1 = Under Attack - packet.writeD(0x00); // page + packet.writeD(0); // page packet.writeD(_tab == 0 ? _clan.getWarList().size() : _clan.getAttackerList().size()); for (Integer i : _tab == 0 ? _clan.getWarList() : _clan.getAttackerList()) { @@ -50,7 +49,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket { continue; } - packet.writeS(clan.getName()); packet.writeD(_tab); // ?? packet.writeD(_tab); // ?? diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java index 1de906d958..3a7961af78 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java @@ -42,8 +42,8 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); // clan reputation score - packet.writeD(0x00); // ? - packet.writeD(0x00); // ? + packet.writeD(0); // ? + packet.writeD(0); // ? packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); // c5 packet.writeD(_clan.getAllyCrestId()); // c5 diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java index 0da5d85014..2fa9f26d4a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java @@ -54,8 +54,8 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); - packet.writeD(0x00); - packet.writeD(0x01); + packet.writeD(0); + packet.writeD(1); packet.writeD(_isOnline); // 1 = online 0 = offline packet.writeD(_pledgeType); return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index a3f55609dc..dac1207398 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -43,12 +43,10 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket _pledgeType = 0; // FIXME: That's wrong on retail sends this whole packet few times (depending how much sub pledges it has) writePledge(packet, 0); - for (SubPledge subPledge : _clan.getAllSubPledges()) { _player.sendPacket(new PledgeReceiveSubPledgeCreated(subPledge, _clan)); } - for (ClanMember m : _members) { if (m.getPledgeType() == 0) @@ -57,7 +55,6 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket } _player.sendPacket(new PledgeShowMemberListAdd(m)); } - // unless this is sent sometimes, the client doesn't recognise the player as the leader _player.sendPacket(new UserInfo(_player)); _player.sendPacket(new ExBrExtraUserInfo(_player)); @@ -67,13 +64,11 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket private void writePledge(PacketWriter packet, int mainOrSubpledge) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(packet); - packet.writeD(mainOrSubpledge); packet.writeD(_clan.getId()); packet.writeD(_pledgeType); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getCrestId()); // crest id .. is used again packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); @@ -81,15 +76,14 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); // 0 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(0); // 0 packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.isAtWar() ? 1 : 0); // new c3 - packet.writeD(0x00); // Territory castle ID + packet.writeD(0); // Territory castle ID packet.writeD(_clan.getSubPledgeMembersCount(_pledgeType)); - for (ClanMember m : _members) { if (m.getPledgeType() != _pledgeType) @@ -107,8 +101,8 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket } else { - packet.writeD(0x01); // no visible effect - packet.writeD(0x01); // packet.writeD(1); + packet.writeD(1); // no visible effect + packet.writeD(1); // packet.writeD(1); } packet.writeD(m.isOnline() ? m.getObjectId() : 0); // objectId = online 0 = offline packet.writeD(m.getSponsor() != 0 ? 1 : 0); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java index 12942534ef..ba7c9a8bfb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java @@ -38,8 +38,8 @@ public class PledgeStatusChanged implements IClientOutgoingPacket packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getAllyId()); packet.writeD(_clan.getAllyCrestId()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java index 288c768538..8f813f3dab 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java @@ -43,9 +43,7 @@ public class PrivateStoreListBuy extends AbstractItemPacket OutgoingPackets.PRIVATE_STORE_BUY_LIST.writeId(packet); packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(_items.size()); - for (TradeItem item : _items) { writeItem(packet, item); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 88a86a9260..1eeaead18d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -43,7 +43,6 @@ public class PrivateStoreListSell extends AbstractItemPacket else { OutgoingPackets.PRIVATE_STORE_SELL_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index e8b3f37f62..6e635404a2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -46,7 +46,6 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket // section 1 packet.writeD(_objId); packet.writeQ(_playerAdena); - // section2 packet.writeD(_itemList.size()); // inventory items for potential buy for (Item item : _itemList) @@ -54,7 +53,6 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - // section 3 packet.writeD(_buyList.size()); // count for all items already added for buy for (TradeItem item : _buyList) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index 37a1eb0ff1..a13d00465b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -49,7 +49,6 @@ public class PrivateStoreManageListSell extends AbstractItemPacket packet.writeD(_objId); packet.writeD(_packageSale ? 1 : 0); // Package sell packet.writeQ(_playerAdena); - // section2 packet.writeD(_itemList.size()); // for potential sells for (TradeItem item : _itemList) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java index 29123c1392..ff5087c1a7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/QuestList.java @@ -68,7 +68,6 @@ public class QuestList implements IClientOutgoingPacket * the 10th but the 6th and 9th are not to be shown at all (not completed, either). * */ - final List quests = _player.getAllActiveQuests(); OutgoingPackets.QUEST_LIST.writeId(packet); packet.writeH(quests.size()); @@ -81,7 +80,6 @@ public class QuestList implements IClientOutgoingPacket packet.writeD(0); continue; } - final int states = qs.getInt("__compltdStateFlags"); if (states > 0) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java index 38af39e88c..5d67413b6f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java @@ -43,9 +43,8 @@ public class RecipeBookItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_BOOK_ITEM_LIST.writeId(packet); - packet.writeD(_isDwarvenCraft ? 0x00 : 0x01); // 0 = Dwarven - 1 = Common + packet.writeD(_isDwarvenCraft ? 0 : 1); // 0 = Dwarven - 1 = Common packet.writeD(_maxMp); - if (_recipes == null) { packet.writeD(0); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java index 429ce8af1e..38b0b8ea4e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java @@ -43,7 +43,6 @@ public class RecipeShopManageList implements IClientOutgoingPacket { _recipes = _seller.getCommonRecipeBook(); } - if (_seller.hasManufactureShop()) { final Iterator it = _seller.getManufactureItems().values().iterator(); @@ -65,8 +64,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket OutgoingPackets.RECIPE_SHOP_MANAGE_LIST.writeId(packet); packet.writeD(_seller.getObjectId()); packet.writeD((int) _seller.getAdena()); - packet.writeD(_isDwarven ? 0x00 : 0x01); - + packet.writeD(_isDwarven ? 0 : 1); if (_recipes == null) { packet.writeD(0); @@ -82,10 +80,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket packet.writeD(count); } } - if (!_seller.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -93,7 +90,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket for (ManufactureItem item : _seller.getManufactureItems().values()) { packet.writeD(item.getRecipeId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeQ(item.getCost()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java index 558bb2a351..8b3cb42f47 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java @@ -42,7 +42,7 @@ public class RecipeShopSellList implements IClientOutgoingPacket packet.writeQ(_buyer.getAdena()); // Buyer Adena if (!_manufacturer.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -50,7 +50,7 @@ public class RecipeShopSellList implements IClientOutgoingPacket for (ManufactureItem temp : _manufacturer.getManufactureItems().values()) { packet.writeD(temp.getRecipeId()); - packet.writeD(0x00); // unknown + packet.writeD(0); // unknown packet.writeQ(temp.getCost()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java index 0fea60abd3..0e43f1f423 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SSQStatus.java @@ -46,22 +46,17 @@ public class SSQStatus implements IClientOutgoingPacket 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? - int dawnPercent = 0; int duskPercent = 0; - switch (_page) { case 1: { // [ddd cc dd ddd c ddd c] packet.writeD(SevenSigns.getInstance().getCurrentCycle()); - final int currentPeriod = SevenSigns.getInstance().getCurrentPeriod(); - switch (currentPeriod) { case SevenSigns.PERIOD_COMP_RECRUITING: @@ -85,7 +80,6 @@ public class SSQStatus implements IClientOutgoingPacket break; } } - switch (currentPeriod) { case SevenSigns.PERIOD_COMP_RECRUITING: @@ -101,19 +95,15 @@ public class SSQStatus implements IClientOutgoingPacket break; } } - packet.writeC(SevenSigns.getInstance().getPlayerCabal(_objectId)); packet.writeC(SevenSigns.getInstance().getPlayerSeal(_objectId)); - packet.writeQ(SevenSigns.getInstance().getPlayerStoneContrib(_objectId)); // Seal Stones Turned-In packet.writeQ(SevenSigns.getInstance().getPlayerAdenaCollect(_objectId)); // Ancient Adena to Collect - 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); final int duskFestivalScore = SevenSigns.getInstance().getCurrentFestivalScore(SevenSigns.CABAL_DUSK); final double totalStoneScore = duskStoneScore + dawnStoneScore; - /* * Scoring seems to be proportionate to a set base value, so base this on the maximum obtainable score from festivals, which is 500. */ @@ -124,7 +114,6 @@ public class SSQStatus implements IClientOutgoingPacket duskStoneScoreProp = Math.round(((float) duskStoneScore / (float) totalStoneScore) * 500); dawnStoneScoreProp = Math.round(((float) dawnStoneScore / (float) totalStoneScore) * 500); } - final int duskTotalScore = SevenSigns.getInstance().getCurrentScore(SevenSigns.CABAL_DUSK); final int dawnTotalScore = SevenSigns.getInstance().getCurrentScore(SevenSigns.CABAL_DAWN); final int totalOverallScore = duskTotalScore + dawnTotalScore; @@ -133,19 +122,15 @@ public class SSQStatus implements IClientOutgoingPacket dawnPercent = Math.round(((float) dawnTotalScore / totalOverallScore) * 100); duskPercent = Math.round(((float) duskTotalScore / totalOverallScore) * 100); } - /* DUSK */ packet.writeQ(duskStoneScoreProp); // Seal Stone Score packet.writeQ(duskFestivalScore); // Festival Score packet.writeQ(duskTotalScore); // Total Score - packet.writeC(duskPercent); // Dusk % - /* DAWN */ packet.writeQ(dawnStoneScoreProp); // Seal Stone Score packet.writeQ(dawnFestivalScore); // Festival Score packet.writeQ(dawnTotalScore); // Total Score - packet.writeC(dawnPercent); // Dawn % break; } @@ -153,26 +138,20 @@ public class SSQStatus implements IClientOutgoingPacket { // c cc hc [cd (dc (S))] packet.writeH(1); - packet.writeC(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]); - final int duskScore = SevenSignsFestival.getInstance().getHighestScore(SevenSigns.CABAL_DUSK, i); final int dawnScore = SevenSignsFestival.getInstance().getHighestScore(SevenSigns.CABAL_DAWN, i); - // Dusk Score \\ packet.writeQ(duskScore); - StatSet highScoreData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DUSK, i); String[] partyMembers = highScoreData.getString("members").split(","); if (partyMembers != null) { packet.writeC(partyMembers.length); - for (String partyMember : partyMembers) { packet.writeS(partyMember); @@ -182,16 +161,13 @@ public class SSQStatus implements IClientOutgoingPacket { packet.writeC(0); } - // Dawn Score \\ packet.writeQ(dawnScore); - highScoreData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DAWN, i); partyMembers = highScoreData.getString("members").split(","); if (partyMembers != null) { packet.writeC(partyMembers.length); - for (String partyMember : partyMembers) { packet.writeS(partyMember); @@ -210,14 +186,12 @@ public class SSQStatus implements IClientOutgoingPacket 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 - 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)); - if (totalDuskMembers == 0) { if (totalDawnMembers == 0) @@ -252,7 +226,6 @@ public class SSQStatus implements IClientOutgoingPacket // c cc [cc (ccD)] CT 2.3 update packet.writeC(winningCabal); // Overall predicted winner packet.writeC(3); // Total number of seals - for (int i = 1; i < 4; i++) { final int dawnProportion = SevenSigns.getInstance().getSealProportion(i, SevenSigns.CABAL_DAWN); @@ -261,7 +234,6 @@ public class SSQStatus implements IClientOutgoingPacket duskPercent = Math.round((duskProportion / (totalDuskMembers == 0 ? 1 : (float) totalDuskMembers)) * 100); final int sealOwner = SevenSigns.getInstance().getSealOwner(i); packet.writeC(i); - switch (sealOwner) { case SevenSigns.CABAL_NULL: diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 9fcd06bdff..13ef62f55f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -50,9 +50,8 @@ public class SellListProcure implements IClientOutgoingPacket { OutgoingPackets.SELL_LIST_PROCURE.writeId(packet); packet.writeQ(_money); // money - packet.writeD(0x00); // lease ? + packet.writeD(0); // lease ? packet.writeH(_sellList.size()); // list size - for (Entry entry : _sellList.entrySet()) { final Item item = entry.getKey(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java index 60cae76a6e..b21bfacf0c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java @@ -38,12 +38,10 @@ public class SendMacroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MACRO_LIST.writeId(packet); - packet.writeD(_rev); // macro change revision (changes after each macro edition) - packet.writeC(0x00); // unknown + packet.writeC(0); // unknown packet.writeC(_count); // count of Macros packet.writeC(_macro != null ? 1 : 0); // unknown - if (_macro != null) { packet.writeD(_macro.getId()); // Macro ID @@ -51,9 +49,7 @@ public class SendMacroList implements IClientOutgoingPacket packet.writeS(_macro.getDescr()); // Desc packet.writeS(_macro.getAcronym()); // acronym packet.writeC(_macro.getIcon()); // icon - packet.writeC(_macro.getCommands().size()); // count - int i = 1; for (MacroCmd cmd : _macro.getCommands()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java index 66de6cb8a8..1513a0e3d1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java @@ -69,8 +69,8 @@ public class ServerObjectInfo implements IClientOutgoingPacket packet.writeF(_collisionHeight); packet.writeD((int) (_isAttackable ? _activeChar.getCurrentHp() : 0)); packet.writeD(_isAttackable ? _activeChar.getMaxHp() : 0); - packet.writeD(0x01); // object type - packet.writeD(0x00); // special effects + packet.writeD(1); // object type + packet.writeD(0); // special effects return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index 1b3708b964..ab6507f0c7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -53,11 +53,10 @@ public class ShopPreviewList implements IClientOutgoingPacket OutgoingPackets.SHOP_PREVIEW_LIST.writeId(packet); packet.writeC(0xC0); // ? packet.writeC(0x13); // ? - packet.writeC(0x00); // ? - packet.writeC(0x00); // ? + packet.writeC(0); // ? + packet.writeC(0); // ? packet.writeQ(_money); // current money packet.writeD(_listId); - int newlength = 0; for (Product product : _list) { @@ -67,23 +66,20 @@ public class ShopPreviewList implements IClientOutgoingPacket } } packet.writeH(newlength); - for (Product product : _list) { if ((product.getItem().getCrystalType().getLevel() <= _expertise) && product.getItem().isEquipable()) { packet.writeD(product.getItemId()); packet.writeH(product.getItem().getType2()); // item type2 - if (product.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { packet.writeH(product.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } else { - packet.writeH(0x00); // 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(0); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } - packet.writeQ(Config.WEAR_PRICE); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index 36f5356bb1..4cc3d06565 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -33,7 +33,6 @@ public class ShortCutInit implements IClientOutgoingPacket { return; } - _shortCuts = player.getAllShortCuts(); } @@ -46,26 +45,25 @@ public class ShortCutInit implements IClientOutgoingPacket { packet.writeD(sc.getType().ordinal()); packet.writeD(sc.getSlot() + (sc.getPage() * 12)); - switch (sc.getType()) { case ITEM: { packet.writeD(sc.getId()); - packet.writeD(0x01); + packet.writeD(1); packet.writeD(sc.getSharedReuseGroup()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeH(0); + packet.writeH(0); break; } case SKILL: { packet.writeD(sc.getId()); packet.writeD(sc.getLevel()); - packet.writeC(0x00); // C5 - packet.writeD(0x01); // C6 + packet.writeC(0); // C5 + packet.writeD(1); // C6 break; } case ACTION: @@ -74,7 +72,7 @@ public class ShortCutInit implements IClientOutgoingPacket case BOOKMARK: { packet.writeD(sc.getId()); - packet.writeD(0x01); // C6 + packet.writeD(1); // C6 } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java index 6a0906771c..dac2bd8488 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java @@ -46,16 +46,16 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeD(_shortcut.getId()); packet.writeD(_shortcut.getCharacterType()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeD(0x00); // unknown - packet.writeD(0x00); // unknown - packet.writeD(0x00); // item augment id + packet.writeD(0); // unknown + packet.writeD(0); // unknown + packet.writeD(0); // item augment id break; } case SKILL: { packet.writeD(_shortcut.getId()); packet.writeD(_shortcut.getLevel()); - packet.writeC(0x00); // C5 + packet.writeC(0); // C5 packet.writeD(_shortcut.getCharacterType()); break; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java index 44ffdf4e01..7d0069def6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = ca
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Attackers Clans?
* d = Number of Attackers Clans
* { //repeats
@@ -67,13 +67,12 @@ public class SiegeAttackerList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(packet); - if (_castle != null) { packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _castle.getSiege().getAttackerClans().size(); if (size > 0) { @@ -87,12 +86,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -101,16 +99,16 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } else { packet.writeD(_hall.getId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final Collection attackers = _hall.getSiege().getAttackerClans(); final int size = attackers.size(); if (size > 0) @@ -124,12 +122,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -138,8 +135,8 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index edb7e824aa..a3adecc0a6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -28,9 +28,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = 0xcb
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Defending Clans?
* d = Number of Defending Clans
* { //repeats
@@ -60,9 +60,9 @@ public class SiegeDefenderList implements IClientOutgoingPacket { OutgoingPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(packet); packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _castle.getSiege().getDefenderClans().size() + _castle.getSiege().getDefenderWaitingClans().size(); if (size > 0) { @@ -77,32 +77,31 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) switch (siegeclan.getType()) { case OWNER: { - packet.writeD(0x01); // owner + packet.writeD(1); // owner break; } case DEFENDER_PENDING: { - packet.writeD(0x02); // approved + packet.writeD(2); // approved break; } case DEFENDER: { - packet.writeD(0x03); // waiting approved + packet.writeD(3); // waiting approved break; } default: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -118,8 +117,8 @@ public class SiegeDefenderList implements IClientOutgoingPacket packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) - packet.writeD(0x02); // waiting approval + 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 @@ -128,8 +127,8 @@ public class SiegeDefenderList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 62cceeee49..c78f0085db 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -71,9 +71,8 @@ public class SiegeInfo implements IClientOutgoingPacket if (_castle != null) { packet.writeD(_castle.getResidenceId()); - final int ownerId = _castle.getOwnerId(); - packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 0x01 : 0x00); + packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0); packet.writeD(ownerId); if (ownerId > 0) { @@ -97,7 +96,6 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { @@ -105,7 +103,7 @@ public class SiegeInfo implements IClientOutgoingPacket cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis()); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(Config.SIEGE_HOUR_LIST.size()); for (int hour : Config.SIEGE_HOUR_LIST) { @@ -116,15 +114,14 @@ public class SiegeInfo implements IClientOutgoingPacket else { packet.writeD((int) (_castle.getSiegeDate().getTimeInMillis() / 1000)); - packet.writeD(0x00); + packet.writeD(0); } } else { packet.writeD(_hall.getId()); - final int ownerId = _hall.getOwnerId(); - packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 0x01 : 0x00); + packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0); packet.writeD(ownerId); if (ownerId > 0) { @@ -148,10 +145,9 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Calendar.getInstance().getTimeInMillis() / 1000)); packet.writeD((int) ((CHSiegeManager.getInstance().getSiegableHall(_hall.getId()).getNextSiegeTime()) / 1000)); - packet.writeD(0x00); // number of choices? + packet.writeD(0); // number of choices? } return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java index 329d02cfa9..f482f8541f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java @@ -54,7 +54,6 @@ public class SkillList implements IClientOutgoingPacket { OutgoingPackets.SKILL_LIST.writeId(packet); packet.writeD(_skills.size()); - for (Skill temp : _skills) { packet.writeD(temp.passive ? 1 : 0); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index de54232b51..ed4615c403 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -41,10 +41,9 @@ public class Snoop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SNOOP.writeId(packet); - packet.writeD(_convoId); packet.writeS(_name); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_type.getClientId()); packet.writeS(_speaker); packet.writeS(_msg); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java index fb2524ddfc..4cecebb53d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java @@ -37,15 +37,6 @@ import org.l2jmobius.gameserver.network.PacketLogger; public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket { - public static final int PRIVATE = 1; - public static final int CLAN = 2; - public static final int CASTLE = 3; // not sure - public static final int FREIGHT = 4; // not sure - - private long _playerAdena; - private List _objects = new ArrayList<>(); - private int _whType; - public enum WarehouseListType { WEAPON, @@ -66,6 +57,11 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket ALL } + public static final int PRIVATE = 1; + public static final int CLAN = 2; + public static final int CASTLE = 3; // not sure + public static final int FREIGHT = 4; // not sure + /** sort order A..Z */ public static final byte A2Z = 1; /** sort order Z..A */ @@ -81,6 +77,10 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket /** Maximum Items to put into list */ public static final int MAX_SORT_LIST_ITEMS = 300; + private long _playerAdena; + private List _objects = new ArrayList<>(); + private int _whType; + /** * This will instantiate the Warehouselist the Player asked for * @param player who calls for the itemlist @@ -98,7 +98,6 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket PacketLogger.warning("Error while sending withdraw request to: " + player.getName()); return; } - switch (itemtype) { case WEAPON: @@ -168,7 +167,6 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket break; } } - try { switch (sortorder) @@ -302,7 +300,6 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket private static class WarehouseItemRecipeComparator implements Comparator { private int order = 0; - private RecipeData rd = null; protected WarehouseItemRecipeComparator(int sortOrder) @@ -336,7 +333,6 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket { return (order == A2Z ? Z2A : A2Z); } - final Integer i1 = rp1.getLevel(); final Integer i2 = rp2.getLevel(); return (order == A2Z ? i1.compareTo(i2) : i2.compareTo(i1)); @@ -346,7 +342,6 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket return 0; } } - final String s1 = o1.getItemName(); final String s2 = o2.getItemName(); return (order == A2Z ? s1.compareTo(s2) : s2.compareTo(s1)); @@ -717,7 +712,6 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket packet.writeH(_whType); packet.writeQ(_playerAdena); packet.writeH(_objects.size()); - for (WarehouseItem item : _objects) { packet.writeD(item.getObjectId()); @@ -726,7 +720,7 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket packet.writeQ(item.getCount()); packet.writeH(item.getItem().getType2()); packet.writeH(item.getCustomType1()); - packet.writeH(0x00); // Can't be equipped in WH + packet.writeH(0); // Can't be equipped in WH packet.writeD(item.getItem().getBodyPart()); packet.writeH(item.getEnchantLevel()); packet.writeH(item.getCustomType2()); @@ -736,7 +730,7 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(item.getMana()); packet.writeD(item.getTime()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index 50572fb2c0..bbaecd7b30 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -33,17 +33,16 @@ public class SpawnItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPAWN_ITEM.writeId(packet); - packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeD(_item.isStackable() ? 0x01 : 0x00); + packet.writeD(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - packet.writeD(0x00); // c2 - packet.writeD(0x00); // freya unk + packet.writeD(0); // c2 + packet.writeD(0); // freya unk return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index 245cf97793..417f278a96 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -33,16 +33,13 @@ public class StatusUpdate implements IClientOutgoingPacket public static final int INT = 0x06; public static final int WIT = 0x07; public static final int MEN = 0x08; - public static final int CUR_HP = 0x09; public static final int MAX_HP = 0x0a; public static final int CUR_MP = 0x0b; public static final int MAX_MP = 0x0c; - public static final int SP = 0x0d; public static final int CUR_LOAD = 0x0e; public static final int MAX_LOAD = 0x0f; - public static final int P_ATK = 0x11; public static final int ATK_SPD = 0x12; public static final int P_DEF = 0x13; @@ -54,7 +51,6 @@ public class StatusUpdate implements IClientOutgoingPacket public static final int M_DEF = 0x19; public static final int PVP_FLAG = 0x1a; public static final int KARMA = 0x1b; - public static final int CUR_CP = 0x21; public static final int MAX_CP = 0x22; @@ -110,7 +106,6 @@ public class StatusUpdate implements IClientOutgoingPacket OutgoingPackets.STATUS_UPDATE.writeId(packet); packet.writeD(_objectId); packet.writeD(_attributes.size()); - for (Attribute temp : _attributes) { packet.writeD(temp.id); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index b79840ec01..d32332bae5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -150,7 +150,6 @@ public class SystemMessage implements IClientOutgoingPacket _smId.setParamCount(_paramIndex + 1); PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } - _params[_paramIndex++] = param; } @@ -256,7 +255,6 @@ public class SystemMessage implements IClientOutgoingPacket { return addString(item.getName()); } - append(new SMParam(TYPE_ITEM_NAME, id)); return this; } @@ -343,7 +341,6 @@ public class SystemMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SYSTEM_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -355,15 +352,13 @@ public class SystemMessage implements IClientOutgoingPacket { params[i] = _params[i].getValue(); } - packet.writeD(SystemMessageId.S1_2.getId()); - packet.writeD(0x01); + packet.writeD(1); packet.writeD(TYPE_TEXT); packet.writeS(sml.getLocalisation(params)); return true; } } - packet.writeD(_smId.getId()); packet.writeD(_params.length); for (SMParam param : _params) @@ -373,7 +368,6 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } - packet.writeD(param.getType()); switch (param.getType()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java index a235ce0bfb..d357efbb0e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java @@ -52,7 +52,7 @@ public class TargetSelected implements IClientOutgoingPacket packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java index adef8a9132..3d7208c06f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java @@ -46,7 +46,7 @@ public class TargetUnselected implements IClientOutgoingPacket packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? return true; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index 7ac753ba7b..461d458678 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -41,12 +41,11 @@ public class TeleportToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TELEPORT_TO_LOCATION.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // Fade 0, Instant 1. + packet.writeD(0); // Fade 0, Instant 1. packet.writeD(_heading); return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java index e832ca1de7..4a2e158ede 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java @@ -37,7 +37,6 @@ public class TradeOtherAdd extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_OTHER_ADD.writeId(packet); - packet.writeH(1); // item count packet.writeH(0); packet.writeD(_item.getObjectId()); @@ -45,12 +44,10 @@ public class TradeOtherAdd extends AbstractItemPacket packet.writeQ(_item.getCount()); packet.writeH(_item.getItem().getType2()); // item type2 packet.writeH(_item.getCustomType1()); - packet.writeD(_item.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand packet.writeH(_item.getEnchant()); // enchant level - packet.writeH(0x00); + packet.writeH(0); packet.writeH(_item.getCustomType2()); - // T1 writeItemElementalAndEnchant(packet, new ItemInfo(_item)); return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java index 29f1666e5f..1aa74ccfef 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java @@ -37,7 +37,6 @@ public class TradeOwnAdd extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_OWN_ADD.writeId(packet); - packet.writeH(1); // items added count packet.writeH(0); packet.writeD(_item.getObjectId()); @@ -45,12 +44,10 @@ public class TradeOwnAdd extends AbstractItemPacket packet.writeQ(_item.getCount()); packet.writeH(_item.getItem().getType2()); // item type2 packet.writeH(_item.getCustomType1()); - packet.writeD(_item.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand packet.writeH(_item.getEnchant()); // enchant level - packet.writeH(0x00); + packet.writeH(0); packet.writeH(_item.getCustomType2()); - // T1 writeItemElementalAndEnchant(packet, new ItemInfo(_item)); return true; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index ba83e5de0f..9efde14385 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -43,7 +43,6 @@ public class TradeStart extends AbstractItemPacket { return false; } - OutgoingPackets.TRADE_START.writeId(packet); packet.writeD(_player.getActiveTradeList().getPartner().getObjectId()); packet.writeH(_itemList.size()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 4b62154fb0..bdce530f90 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -32,7 +32,6 @@ public class UserInfo implements IClientOutgoingPacket private final Player _player; private int _relation; private int _airShipHelm; - private final int _runSpd; private final int _walkSpd; private final int _swimRunSpd; @@ -44,7 +43,6 @@ public class UserInfo implements IClientOutgoingPacket public UserInfo(Player player) { _player = player; - final int _territoryId = TerritoryWarManager.getInstance().getRegisteredTerritoryId(player); _relation = _player.isClanLeader() ? 0x40 : 0; if (_player.getSiegeState() == 1) @@ -71,7 +69,6 @@ public class UserInfo implements IClientOutgoingPacket { _airShipHelm = 0; } - _moveMultiplier = player.getMovementSpeedMultiplier(); _runSpd = (int) Math.round(player.getRunSpeed() / _moveMultiplier); _walkSpd = (int) Math.round(player.getWalkSpeed() / _moveMultiplier); @@ -85,19 +82,15 @@ public class UserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.USER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); packet.writeD(_player.getVehicle() != null ? _player.getVehicle().getObjectId() : 0); - packet.writeD(_player.getObjectId()); packet.writeS(_player.getAppearance().getVisibleName()); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); - packet.writeD(_player.getBaseClass()); - packet.writeD(_player.getLevel()); packet.writeQ(_player.getExp()); packet.writeF((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel()))); // High Five exp % @@ -114,7 +107,6 @@ public class UserInfo implements IClientOutgoingPacket packet.writeD((int) _player.getSp()); packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); - packet.writeD(_player.getActiveWeaponItem() != null ? 40 : 20); // 20 no weapon, 40 weapon equipped for (int slot : getPaperdollOrder()) @@ -141,15 +133,11 @@ public class UserInfo implements IClientOutgoingPacket packet.writeD(_player.getAccuracy()); packet.writeD(_player.getCriticalHit(null, null)); packet.writeD((int) _player.getMAtk(null, null)); - packet.writeD(_player.getMAtkSpd()); packet.writeD((int) _player.getPAtkSpd()); - packet.writeD((int) _player.getMDef(null, null)); - packet.writeD(_player.getPvpFlag()); packet.writeD(_player.getKarma()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -160,10 +148,8 @@ public class UserInfo implements IClientOutgoingPacket packet.writeD(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_player.getAttackSpeedMultiplier()); - packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); - packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); @@ -196,48 +182,37 @@ public class UserInfo implements IClientOutgoingPacket } packet.writeC(_player.isInPartyMatchRoom() ? 1 : 0); - packet.writeD(_player.isInvisible() ? _player.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask() : _player.getAbnormalVisualEffects()); packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); - packet.writeD(_player.getClanPrivileges().getBitmask()); - packet.writeH(_player.getRecomLeft()); // c2 recommendations remaining packet.writeH(_player.getRecomHave()); // c2 recommendations received packet.writeD(_player.getMountNpcId() > 0 ? _player.getMountNpcId() + 1000000 : 0); packet.writeH(_player.getInventoryLimit()); - packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); packet.writeC(_player.isMounted() || (_airShipHelm != 0) ? 0 : _player.getEnchantEffect()); - packet.writeC(_player.getTeam().getId()); - packet.writeD(_player.getClanCrestLargeId()); - packet.writeC(_player.isNoble() ? 1 : 0); // 0x01: symbol on char menu ctrl+I - packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // 0x01: Hero Aura + packet.writeC(_player.isNoble() ? 1 : 0); // 1: symbol on char menu ctrl+I + packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // 1: Hero Aura 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 + packet.writeD(_player.getAppearance().getNameColor()); - // new c5 - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window packet.writeD(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); - packet.writeD(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - // T1 Starts packet.writeD(_player.getTransformationDisplayId()); - final byte attackAttribute = _player.getAttackElement(); packet.writeH(attackAttribute); packet.writeH(_player.getAttackElementValue(attackAttribute)); @@ -247,16 +222,14 @@ public class UserInfo implements IClientOutgoingPacket packet.writeH(_player.getDefenseElementValue(Elementals.EARTH)); packet.writeH(_player.getDefenseElementValue(Elementals.HOLY)); packet.writeH(_player.getDefenseElementValue(Elementals.DARK)); - packet.writeD(_player.getAgathionId()); - // T2 Starts packet.writeD(_player.getFame()); // Fame packet.writeD(_player.isMinimapAllowed() ? 1 : 0); // Minimap on Hellbound packet.writeD(_player.getVitalityPoints()); // Vitality Points packet.writeD(_player.getAbnormalVisualEffectSpecial()); // packet.writeD(_territoryId); // CT2.3 - // packet.writeD((_isDisguised ? 0x01: 0x00)); // CT2.3 + // packet.writeD((_isDisguised ? 1: 0)); // CT2.3 // packet.writeD(_territoryId); // CT2.3 return true; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 16e9b823de..f4e5784249 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -30,6 +30,7 @@ public class WareHouseDepositList extends AbstractItemPacket public static final int CLAN = 4; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private final long _playerAdena; private final List _items = new ArrayList<>(); /** @@ -46,7 +47,6 @@ public class WareHouseDepositList extends AbstractItemPacket { _whType = type; _playerAdena = player.getAdena(); - final boolean isPrivate = _whType == PRIVATE; for (Item temp : player.getInventory().getAvailableItems(true, isPrivate, false)) { @@ -64,7 +64,6 @@ public class WareHouseDepositList extends AbstractItemPacket packet.writeH(_whType); packet.writeQ(_playerAdena); packet.writeH(_items.size()); - for (Item item : _items) { writeItem(packet, item); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index d14f887846..4477cd33a3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -30,6 +30,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public static final int CLAN = 4; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private long _playerAdena; private Collection _items; /** @@ -49,7 +50,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket PacketLogger.warning("Error while sending withdraw request to: " + player.getName()); return; } - _playerAdena = player.getAdena(); _items = player.getActiveWarehouse().getItems(); _whType = type; @@ -62,7 +62,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket packet.writeH(_whType); packet.writeQ(_playerAdena); packet.writeH(_items.size()); - for (Item item : _items) { writeItem(packet, item); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java index 1d59c6d002..e7654ed911 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java @@ -60,7 +60,7 @@ public class AccountKicked implements IOutgoingPacket { OutgoingPackets.ACCOUNT_KICKED.writeId(packet); packet.writeD(_reason.getCode()); - return true; } } + diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 2e3a1f6163..1fe813e393 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: response + * Format: d d: response */ public class GGAuth implements IOutgoingPacket { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/serverpackets/Init.java index 4b3f71f30e..d725f45ca2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/serverpackets/Init.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/serverpackets/Init.java @@ -52,7 +52,6 @@ public class Init implements IOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.INIT.writeId(packet); - packet.writeD(_sessionId); // session id packet.writeD(0x0000c621); // protocol revision diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index 8c534554a8..f4dcd22b00 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: the failure reason + * Format: d d: the failure reason */ public class LoginFail implements IOutgoingPacket { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/BaseRecievePacket.java index c682cb741d..a6ed15ce32 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/BaseRecievePacket.java @@ -73,7 +73,7 @@ public abstract class BaseRecievePacket try { result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE); - result = result.substring(0, result.indexOf(0x00)); + result = result.substring(0, result.indexOf(0)); _off += (result.length() * 2) + 2; } catch (Exception e) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/BaseSendablePacket.java index a9d918de4c..8fa8491cbf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/network/BaseSendablePacket.java @@ -117,16 +117,16 @@ public abstract class BaseSendablePacket public byte[] getBytes() { // if (this instanceof Init) - // writeD(0x00); // reserve for XOR initial key + // writeD(0); // reserve for XOR initial key - writeD(0x00); // reserve for checksum + writeD(0); // reserve for checksum final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++) { - writeC(0x00); + writeC(0); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/AttackType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/AttackType.java index 6064b10ed7..e9983f15e3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/AttackType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/AttackType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum AttackType { - MISSED(0x01), - BLOCKED(0x02), - CRITICAL(0x04), - SHOT_USED(0x08); + MISSED(1), + BLOCKED(2), + CRITICAL(4), + SHOT_USED(8); private final int _mask; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/GroupType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/GroupType.java index 954aaace8b..916a14fd05 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/GroupType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/GroupType.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum GroupType implements IUpdateTypeComponent { - NONE(0x01), - PARTY(0x02), - COMMAND_CHANNEL(0x04); + NONE(1), + PARTY(2), + COMMAND_CHANNEL(4); private int _mask; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/ItemListType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/ItemListType.java index 2d38c8f5b1..c80234439f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/ItemListType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/ItemListType.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum ItemListType implements IUpdateTypeComponent { - AUGMENT_BONUS(0x01), - ELEMENTAL_ATTRIBUTE(0x02), - ENCHANT_EFFECT(0x04), - VISUAL_ID(0x08), - SOUL_CRYSTAL(0x10); + AUGMENT_BONUS(1), + ELEMENTAL_ATTRIBUTE(2), + ENCHANT_EFFECT(4), + VISUAL_ID(8), + SOUL_CRYSTAL(16); private final int _mask; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java index b3d08596c6..29403b783d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum MacroUpdateType { - ADD(0x01), - LIST(0x01), - MODIFY(0x02), - DELETE(0x00); + ADD(1), + LIST(1), + MODIFY(2), + DELETE(0); private final int _id; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java index 86c6159869..7776721c0f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java @@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum PartySmallWindowUpdateType implements IUpdateTypeComponent { - CURRENT_CP(0x01), - MAX_CP(0x02), - CURRENT_HP(0x04), - MAX_HP(0x08), - CURRENT_MP(0x10), - MAX_MP(0x20), - LEVEL(0x40), - CLASS_ID(0x80), - PARTY_SUBSTITUTE(0x100), - VITALITY_POINTS(0x200); + CURRENT_CP(1), + MAX_CP(2), + CURRENT_HP(4), + MAX_HP(8), + CURRENT_MP(16), + MAX_MP(32), + LEVEL(64), + CLASS_ID(128), + PARTY_SUBSTITUTE(256), + VITALITY_POINTS(512); private final int _mask; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 00bb331778..667ce7f17c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.Broadcast; import org.l2jmobius.gameserver.util.Util; /** - * Fromat:(ch) dddddc + * Format:(ch) dddddc * @author -Wooden- */ public class RequestExMagicSkillUseGround implements IClientIncomingPacket diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java index 8744393432..033095e74d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java @@ -39,7 +39,6 @@ public class AbnormalStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ABNORMAL_STATUS_UPDATE.writeId(packet); - packet.writeH(_effects.size()); for (BuffInfo info : _effects) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 1b8ddb2042..bec794bef3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -44,7 +44,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; } @@ -60,7 +59,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; setHtml(html); } @@ -77,13 +75,11 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } - if (!html.contains(""; return; } - _html = html; } @@ -96,7 +92,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } - setHtml(content); return true; } @@ -138,12 +133,10 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { player.clearHtmlActions(getScope()); } - if (_disabledValidation) { return; } - if (player != null) { Util.buildHtmlActionCache(player, getScope(), _npcObjId, _html); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 9964cd1f64..b4b72650cf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -110,12 +110,10 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket= 0) || (item.getAttributeDefence(AttributeType.FIRE) > 0) || (item.getAttributeDefence(AttributeType.WATER) > 0) || (item.getAttributeDefence(AttributeType.WIND) > 0) || (item.getAttributeDefence(AttributeType.EARTH) > 0) || (item.getAttributeDefence(AttributeType.HOLY) > 0) || (item.getAttributeDefence(AttributeType.DARK) > 0)) { mask |= ItemListType.ELEMENTAL_ATTRIBUTE.getMask(); } - if (item.getEnchantOptions() != null) { for (int id : item.getEnchantOptions()) @@ -127,17 +125,14 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket 0) { mask |= ItemListType.VISUAL_ID.getMask(); } - if (((item.getSoulCrystalOptions() != null) && !item.getSoulCrystalOptions().isEmpty()) || ((item.getSoulCrystalSpecialOptions() != null) && !item.getSoulCrystalSpecialOptions().isEmpty())) { mask |= ItemListType.SOUL_CRYSTAL.getMask(); } - return mask; } @@ -205,7 +200,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); packet.writeC(removeSkills.size()); for (Skill removed : removeSkills) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java index 8fa6259f64..6451dffd02 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ActionFailed implements IClientOutgoingPacket { public static final ActionFailed STATIC_PACKET = new ActionFailed(); - private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); + private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); static { for (SkillCastingType castingType : SkillCastingType.values()) @@ -57,7 +57,6 @@ public class ActionFailed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ACTION_FAIL.writeId(packet); - packet.writeD(_castingType); // MagicSkillUse castingType return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java index 6e868368c9..30ce58da60 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java @@ -44,9 +44,8 @@ public class AgitDecoInfo implements IClientOutgoingPacket { continue; } - packet.writeC(_residense.hasFunction(type) ? 0x01 : 0x00); + packet.writeC(_residense.hasFunction(type) ? 1 : 0); } - // Unknown packet.writeD(0); // TODO: Find me! packet.writeD(0); // TODO: Find me! diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java index 6cb71fc985..4683fb30f0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java @@ -44,7 +44,6 @@ public class AllianceInfo implements IClientOutgoingPacket _name = leader.getAllyName(); _leaderC = leader.getName(); _leaderP = leader.getLeaderName(); - final Collection allies = ClanTable.getInstance().getClanAllies(allianceId); _allies = new ClanInfo[allies.size()]; int idx = 0; @@ -57,7 +56,6 @@ public class AllianceInfo implements IClientOutgoingPacket total += ci.getTotal(); online += ci.getOnline(); } - _total = total; _online = online; } @@ -66,18 +64,16 @@ public class AllianceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_INFO.writeId(packet); - packet.writeS(_name); packet.writeD(_total); packet.writeD(_online); packet.writeS(_leaderC); packet.writeS(_leaderP); - packet.writeD(_allies.length); for (ClanInfo aci : _allies) { packet.writeS(aci.getClan().getName()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(aci.getClan().getLevel()); packet.writeS(aci.getClan().getLeaderName()); packet.writeD(aci.getTotal()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java index f9d08f6600..186fd12e81 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java @@ -44,7 +44,6 @@ public class AllyCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java index 6218f1717f..1ae4653f91 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java @@ -38,7 +38,6 @@ public class AskJoinAlly implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_ALLIANCE.writeId(packet); - packet.writeD(_requestorObjId); packet.writeS(null); // Ally Name ? packet.writeS(null); // TODO: Find me! diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java index a66bb3cd33..b9cfbe81b9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java @@ -39,7 +39,6 @@ public class AskJoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_PARTY.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 05c420ff59..227ab571be 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -45,7 +45,6 @@ public class Attack implements IClientOutgoingPacket _attackerObjId = attacker.getObjectId(); _attackerLoc = new Location(attacker); _targetLoc = new Location(target); - final Player player = attacker.getActingPlayer(); if (player == null) { @@ -111,7 +110,6 @@ public class Attack implements IClientOutgoingPacket final Iterator it = _hits.iterator(); final Hit firstHit = it.next(); OutgoingPackets.ATTACK.writeId(packet); - packet.writeD(_attackerObjId); packet.writeD(firstHit.getTargetId()); packet.writeD(_soulshotVisualSubstitute); // Ertheia @@ -121,13 +119,11 @@ public class Attack implements IClientOutgoingPacket packet.writeD(_attackerLoc.getX()); packet.writeD(_attackerLoc.getY()); packet.writeD(_attackerLoc.getZ()); - packet.writeH(_hits.size() - 1); while (it.hasNext()) { writeHit(packet, it.next()); } - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java index bd6878eb42..8b85fe85e3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java @@ -35,7 +35,6 @@ public class AutoAttackStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_START.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java index e767d1877a..a294b1e212 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java @@ -35,7 +35,6 @@ public class AutoAttackStop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_STOP.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java index 3f329415df..0c79677eae 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java @@ -38,7 +38,6 @@ public class BlockListPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BLOCK_LIST.writeId(packet); - packet.writeD(_playersId.size()); for (int playerId : _playersId) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index f610cdc6aa..d95f0543b9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -45,8 +45,7 @@ public class BuyList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x00); // Type BUY + packet.writeD(0); // Type BUY packet.writeQ(_money); // current money packet.writeD(_listId); packet.writeD(_inventorySlots); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index cd25af908d..7cb2bf4425 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -50,36 +50,34 @@ public class BuyListSeed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BUY_LIST_SEED.writeId(packet); - packet.writeQ(_money); // current money - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeD(_manorId); // manor id - if (!_list.isEmpty()) { packet.writeH(_list.size()); // list length for (SeedProduction s : _list) { - packet.writeC(0x00); // mask item 0 to print minimal item information + packet.writeC(0); // mask item 0 to print minimal item information packet.writeD(s.getId()); // ObjectId packet.writeD(s.getId()); // ItemId packet.writeC(0xFF); // T1 packet.writeQ(s.getAmount()); // Quantity - packet.writeC(0x05); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item - packet.writeC(0x00); // Filler (always 0) - packet.writeH(0x00); // Equipped : 00-No, 01-yes - packet.writeQ(0x00); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand - packet.writeH(0x00); // Enchant level (pet level shown in control item) + packet.writeC(5); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item + packet.writeC(0); // Filler (always 0) + packet.writeH(0); // Equipped : 00-No, 01-yes + packet.writeQ(0); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand + packet.writeH(0); // Enchant level (pet level shown in control item) packet.writeD(-1); packet.writeD(-9999); - packet.writeC(0x01); // GOD Item enabled = 1 disabled (red) = 0 + packet.writeC(1); // GOD Item enabled = 1 disabled (red) = 0 packet.writeQ(s.getPrice()); // price } _list.clear(); } else { - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java index 3a7b67af23..f3dc872dca 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java @@ -32,8 +32,7 @@ public class CSShowComBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - - packet.writeC(0x01); // c4 1 to show community 00 to hide + packet.writeC(1); // c4 1 to show community 00 to hide packet.writeB(_html); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java index eacc27aa07..b18dac4cc3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java @@ -36,7 +36,6 @@ public class CameraMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CAMERA_MODE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java index 1682f5bc62..adea754676 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java @@ -39,7 +39,6 @@ public class ChairSit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAIR_SIT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_staticObjectId); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java index 2bc31a285a..de141fa067 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java @@ -38,7 +38,6 @@ public class ChangeMoveType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_MOVE_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_running ? RUN : WALK); packet.writeD(0); // c2 diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index 73277d923d..fbe5e39e2e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -22,17 +22,17 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ChangeWaitType implements IClientOutgoingPacket { + public static final int WT_SITTING = 0; + public static final int WT_STANDING = 1; + public static final int WT_START_FAKEDEATH = 2; + public static final int WT_STOP_FAKEDEATH = 3; + private final int _objectId; private final int _moveType; private final int _x; private final int _y; private final int _z; - public static final int WT_SITTING = 0; - public static final int WT_STANDING = 1; - public static final int WT_START_FAKEDEATH = 2; - public static final int WT_STOP_FAKEDEATH = 3; - public ChangeWaitType(Creature creature, int newMoveType) { _objectId = creature.getObjectId(); @@ -46,7 +46,6 @@ public class ChangeWaitType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_WAIT_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_moveType); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index 41180bac50..aa2e7b2eaa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -30,7 +30,6 @@ public class CharCreateFail implements IClientOutgoingPacket public static final int REASON_CREATE_NOT_ALLOWED = 0x05; // "Characters cannot be created from this server." public static final int REASON_CHOOSE_ANOTHER_SVR = 0x06; // "Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please // choose another server." - private final int _error; public CharCreateFail(int errorCode) @@ -42,7 +41,6 @@ public class CharCreateFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index f0e99885ad..768617e558 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -31,8 +31,7 @@ public class CharCreateOk implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_SUCCESS.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index bed289ca0a..1674eef343 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -33,7 +33,6 @@ public class CharDeleteFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_DELETE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 2ec565e612..36da5daae0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -33,6 +33,22 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { + private static final int[] PAPERDOLL_ORDER = new int[] + { + Inventory.PAPERDOLL_UNDER, + Inventory.PAPERDOLL_HEAD, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_LHAND, + Inventory.PAPERDOLL_GLOVES, + Inventory.PAPERDOLL_CHEST, + Inventory.PAPERDOLL_LEGS, + Inventory.PAPERDOLL_FEET, + Inventory.PAPERDOLL_CLOAK, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_HAIR, + Inventory.PAPERDOLL_HAIR2 + }; + private final Player _player; private final Clan _clan; private int _objId; @@ -55,22 +71,6 @@ public class CharInfo implements IClientOutgoingPacket private int _vehicleId = 0; private final boolean _gmSeeInvis; - private static final int[] PAPERDOLL_ORDER = new int[] - { - Inventory.PAPERDOLL_UNDER, - Inventory.PAPERDOLL_HEAD, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_LHAND, - Inventory.PAPERDOLL_GLOVES, - Inventory.PAPERDOLL_CHEST, - Inventory.PAPERDOLL_LEGS, - Inventory.PAPERDOLL_FEET, - Inventory.PAPERDOLL_CLOAK, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_HAIR, - Inventory.PAPERDOLL_HAIR2 - }; - public CharInfo(Player player, boolean gmSeeInvis) { _player = player; @@ -125,9 +125,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_vehicleId); // Confirmed packet.writeD(_objId); // Confirmed packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed - packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) @@ -151,10 +150,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.getPvpFlag()); packet.writeD(_player.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -165,53 +162,40 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); - packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeS(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle()); - packet.writeD(_player.getAppearance().getVisibleClanId()); packet.writeD(_player.getAppearance().getVisibleClanCrestId()); packet.writeD(_player.getAppearance().getVisibleAllyId()); packet.writeD(_player.getAppearance().getVisibleAllyCrestId()); - - packet.writeC(_player.isSitting() ? 0x00 : 0x01); // Confirmed - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // Confirmed - packet.writeC(_player.isInCombat() ? 0x01 : 0x00); // Confirmed - - packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 0x01 : 0x00); // Confirmed - - packet.writeC(_player.isInvisible() ? 0x01 : 0x00); - + packet.writeC(_player.isSitting() ? 0 : 1); // Confirmed + packet.writeC(_player.isRunning() ? 1 : 0); // Confirmed + packet.writeC(_player.isInCombat() ? 1 : 0); // Confirmed + packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 1 : 0); // Confirmed + packet.writeC(_player.isInvisible() ? 1 : 0); packet.writeC(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount packet.writeC(_player.getPrivateStoreType().getId()); // Confirmed packet.writeH(_player.getCubics().size()); // Confirmed _player.getCubics().keySet().forEach(packet::writeH); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); // Confirmed packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); packet.writeH(_player.getRecomHave()); // Confirmed packet.writeD(_player.getMountNpcId() == 0 ? 0 : _player.getMountNpcId() + 1000000); - packet.writeD(_player.getClassId().getId()); // Confirmed - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeC(_player.isMounted() ? 0 : _enchantLevel); // Confirmed - packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeD(_player.getClanCrestLargeId()); packet.writeC(_player.isNoble() ? 1 : 0); // Confirmed packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed - final ILocational baitLocation = _player.getFishing().getBaitLocation(); if (baitLocation != null) { @@ -227,29 +211,21 @@ public class CharInfo implements IClientOutgoingPacket } packet.writeD(_player.getAppearance().getNameColor()); // Confirmed - packet.writeD(_heading); // Confirmed - packet.writeC(_player.getPledgeClass()); packet.writeH(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); // Confirmed - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - - packet.writeC(0x00); // nPvPRestrainStatus - + packet.writeC(0); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentHp())); // Confirmed packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - - packet.writeC(0x00); // cBRLectureMark + packet.writeC(0); // cBRLectureMark final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed @@ -261,8 +237,9 @@ public class CharInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } + packet.writeC(_player.isTrueHero() ? 100 : 0); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); // Hair accessory + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); // Hair accessory packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 7187b73184..11f5f4df52 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -40,17 +40,16 @@ public class CharSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTED.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getTitle()); packet.writeD(_sessionId); packet.writeD(_player.getClanId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x01); // active ?? + packet.writeD(1); // active ?? packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -62,25 +61,20 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_player.getReputation()); packet.writeD(_player.getPkKills()); packet.writeD(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_player.getClassId().getId()); - packet.writeB(new byte[16]); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeB(new byte[28]); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index ef1a9088a3..ea750c697c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -44,10 +44,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { private static final Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); - private final String _loginName; - private final int _sessionId; - private int _activeId; - private final List _characterPackages; private static final int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { @@ -62,6 +58,11 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_HAIR2, }; + private final String _loginName; + private final int _sessionId; + private int _activeId; + private final List _characterPackages; + /** * Constructor for CharSelectionInfo. * @param loginName @@ -92,16 +93,13 @@ public class CharSelectionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.size(); packet.writeD(size); // Created character count - packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) - packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 0x01 : 0x00); // if 1 can't create new char - packet.writeC(0x01); // 0=can't play, 1=can play free until level 85, 2=100% free play - packet.writeD(0x02); // if 1, Korean client - packet.writeC(0x00); // If 1 suggests premium account - + packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 1 : 0); // if 1 can't create new char + packet.writeC(1); // 0=can't play, 1=can play free until level 85, 2=100% free play + packet.writeD(2); // if 1, Korean client + packet.writeC(0); // If 1 suggests premium account long lastAccess = 0; if (_activeId == -1) { @@ -114,7 +112,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - for (int i = 0; i < size; i++) { final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); @@ -122,90 +119,73 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name packet.writeD(_sessionId); // Account ID - packet.writeD(0x00); // Clan ID - packet.writeD(0x00); // Builder level - + packet.writeD(0); // Clan ID + packet.writeD(0); // Builder level packet.writeD(charInfoPackage.getSex()); // Sex packet.writeD(charInfoPackage.getRace()); // Race packet.writeD(charInfoPackage.getBaseClassId()); - - packet.writeD(0x01); // GameServerName - + packet.writeD(1); // GameServerName packet.writeD(charInfoPackage.getX()); packet.writeD(charInfoPackage.getY()); packet.writeD(charInfoPackage.getZ()); packet.writeF(charInfoPackage.getCurrentHp()); packet.writeF(charInfoPackage.getCurrentMp()); - packet.writeQ(charInfoPackage.getSp()); packet.writeQ(charInfoPackage.getExp()); packet.writeF((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel()))); // High // Five packet.writeD(charInfoPackage.getLevel()); - packet.writeD(charInfoPackage.getReputation()); packet.writeD(charInfoPackage.getPkKills()); packet.writeD(charInfoPackage.getPvPKills()); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); // Ertheia - packet.writeD(0x00); // Ertheia - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); // Ertheia + packet.writeD(0); // Ertheia for (int slot : getPaperdollOrder()) { packet.writeD(charInfoPackage.getPaperdollItemId(slot)); } - for (int slot : getPaperdollOrderVisualId()) { packet.writeD(charInfoPackage.getPaperdollItemVisualId(slot)); } - packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_CHEST)); // Upper Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_LEGS)); // Lower Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_HEAD)); // Headgear enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_GLOVES)); // Gloves enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_FEET)); // Boots enchant level - packet.writeD(charInfoPackage.getHairStyle()); packet.writeD(charInfoPackage.getHairColor()); packet.writeD(charInfoPackage.getFace()); - packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); - packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption1Id() : 0); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption2Id() : 0); - // packet.writeD(charInfoPackage.getTransformId()); // Used to display Transformations - packet.writeD(0x00); // Currently on retail when you are on character select you don't see your transformation. - - packet.writeD(0x00); // Pet NpcId - packet.writeD(0x00); // Pet level - packet.writeD(0x00); // Pet Food - packet.writeD(0x00); // Pet Food Level - packet.writeF(0x00); // Current pet HP - packet.writeF(0x00); // Current pet MP - + packet.writeD(0); // Currently on retail when you are on character select you don't see your transformation. + packet.writeD(0); // Pet NpcId + packet.writeD(0); // Pet level + packet.writeD(0); // Pet Food + packet.writeD(0); // Pet Food Level + packet.writeF(0); // Current pet HP + packet.writeF(0); // Current pet MP packet.writeD(charInfoPackage.getVitalityPoints()); // Vitality packet.writeD((int) Config.RATE_VITALITY_EXP_MULTIPLIER * 100); // Vitality Percent packet.writeD(charInfoPackage.getVitalityItemsUsed()); // Remaining vitality item uses - packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0x00 : 0x01); // Char is active or not - packet.writeC(charInfoPackage.isNoble() ? 0x01 : 0x00); - packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 0x01 : 0x00); // Hero glow - packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 0x01 : 0x00); // Show hair accessory if enabled + packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0 : 1); // Char is active or not + packet.writeC(charInfoPackage.isNoble() ? 1 : 0); + packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 1 : 0); // Hero glow + packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 1 : 0); // Show hair accessory if enabled } return true; } @@ -214,7 +194,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); - try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate")) { @@ -227,7 +206,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (charInfopackage != null) { characterList.add(charInfopackage); - final Player player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { @@ -241,7 +219,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return characterList; } @@ -283,7 +260,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { clan.removeClanMember(objectId, 0); } - GameClient.deleteCharByObjId(objectId); return null; } @@ -302,20 +278,16 @@ public class CharSelectionInfo implements IClientOutgoingPacket charInfopackage.setHairStyle(chardata.getInt("hairstyle")); charInfopackage.setHairColor(chardata.getInt("haircolor")); charInfopackage.setSex(chardata.getInt("sex")); - charInfopackage.setExp(chardata.getLong("exp")); charInfopackage.setSp(chardata.getLong("sp")); charInfopackage.setVitalityPoints(chardata.getInt("vitality_points")); charInfopackage.setClanId(chardata.getInt("clanid")); - charInfopackage.setRace(chardata.getInt("race")); - final int baseClassId = chardata.getInt("base_class"); final int activeClassId = chardata.getInt("classid"); charInfopackage.setX(chardata.getInt("x")); charInfopackage.setY(chardata.getInt("y")); charInfopackage.setZ(chardata.getInt("z")); - final int faction = chardata.getInt("faction"); if (faction == 1) { @@ -325,7 +297,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setEvil(); } - if (Config.MULTILANG_ENABLE) { String lang = chardata.getString("language"); @@ -335,22 +306,18 @@ public class CharSelectionInfo implements IClientOutgoingPacket } charInfopackage.setHtmlPrefix("data/lang/" + lang + "/"); } - // if is in subclass, load subclass exp, sp, level info if (baseClassId != activeClassId) { loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId); } - charInfopackage.setClassId(activeClassId); - // Get the augmentation id for equipped weapon int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); if (weaponObjId < 1) { weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); } - if (weaponObjId > 0) { try (Connection con = DatabaseFactory.getConnection(); @@ -376,7 +343,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } - // Check if the base class is set to zero and also doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly. if ((baseClassId == 0) && (activeClassId > 0)) { @@ -386,7 +352,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setBaseClassId(baseClassId); } - charInfopackage.setDeleteTimer(deletetime); charInfopackage.setLastAccess(chardata.getLong("lastAccess")); charInfopackage.setNoble(chardata.getInt("nobless") == 1); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java index 847e24db87..d59df7911a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java @@ -32,7 +32,6 @@ public class ChooseInventoryItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHOOSE_INVENTORY_ITEM.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java index 12a3940521..ac66c2fa0f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java @@ -32,7 +32,6 @@ public class ClientSetTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CLIENT_SET_TIME.writeId(packet); - packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // time in client minutes packet.writeD(6); // constant to match the server time( this determines the speed of the client clock) return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java index 195824578b..5fdb62f544 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java @@ -68,7 +68,6 @@ public class ConfirmDlg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CONFIRM_DLG.writeId(packet); - final SMParam[] params = _systemMessage.getParams(); packet.writeD(_systemMessage.getId()); packet.writeD(params.length); @@ -130,7 +129,6 @@ public class ConfirmDlg implements IClientOutgoingPacket } } } - packet.writeD(_time); packet.writeD(_requesterId); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 2a98428740..85d5630327 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -71,7 +71,6 @@ public class CreatureSay implements IClientOutgoingPacket _mask |= 0x08; } } - // Does not shows level if (sender.isGM()) { @@ -123,7 +122,6 @@ public class CreatureSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_sender == null ? 0 : _sender.getObjectId()); packet.writeD(_chatType.getClientId()); if (_senderName != null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index dfc40d995f..a307b06e4b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -38,9 +38,8 @@ public class DeleteObject implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DELETE_OBJECT.writeId(packet); - packet.writeD(_objectId); - packet.writeC(0x00); // c2 + packet.writeC(0); // c2 return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java index 982c8f3311..3b5917e55b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java @@ -50,7 +50,6 @@ public class Dice implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DICE.writeId(packet); - packet.writeD(_objectId); // object id of player packet.writeD(_itemId); // item id of dice (spade) 4625,4626,4627,4628 packet.writeD(_number); // number rolled diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 3d741a86a6..ebc93d0fc4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -68,7 +68,6 @@ public class Die implements IClientOutgoingPacket siegeClan = fort.getSiege().getAttackerClan(clan); isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan); } - _toVillage = creature.canRevive() && !creature.isPendingRevive(); _toClanHall = (clan != null) && (clan.getHideoutId() > 0); _toCastle = ((clan != null) && (clan.getCastleId() > 0)) || isInCastleDefense; @@ -76,7 +75,6 @@ public class Die implements IClientOutgoingPacket _useFeather = creature.getAccessLevel().allowFixedRes() || creature.getInventory().haveItemForSelfResurrection(); _toFortress = ((clan != null) && (clan.getFortId() > 0)) || isInFortDefense; } - _isSweepable = creature.isAttackable() && creature.isSweepActive(); } @@ -91,7 +89,6 @@ public class Die implements IClientOutgoingPacket { _items = new ArrayList<>(8); } - if (_items.size() < 8) { _items.add(itemId); @@ -116,20 +113,18 @@ public class Die implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DIE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_toVillage ? 0x01 : 0x00); - packet.writeD(_toClanHall ? 0x01 : 0x00); - packet.writeD(_toCastle ? 0x01 : 0x00); - packet.writeD(_toOutpost ? 0x01 : 0x00); - packet.writeD(_isSweepable ? 0x01 : 0x00); - packet.writeD(_useFeather ? 0x01 : 0x00); - packet.writeD(_toFortress ? 0x01 : 0x00); - packet.writeD(0x00); // Disables use Feather button for X seconds - packet.writeD(0x00); // Adventure's Song - packet.writeC(_hideAnimation ? 0x01 : 0x00); - - packet.writeD(_itemsEnabled ? 0x01 : 0x00); + packet.writeD(_toVillage ? 1 : 0); + packet.writeD(_toClanHall ? 1 : 0); + packet.writeD(_toCastle ? 1 : 0); + packet.writeD(_toOutpost ? 1 : 0); + packet.writeD(_isSweepable ? 1 : 0); + packet.writeD(_useFeather ? 1 : 0); + packet.writeD(_toFortress ? 1 : 0); + packet.writeD(0); // Disables use Feather button for X seconds + packet.writeD(0); // Adventure's Song + packet.writeC(_hideAnimation ? 1 : 0); + packet.writeD(_itemsEnabled ? 1 : 0); packet.writeD(getItems().size()); getItems().forEach(packet::writeD); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java index 15404f9dee..5837faec19 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java @@ -33,7 +33,6 @@ public class DoorInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_INFO.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.getId()); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java index 54f8742a73..14d41afee7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java @@ -33,7 +33,6 @@ public class DoorStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_STATUS_UPDATE.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.isOpen() ? 0 : 1); packet.writeD(_door.getDamage()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index cfa4f6759d..52e04af09c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -40,20 +40,17 @@ public class DropItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DROP_ITEM.writeId(packet); - packet.writeD(_objectId); packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeC(_item.isStackable() ? 0x01 : 0x00); + packet.writeC(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - - packet.writeC(0x00); - // packet.writeD(0x01); if above C == true (1) then packet.readD() + packet.writeC(0); + // packet.writeD(1); if above C == true (1) then packet.readD() return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java index 631c43ba0c..99bd80d97e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java @@ -62,13 +62,12 @@ public class Earthquake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EARTHQUAKE.writeId(packet); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_intensity); packet.writeD(_duration); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index db168592f1..335ea9dced 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -58,7 +58,6 @@ public class EnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_crystal); packet.writeQ(_count); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java index 837be1f5e3..169410245b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java @@ -41,7 +41,6 @@ public class EtcStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ETC_STATUS_UPDATE.writeId(packet); - packet.writeC(_player.getCharges()); // 1-7 increase force, level packet.writeD(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%) packet.writeC(_player.getExpertiseWeaponPenalty()); // Weapon Grade Penalty [1-4] diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java index 5dca90f960..9f8d576148 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java @@ -24,13 +24,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class Ex2ndPasswordAck implements IClientOutgoingPacket { + // TODO: Enum + public static final int SUCCESS = 0; + public static final int WRONG_PATTERN = 1; + private final int _status; private final int _response; - // TODO: Enum - public static final int SUCCESS = 0x00; - public static final int WRONG_PATTERN = 0x01; - public Ex2ndPasswordAck(int status, int response) { _status = status; @@ -41,10 +41,9 @@ public class Ex2ndPasswordAck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_ACK.writeId(packet); - packet.writeC(_status); - packet.writeD(_response == WRONG_PATTERN ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(_response == WRONG_PATTERN ? 1 : 0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java index 48bde5161d..c86b5185d0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordCheck implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_NEW = 0x00; - public static final int PASSWORD_PROMPT = 0x01; - public static final int PASSWORD_OK = 0x02; + public static final int PASSWORD_NEW = 0; + public static final int PASSWORD_PROMPT = 1; + public static final int PASSWORD_OK = 2; private final int _windowType; @@ -40,9 +40,8 @@ public class Ex2ndPasswordCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_CHECK.writeId(packet); - packet.writeD(_windowType); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java index 1abf50ab01..f6731bf18f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordVerify implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_OK = 0x00; - public static final int PASSWORD_WRONG = 0x01; - public static final int PASSWORD_BAN = 0x02; + public static final int PASSWORD_OK = 0; + public static final int PASSWORD_WRONG = 1; + public static final int PASSWORD_BAN = 2; private final int _wrongTentatives; private final int _mode; @@ -42,7 +42,6 @@ public class Ex2ndPasswordVerify implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_VERIFY.writeId(packet); - packet.writeD(_mode); packet.writeD(_wrongTentatives); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java index 55abf718c5..db551344ef 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java @@ -45,10 +45,8 @@ public class ExAbnormalStatusUpdateFromTarget implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ABNORMAL_STATUS_UPDATE_FROM_TARGET.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeH(_effects.size()); - for (BuffInfo info : _effects) { packet.writeD(info.getSkill().getDisplayId()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java index c4b9cd8356..f3abd6ec5c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java @@ -41,7 +41,6 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRABLE_SKILL_LIST_BY_CLASS.writeId(packet); - packet.writeH(_type.getId()); packet.writeH(_learnable.size()); for (SkillLearn skill : _learnable) @@ -54,7 +53,7 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket packet.writeC(skill.getRequiredItems().size()); if (_type == AcquireSkillType.SUBPLEDGE) { - packet.writeH(0x00); + packet.writeH(0); } } return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java index fd0e2fc97c..8555bb6e86 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java @@ -61,7 +61,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_SKILL_INFO.writeId(packet); - packet.writeD(_id); packet.writeD(_level); packet.writeQ(_spCost); @@ -73,7 +72,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket packet.writeD(holder.getId()); packet.writeQ(holder.getCount()); } - packet.writeD(_skillRem.size()); for (Skill skill : _skillRem) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java index 29793f4d6c..ff8c526ec4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java @@ -36,7 +36,6 @@ public class ExAdenaInvenCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ADENA_INVEN_COUNT.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeH(_player.getInventory().getSize()); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java index 2aa2d85bc5..5ef11e0f1e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java @@ -50,13 +50,11 @@ public class ExAirShipInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_INFO.writeId(packet); - packet.writeD(_ship.getObjectId()); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(_captain); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); @@ -73,14 +71,13 @@ public class ExAirShipInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - packet.writeD(_ship.getFuel()); packet.writeD(_ship.getMaxFuel()); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java index 4cfc76bfba..8b37f4fc0a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java @@ -42,7 +42,6 @@ public class ExAirShipStopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_airShipId); packet.writeD(_playerId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java index 33c57712da..52958f931b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java @@ -37,12 +37,10 @@ public class ExAirShipTeleportList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_TELEPORT_LIST.writeId(packet); - packet.writeD(_dockId); if (_teleports != null) { packet.writeD(_teleports.length); - for (int i = 0; i < _teleports.length; i++) { packet.writeD(i - 1); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java index 392b228f0d..7918022c72 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java @@ -50,13 +50,12 @@ public class ExAlchemySkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_SKILL_LIST.writeId(packet); - packet.writeD(_skills.size()); for (Skill skill : _skills) { packet.writeD(skill.getId()); packet.writeD(skill.getLevel()); - packet.writeQ(0x00); // Always 0 on Naia, SP i guess? + packet.writeQ(0); // Always 0 on Naia, SP i guess? packet.writeC(skill.getId() == CommonSkill.ALCHEMY_CUBE.getId() ? 0 : 1); // This is type in flash, visible or not } return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java index 3d7ee12a81..1990e1e701 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java @@ -37,7 +37,6 @@ public class ExAskCoupleAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_COUPLE_ACTION.writeId(packet); - packet.writeD(_actionId); packet.writeD(_objectId); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java index 61cabedd98..45615daf5a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java @@ -39,9 +39,8 @@ public class ExAskJoinMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_MPCC.writeId(packet); - packet.writeS(_requestorName); // name of CCLeader - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java index 17fa9d028f..908022ff7e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java @@ -38,7 +38,6 @@ public class ExAskJoinPartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_PARTY_ROOM.writeId(packet); - packet.writeS(_charName); packet.writeS(_roomName); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java index 2a6b958dc9..1551840013 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java @@ -38,7 +38,6 @@ public class ExAskModifyPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_MODIFY_PARTY_LOOTING.writeId(packet); - packet.writeS(_requestor); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java index 958e7c3d06..fa62c8a207 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java @@ -45,7 +45,6 @@ public class ExAttributeEnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ATTRIBUTE_ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeC(_isWeapon); packet.writeH(_type); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java index 1a3a1ef3fe..3d65055b3c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java @@ -41,9 +41,8 @@ public class ExAutoSoulShot implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AUTO_SOUL_SHOT.writeId(packet); - packet.writeD(_itemId); - packet.writeD(_enable ? 0x01 : 0x00); + packet.writeD(_enable ? 1 : 0); packet.writeD(_type); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java index 8680c6bd7a..a8137347ec 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java @@ -37,8 +37,7 @@ public class ExBaseAttributeCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASE_ATTRIBUTE_CANCEL_RESULT.writeId(packet); - - packet.writeD(0x01); // result + packet.writeD(1); // result packet.writeD(_objId); packet.writeD(_attribute); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java index acbad69599..27f7fb5a63 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java @@ -75,7 +75,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 1149, 1150, 1151, 1152, 1153, 1154, 1155 }; - public static final int[] DEFAULT_ACTION_LIST = { 0, 1, 2, 3, @@ -145,7 +144,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 5012, 5013, 5014, 5015 }; //@formatter:on - public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST); private final int[] _actionIds; @@ -159,7 +157,6 @@ public class ExBasicActionList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASIC_ACTION_LIST.writeId(packet); - packet.writeD(_actionIds.length); for (int _actionId : _actionIds) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java index 4c4fac8c91..d32dca4d21 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java @@ -34,13 +34,14 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBeautyItemList implements IClientOutgoingPacket { - private int _colorCount; - private final BeautyData _beautyData; - private final Map> _colorData = new HashMap<>(); private static final int HAIR_TYPE = 0; private static final int FACE_TYPE = 1; private static final int COLOR_TYPE = 2; + private int _colorCount; + private final BeautyData _beautyData; + private final Map> _colorData = new HashMap<>(); + public ExBeautyItemList(Player player) { _beautyData = BeautyShopData.getInstance().getBeautyData(player.getRace(), player.getAppearance().getSexType()); @@ -60,7 +61,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BEAUTY_ITEM_LIST.writeId(packet); - packet.writeD(HAIR_TYPE); packet.writeD(_beautyData.getHairList().size()); for (BeautyItem hair : _beautyData.getHairList().values()) @@ -72,7 +72,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(hair.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(FACE_TYPE); packet.writeD(_beautyData.getFaceList().size()); for (BeautyItem face : _beautyData.getFaceList().values()) @@ -84,7 +83,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(face.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(COLOR_TYPE); packet.writeD(_colorCount); for (Entry> entry : _colorData.entrySet()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java index 1825236886..6d4c45cb2b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java @@ -34,7 +34,6 @@ public class ExBirthdayPopup implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_BIRTH_DAY.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java index 7d2f17e697..43e525f05f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java @@ -26,6 +26,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBrBroadcastEventState implements IClientOutgoingPacket { + public static final int APRIL_FOOLS = 20090401; + public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) + public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) + public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) + public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) + private final int _eventId; private final int _eventState; private int _param0; @@ -36,12 +42,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket private String _param5; private String _param6; - public static final int APRIL_FOOLS = 20090401; - public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) - public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) - public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) - public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) - public ExBrBroadcastEventState(int eventId, int eventState) { _eventId = eventId; @@ -65,7 +65,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BROADCAST_EVENT_STATE.writeId(packet); - packet.writeD(_eventId); packet.writeD(_eventState); packet.writeD(_param0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java index 1fd7ec663a..c0683c8797 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java @@ -44,7 +44,6 @@ public class ExBrBuffEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUFF_EVENT_STATE.writeId(packet); - packet.writeD(_type); packet.writeD(_value); packet.writeD(_state); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java index 943aae8a62..8e009d7b09 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java @@ -43,7 +43,6 @@ public class ExBrLoadEventTopRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_LOAD_EVENT_TOP_RANKERS.writeId(packet); - packet.writeD(_eventId); packet.writeD(_day); packet.writeD(_count); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java index 0a0ddf31b8..291f7a6b55 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java @@ -36,9 +36,8 @@ public class ExBrPremiumState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PREMIUM_STATE.writeId(packet); - packet.writeD(_player.getObjectId()); - packet.writeC(_player.hasPremiumStatus() || (_player.getVipTier() > 0) ? 0x01 : 0x00); + packet.writeC(_player.hasPremiumStatus() || (_player.getVipTier() > 0) ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 381dd859ad..567cfc70f9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -59,10 +59,8 @@ public class ExBuySellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x01); // Type SELL + packet.writeD(1); // Type SELL packet.writeD(_inventorySlots); - if ((_sellList != null)) { packet.writeH(_sellList.size()); @@ -74,9 +72,8 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - if ((_refundList != null) && !_refundList.isEmpty()) { packet.writeH(_refundList.size()); @@ -90,10 +87,9 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - - packet.writeC(_done ? 0x01 : 0x00); + packet.writeC(_done ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java index 2b43c0ce4b..e0ec81e0e7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java @@ -39,7 +39,6 @@ public class ExCastleState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CASTLE_STATE.writeId(packet); - packet.writeD(_castleId); packet.writeD(_castleSide.ordinal()); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java index b7f90d261b..a8196c7a83 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java @@ -52,7 +52,6 @@ public class ExChangeClientEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_CLIENT_EFFECT_INFO.writeId(packet); - packet.writeD(_type); packet.writeD(_key); packet.writeD(_value); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java index 472abc88df..eea59162ee 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java @@ -37,7 +37,6 @@ public class ExChangeNpcState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NPC_STATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java index 8cdcb4460d..45f2805517 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java @@ -49,7 +49,6 @@ public class ExChangePostState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_POST_STATE.writeId(packet); - packet.writeD(_receivedBoard ? 1 : 0); packet.writeD(_changedMsgIds.length); for (int postId : _changedMsgIds) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java index fc58ec9a2e..d765ab54e0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java @@ -35,7 +35,6 @@ public class ExChangeToAwakenedClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_TO_AWAKENED_CLASS.writeId(packet); - packet.writeD(_classId); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index f51a3eb3ae..1e9b8e9dc8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -47,7 +47,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket throw new IllegalArgumentException("Undefined Atribute item: " + stone); } _level = ElementalAttributeData.getInstance().getMaxElementLevel(_itemId); - // Register only items that can be put an attribute stone/crystal for (Item item : player.getInventory().getItems()) { @@ -62,7 +61,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_INVENTORY_ATTRIBUTE_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeQ(_count); packet.writeD(_atribute == AttributeType.FIRE ? 1 : 0); // Fire diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java index a272d85469..238882cd11 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java @@ -35,7 +35,6 @@ public class ExCloseMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java index d2ecd70952..877bca760a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java @@ -34,7 +34,6 @@ public class ExClosePartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_PARTY_ROOM.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java index 27c112776b..1d02c972b5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java @@ -54,7 +54,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLOSSEUM_FENCE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_clientState); packet.writeD(_x); @@ -62,7 +61,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_width); packet.writeD(_length); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java index 766d3619ad..b72bef93e8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java @@ -37,9 +37,8 @@ public class ExConfirmAddingContact implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AGIT_AUCTION_CMD.writeId(packet); - packet.writeS(_charName); - packet.writeD(_added ? 0x01 : 0x00); + packet.writeD(_added ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java index beded32254..c832d507ed 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameAddPlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x01); - + packet.writeD(1); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java index 5f36f730d0..847ea93e6a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java @@ -45,9 +45,7 @@ public class ExCubeGameChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java index 66abbf4b75..a2f2e61ded 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java @@ -43,12 +43,10 @@ public class ExCubeGameChangeTeam implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x05); - + packet.writeD(5); packet.writeD(_player.getObjectId()); - packet.writeD(_fromRedTeam ? 0x01 : 0x00); - packet.writeD(_fromRedTeam ? 0x00 : 0x01); + packet.writeD(_fromRedTeam ? 1 : 0); + packet.writeD(_fromRedTeam ? 0 : 1); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java index 5273b2099a..136b439283 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java @@ -39,9 +39,7 @@ public class ExCubeGameChangeTimeToStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x03); - + packet.writeD(3); packet.writeD(_seconds); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java index f81a302941..9bdba49029 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java @@ -35,7 +35,6 @@ public class ExCubeGameCloseUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0xffffffff); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java index 259a0e9407..3177e7a488 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java @@ -40,11 +40,9 @@ public class ExCubeGameEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x01); - - packet.writeD(_isRedTeamWin ? 0x01 : 0x00); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(1); + packet.writeD(_isRedTeamWin ? 1 : 0); + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java index 4d89e621ce..8b96bb545f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java @@ -55,14 +55,11 @@ public class ExCubeGameExtendedChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeD(_playerPoints); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java index e5a00f1ab7..c084789f13 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameRemovePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java index 00be884d2f..35a3f289d1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java @@ -35,8 +35,7 @@ public class ExCubeGameRequestReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x04); + packet.writeD(4); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java index 1bc89e0c32..8b755dd3cc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java @@ -30,7 +30,6 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket // Players Lists private final List _bluePlayers; private final List _redPlayers; - // Common Values private final int _roomNumber; @@ -51,12 +50,9 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_roomNumber); packet.writeD(0xffffffff); - packet.writeD(_bluePlayers.size()); for (Player player : _bluePlayers) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java index 2f2c092c08..d000112787 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java @@ -31,7 +31,6 @@ public class ExCursedWeaponList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet); - final Set ids = CursedWeaponsManager.getInstance().getCursedWeaponsIds(); packet.writeD(ids.size()); ids.forEach(packet::writeD); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java index 2f60a1b80c..5bc7ff3238 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java @@ -39,7 +39,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet); - if (!_cursedWeaponInfo.isEmpty()) { packet.writeD(_cursedWeaponInfo.size()); @@ -47,7 +46,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { packet.writeD(w.id); packet.writeD(w.activated); - packet.writeD(w.pos.getX()); packet.writeD(w.pos.getY()); packet.writeD(w.pos.getZ()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java index f475a02b28..0456fb9dae 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java @@ -34,7 +34,6 @@ public class ExDissmissMPCCRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DISSMISS_MPCC_ROOM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java index 258010f717..c731b7c7a9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java @@ -37,7 +37,6 @@ public class ExDuelAskStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_ASK_START.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDuel); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java index 043c82c0db..e9a31bee57 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java @@ -38,7 +38,6 @@ public class ExDuelEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_END.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java index 264409b3d6..e1fa1cea88 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java @@ -38,7 +38,6 @@ public class ExDuelReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_READY.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java index 488aafcb7d..ecdd528a16 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java @@ -38,7 +38,6 @@ public class ExDuelStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_START.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java index 7df040c5e7..5ed0c09675 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java @@ -36,7 +36,6 @@ public class ExDuelUpdateUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_UPDATE_USER_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeD(_player.getClassId().getId()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 7ab055a3d8..f58c0573a8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExEnchantSkillInfo implements IClientOutgoingPacket { private final Set _routes; - private final int _skillId; private final int _skillLevel; private final int _skillSubLevel; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 41368a8efb..e4ee350e64 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -50,7 +50,6 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_INFO_DETAIL.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java index 5cedcd6284..1d32f0d725 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java @@ -43,7 +43,6 @@ public class ExEnchantSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_LIST.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skills.size()); for (Skill skill : _skills) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java index 6ab5e869f2..853d74039f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java @@ -38,7 +38,6 @@ public class ExEnchantSkillResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_RESULT.writeId(packet); - packet.writeD(_enchanted ? 1 : 0); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java index 7b7d2d008d..410bf16510 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java @@ -42,7 +42,6 @@ public class ExEventMatchMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_EVENT_MATCH_MESSAGE.writeId(packet); - packet.writeC(_type); packet.writeS(_message); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java index 7264e90233..1946758bf5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java @@ -37,11 +37,9 @@ public class ExGetBookMarkInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOOK_MARK_INFO.writeId(packet); - - packet.writeD(0x00); // Dummy + packet.writeD(0); // Dummy packet.writeD(_player.getBookMarkSlot()); packet.writeD(_player.getTeleportBookmarks().size()); - for (TeleportBookmark tpbm : _player.getTeleportBookmarks()) { packet.writeD(tpbm.getId()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java index 36e7bb81af..201e8eb49b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java @@ -42,15 +42,14 @@ public class ExGetBossRecord implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOSS_RECORD.writeId(packet); - packet.writeD(_ranking); packet.writeD(_totalPoints); if (_bossRecordInfo == null) { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } else { @@ -59,7 +58,7 @@ public class ExGetBossRecord implements IClientOutgoingPacket { packet.writeD(entry.getKey()); packet.writeD(entry.getValue()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? } } return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java index ea0a5f8b18..85ccad0758 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java @@ -41,7 +41,6 @@ public class ExGetOffAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_OFF_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java index f8e16a4191..9a02e49223 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java @@ -39,7 +39,6 @@ public class ExGetOnAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_ON_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java index 51197344a5..704b3212a1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExGetPremiumItemList implements IClientOutgoingPacket { private final Player _player; - private final Map _map; public ExGetPremiumItemList(Player player) @@ -43,7 +42,6 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_PREMIUM_ITEM_LIST.writeId(packet); - packet.writeD(_map.size()); for (Entry entry : _map.entrySet()) { @@ -51,7 +49,7 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket packet.writeQ(entry.getKey()); packet.writeD(item.getItemId()); packet.writeQ(item.getCount()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeS(item.getSender()); } return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index a005fa8ad8..0200bdee08 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -40,7 +40,6 @@ public class ExHeroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HERO_LIST.writeId(packet); - packet.writeD(_heroList.size()); for (StatSet hero : _heroList.values()) { @@ -51,7 +50,7 @@ public class ExHeroList implements IClientOutgoingPacket packet.writeS(hero.getString(Hero.ALLY_NAME, "")); packet.writeD(hero.getInt(Hero.ALLY_CREST, 0)); packet.writeD(hero.getInt(Hero.COUNT)); - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index f7ab7c4fa3..c424b903be 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -46,7 +46,6 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); - packet.writeD(_currentTemplateId); packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java index 81db66b88f..323c0cdf1e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java @@ -35,7 +35,6 @@ public class ExIsCharNameCreatable implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_IS_CHAR_NAME_CREATABLE.writeId(packet); - packet.writeD(_allowed); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java index ecc751eab3..45def9e0be 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java @@ -38,7 +38,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { throw new NullPointerException(); } - if (currentAuction.getAuctionState() != ItemAuctionState.STARTED) { _timeRemaining = 0; @@ -47,7 +46,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { _timeRemaining = (int) (currentAuction.getFinishingTimeRemaining() / 1000); // in seconds } - _refresh = refresh; _currentAuction = currentAuction; _nextAuction = nextAuction; @@ -57,16 +55,12 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_AUCTION_INFO.writeId(packet); - - packet.writeC(_refresh ? 0x00 : 0x01); + packet.writeC(_refresh ? 0 : 1); packet.writeD(_currentAuction.getInstanceId()); - final ItemAuctionBid highestBid = _currentAuction.getHighestBid(); packet.writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid()); - packet.writeD(_timeRemaining); writeItem(packet, _currentAuction.getItemInfo()); - if (_nextAuction != null) { packet.writeQ(_nextAuction.getAuctionInitBid()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java index 53ad8abd58..1c5e38cbab 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListMpccWaiting implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _rooms = new LinkedList<>(); @@ -53,7 +54,6 @@ public class ExListMpccWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_MPCC_WAITING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 78f2fec636..eafea24fa6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _players = new LinkedList<>(); @@ -60,7 +61,6 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(packet); - packet.writeD(_size); packet.writeD(_players.size()); for (Player player : _players) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java index 786c616875..c8723a9fc0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java @@ -46,7 +46,6 @@ public class ExMPCCPartyInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCPARTY_INFO_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_LeaderOID); packet.writeD(_memberCount); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java index 4bf07f0133..08259e4e6c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java @@ -37,7 +37,6 @@ public class ExMPCCPartymasterList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_PARTYMASTER_LIST.writeId(packet); - packet.writeD(_leadersName.size()); _leadersName.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java index abbdc8fe76..f021ef5f1f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java @@ -36,7 +36,6 @@ public class ExMPCCRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java index 154e156270..2eec590cb4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java @@ -41,7 +41,6 @@ public class ExMPCCRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java index 06e3027bfc..a0e9d0a4b0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java @@ -37,7 +37,6 @@ public class ExMPCCShowPartyMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCSHOW_PARTY_MEMBER_INFO.writeId(packet); - packet.writeD(_party.getMemberCount()); for (Player pc : _party.getMembers()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java index e454a746f3..771b2f22cb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java @@ -49,7 +49,6 @@ public class ExMagicAttackInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAGIC_ATTACK_INFO.writeId(packet); - packet.writeD(_caster); packet.writeD(_target); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java index 9cfbeb5aee..1aaa5b6520 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java @@ -35,7 +35,6 @@ public class ExMailArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAIL_ARRIVED.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java index 983ff22b92..48156c0600 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java @@ -44,7 +44,6 @@ public class ExManageMpccRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MANAGE_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java index f710c006e8..9d7d14211e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java @@ -45,7 +45,6 @@ public class ExMoveToLocationAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_objId); packet.writeD(_tx); packet.writeD(_ty); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java index 3e3bdc9fed..87e44b51cd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java @@ -43,7 +43,6 @@ public class ExMoveToLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java index 7ab0d1c7da..3c1902892a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java @@ -40,11 +40,9 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet); - packet.writeS(_channel.getLeader().getName()); - packet.writeD(0x00); // Channel loot 0 or 1 + packet.writeD(0); // Channel loot 0 or 1 packet.writeD(_channel.getMemberCount()); - packet.writeD(_channel.getParties().size()); for (Party p : _channel.getParties()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java index 1536bd5f9b..f2a32bb6e8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java @@ -43,7 +43,6 @@ public class ExNeedToChangeName implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEED_TO_CHANGE_NAME.writeId(packet); - packet.writeD(_type); packet.writeD(_subType); packet.writeS(_name); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java index be9bec8559..d18b4606b3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java @@ -35,7 +35,6 @@ public class ExNevitAdventEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CHANNELING_EFFECT.writeId(packet); - packet.writeD(_timeLeft); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java index 3a0367c178..09f6250f51 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java @@ -35,7 +35,6 @@ public class ExNevitAdventPointInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_AGATHION_ENERGY_INFO.writeId(packet); - packet.writeD(_points); // 72 = 1%, max 7200 = 100% return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java index 88fdaae499..ef220d86de 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java @@ -37,9 +37,8 @@ public class ExNevitAdventTimeChange implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - // state 0 - pause 1 - started - packet.writeC(_paused ? 0x00 : 0x01); + packet.writeC(_paused ? 0 : 1); // left time in ms max is 16000 its 4m and state is automatically changed to quit packet.writeD(_time); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java index fccdf510cc..4025bf78fa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java @@ -34,7 +34,6 @@ public class ExNewSkillToLearnByLevelUp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEW_SKILL_TO_LEARN_BY_LEVEL_UP.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java index 324c18a517..f2ce8614dc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java @@ -43,8 +43,7 @@ public class ExNoticePostArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTICE_POST_ARRIVED.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java index afe3719d9b..050c7ccea5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java @@ -43,8 +43,7 @@ public class ExNoticePostSent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_WRITE_POST.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java index 5d98c20b09..e0bd08d39a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java @@ -30,7 +30,6 @@ public class ExNotifyPremiumItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_PREMIUM_ITEM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java index 6cb3724448..ba3c0cfeaa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java @@ -34,7 +34,6 @@ public class ExOlympiadMatchEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MATCH_END.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java index 264d5aa484..7ffd5ed3bd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java @@ -55,19 +55,15 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x00); // Type 0 = Match List, 1 = Match Result - + packet.writeD(0); // Type 0 = Match List, 1 = Match Result packet.writeD(_games.size()); - packet.writeD(0x00); - + packet.writeD(0); for (OlympiadGameTask curGame : _games) { final AbstractOlympiadGame game = curGame.getGame(); if (game != null) { packet.writeD(game.getStadiumId()); // Stadium Id (Arena 1 = 0) - if (game instanceof OlympiadGameNonClassed) { packet.writeD(1); @@ -80,8 +76,7 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket { packet.writeD(0); } - - packet.writeD(curGame.isRunning() ? 0x02 : 0x01); // (1 = Standby, 2 = Playing) + packet.writeD(curGame.isRunning() ? 2 : 1); // (1 = Standby, 2 = Playing) packet.writeS(game.getPlayerNames()[0]); // Player 1 Name packet.writeS(game.getPlayerNames()[1]); // Player 2 Name } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java index 712651603d..b387271fba 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java @@ -53,9 +53,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x01); // Type 0 = Match List, 1 = Match Result - + packet.writeD(1); // Type 0 = Match List, 1 = Match Result packet.writeD(_tie ? 1 : 0); // 0 - win, 1 - tie packet.writeS(_winnerList.get(0).getName()); packet.writeD(_winTeam); @@ -69,9 +67,8 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } - packet.writeD(_loseTeam); packet.writeD(_loserList.size()); for (OlympiadInfo info : _loserList) @@ -83,7 +80,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java index 34d81d1f53..712b9e06c6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java @@ -38,7 +38,6 @@ public class ExOlympiadMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MODE.writeId(packet); - packet.writeC(_mode); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java index ebea6c56f3..5b4f2c2523 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java @@ -53,7 +53,6 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_SPELLED_INFO.writeId(packet); - packet.writeD(_playerId); packet.writeD(_effects.size() + _effects2.size()); for (BuffInfo info : _effects) @@ -62,7 +61,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(info.getSkill().getDisplayId()); packet.writeH(info.getSkill().getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(info.getSkill().getAbnormalType().getClientId()); writeOptionalD(packet, info.getSkill().isAura() ? -1 : info.getTime()); } @@ -73,7 +72,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(skill.getDisplayId()); packet.writeH(skill.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(skill.getAbnormalType().getClientId()); packet.writeH(-1); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java index 18c34fe9de..ca473edfcf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java @@ -76,7 +76,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_USER_INFO.writeId(packet); - if (_player != null) { packet.writeC(_player.getOlympiadSide()); @@ -91,7 +90,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket packet.writeS(_par.getName()); packet.writeD(_par.getBaseClass()); } - packet.writeD(_curHp); packet.writeD(_maxHp); packet.writeD(_curCp); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java index e84d0251bd..7ec64cc8c3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java @@ -35,7 +35,6 @@ public class ExOpenMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OPEN_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java index 90349cc1a2..5661dc9f57 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java @@ -56,7 +56,6 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PCCAFE_POINT_INFO.writeId(packet); - packet.writeD(_points); // num points packet.writeD(_mAddPoint); // points inc display packet.writeC(_mPeriodType); // period(0=don't show window,1=acquisition,2=use points) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java index f7e8b4a99a..248a2f7d98 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_ADD.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java index 832bee0012..1f452f4bae 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_DELETE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_summon.getSummonType()); packet.writeD(_summon.getOwner().getObjectId()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java index 0646a67001..703694fa2f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_UPDATE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 0e3edb3ea7..e4c6b79ae0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -47,7 +47,6 @@ public class ExPartyRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2bffdec368..2ebf1dc7f0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -43,10 +43,8 @@ public class ExPetInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class ExPetInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class ExPetInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,9 +154,8 @@ public class ExPetInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -227,28 +205,24 @@ public class ExPetInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PET_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -267,7 +241,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -283,19 +257,19 @@ public class ExPetInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -307,20 +281,20 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -344,12 +318,12 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -379,12 +353,10 @@ public class ExPetInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java index 082f4c7662..0f72c05a3a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java @@ -34,7 +34,6 @@ public class ExPlayScene implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLAY_SCENE.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java index e98d317e14..7e3803bdaa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java @@ -36,7 +36,6 @@ public class ExPledgeCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_COUNT.writeId(packet); - packet.writeD(_count); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java index 838029e284..4084de3481 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java @@ -38,7 +38,6 @@ public class ExPledgeDraftListSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_DRAFT_LIST_SEARCH.writeId(packet); - packet.writeD(_pledgeRecruitList.size()); for (PledgeWaitingInfo prl : _pledgeRecruitList) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java index fb956e9996..44e34004ea 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java @@ -25,11 +25,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExPledgeEmblem implements IClientOutgoingPacket { + private static final int TOTAL_SIZE = 65664; + private final int _crestId; private final int _clanId; private final byte[] _data; private final int _chunkId; - private static final int TOTAL_SIZE = 65664; public ExPledgeEmblem(int crestId, byte[] chunkedData, int clanId, int chunkId) { @@ -43,7 +44,6 @@ public class ExPledgeEmblem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clanId); packet.writeD(_crestId); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java index ed19bf976b..b32f8c0645 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitApplyInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_APPLY_INFO.writeId(packet); - packet.writeD(_status.ordinal()); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java index fc98b7b6f7..af4af9c9c1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitBoardDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_DETAIL.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClanId()); packet.writeD(_pledgeRecruitInfo.getKarma()); packet.writeS(_pledgeRecruitInfo.getInformation()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index b4d48373a6..eda808e754 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -34,7 +34,6 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket private final int _clanOnCurrentPage; private final int _startIndex; private final int _endIndex; - static final int CLAN_PER_PAGE = 12; public ExPledgeRecruitBoardSearch(List clanList, int currentPage) @@ -51,11 +50,9 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_SEARCH.writeId(packet); - packet.writeD(_currentPage); packet.writeD(_totalNumberOfPage); packet.writeD(_clanOnCurrentPage); - for (int i = _startIndex; i < _endIndex; i++) { packet.writeD(_clanList.get(i).getClanId()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 4ae5ffe316..b1f139226d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -40,7 +40,6 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java index 77080a3820..5844f220ec 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java @@ -39,7 +39,6 @@ public class ExPledgeWaitingList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST.writeId(packet); - packet.writeD(pledgePlayerRecruitInfos.size()); for (PledgeApplicantInfo recruitInfo : pledgePlayerRecruitInfos.values()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java index a9245c1309..6b88572057 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java @@ -30,7 +30,6 @@ public class ExPledgeWaitingListAlarm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_ALARM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java index 60997b3da0..28c3967119 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java @@ -40,7 +40,6 @@ public class ExPledgeWaitingListApplied implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_APPLIED.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClan().getId()); packet.writeS(_pledgeRecruitInfo.getClan().getName()); packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java index 66a06892c2..1f53d1bb38 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java @@ -36,7 +36,6 @@ public class ExPledgeWaitingUser implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_USER.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getPlayerId()); packet.writeS(_pledgeRecruitInfo.getMessage()); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java index 49bc9b0995..5f404779f5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java @@ -43,7 +43,6 @@ public class ExPrivateStoreSetWholeMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_objectId); packet.writeS(_msg); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java index cb5e8fbce9..ff996b5d0c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutCommissionResultForVariationMake implements IClientOutgoingPac public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_COMMISSION_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_gemstoneObjId); packet.writeD(_itemId); packet.writeQ(_gemstoneCount); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java index 81721e921f..098472b7ae 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantScrollItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SCROLL_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java index 871f377db2..ffea182a49 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java index c47a4bcff4..8016e128f4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java index c8b46be499..95c0c0e4e1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_INTENSIVE_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_refinerItemObjId); packet.writeD(_lifestoneItemId); packet.writeD(_gemstoneItemId); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 2128b2b19f..2970ca00a2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -41,13 +41,12 @@ public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_CANCEL.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); packet.writeD(_itemAug1); packet.writeD(_itemAug2); packet.writeQ(_price); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java index 80541e65cd..c25dd16b01 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java @@ -34,10 +34,9 @@ public class ExPutItemResultForVariationMake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index b739a94c55..c4d27d1728 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -48,7 +48,6 @@ public class ExQuestItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java index fe5eb74eb0..bc8896164d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java @@ -56,13 +56,12 @@ public class ExQuestNpcLogList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_NPC_LOG_LIST.writeId(packet); - packet.writeD(_questId); packet.writeC(_npcLogList.size()); for (NpcLogListHolder holder : _npcLogList) { packet.writeD(holder.isNpcString() ? holder.getId() : holder.getId() + 1000000); - packet.writeC(holder.isNpcString() ? 0x01 : 0x00); + packet.writeC(holder.isNpcString() ? 1 : 0); packet.writeD(holder.getCount()); } return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java index 62d622caff..60616b256d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java @@ -35,7 +35,6 @@ public class ExRedSky implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RED_SKY.writeId(packet); - packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java index ce40b1a792..163faff855 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java @@ -36,7 +36,6 @@ public class ExRegenMax implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REGEN_MAX.writeId(packet); - packet.writeD(1); packet.writeD(_time); packet.writeD(_tickInterval); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java index d864795cd6..a17525576b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java @@ -34,7 +34,6 @@ public class ExRemoveEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REMOVE_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 29d5eafeef..77458fd485 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -41,7 +41,6 @@ public class ExReplyPostItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_POST_ITEM_LIST.writeId(packet); - packet.writeD(_itemList.size()); for (Item item : _itemList) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 57ed88ac29..4e479e75a6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -56,7 +56,6 @@ public class ExReplyReceivedPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_RECEIVED_POST.writeId(packet); - packet.writeD(_msg.getMailType().ordinal()); // GOD if (_msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED) { @@ -76,11 +75,10 @@ public class ExReplyReceivedPost extends AbstractItemPacket } packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown packet.writeS(_msg.getSenderName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -92,9 +90,8 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeQ(_msg.getReqAdena()); packet.writeD(_msg.hasAttachments() ? 1 : 0); packet.writeD(_msg.isReturned() ? 1 : 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 75f6596194..ed490eae91 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -54,14 +54,12 @@ public class ExReplySentPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_SENT_POST.writeId(packet); - - packet.writeD(0x00); // GOD + packet.writeD(0); // GOD packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); packet.writeS(_msg.getReceiverName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -73,11 +71,11 @@ public class ExReplySentPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeQ(_msg.getReqAdena()); - packet.writeD(_msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(_msg.isReturned() ? 0x01 : 00); + packet.writeD(_msg.hasAttachments() ? 1 : 0); + packet.writeD(_msg.isReturned() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index cc4f7ce1d8..e6a3f9bca2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -35,7 +35,6 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java index 2634aa1cdd..60201b177f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java @@ -35,7 +35,6 @@ public class ExRequestHackShield implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REQUEST_HACK_SHIELD.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java index c51ff31d0b..75e3b3a945 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java @@ -29,13 +29,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyList implements IClientOutgoingPacket { + public static final int SHOW_FACESHAPE = 1; + public static final int SHOW_HAIRSTYLE = 0; + private final Player _player; private final int _type; private final Map _beautyItem; - public static final int SHOW_FACESHAPE = 1; - public static final int SHOW_HAIRSTYLE = 0; - public ExResponseBeautyList(Player player, int type) { _player = player; @@ -54,7 +54,6 @@ public class ExResponseBeautyList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java index ca2ed360ab..4b19201833 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java @@ -25,16 +25,15 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket { + public static final int FAILURE = 0; + public static final int SUCCESS = 1; + public static final int CHANGE = 0; + public static final int RESTORE = 1; + private final Player _player; private final int _type; private final int _result; - public static final int FAILURE = 0; - public static final int SUCCESS = 1; - - public static final int CHANGE = 0; - public static final int RESTORE = 1; - public ExResponseBeautyRegistReset(Player player, int type, int result) { _player = player; @@ -46,7 +45,6 @@ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_REGIST_RESET.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java index 0e313ef3b7..c0922cfb04 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java @@ -36,10 +36,8 @@ public class ExResponseResetList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_RESET_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); - packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java index 01fe1945ef..a230033d67 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java @@ -37,7 +37,6 @@ public class ExRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ROTATION.writeId(packet); - packet.writeD(_charId); packet.writeD(_heading); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index c58ccfc233..2646a71e77 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -36,7 +36,6 @@ public class ExRpItemLink extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RP_ITEM_LINK.writeId(packet); - writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java index 04556bbed2..f0c6eba8e9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java @@ -34,7 +34,6 @@ public class ExSearchOrc implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEARCH_ORC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index 1e06cc2a3f..7a4dced122 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -38,7 +38,6 @@ public class ExSendManorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_MANOR_LIST.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java index b63c69f37e..2c25cc8bfc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java @@ -124,7 +124,6 @@ public class ExSendUIEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_UIEVENT.writeId(packet); - packet.writeD(_objectId); packet.writeD(_type); // 0 = show, 1 = hide (there is 2 = pause and 3 = resume also but they don't work well you can only pause count down and you cannot resume it because resume hides the counter). packet.writeD(0); // unknown diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java index 4378479707..716a3e8623 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java @@ -385,16 +385,13 @@ public class ExServerPrimitive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SERVER_PRIMITIVE.writeId(packet); - packet.writeS(_name); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(65535); // has to do something with display range and angle packet.writeD(65535); // has to do something with display range and angle - packet.writeD(_points.size() + _lines.size()); - for (Point point : _points) { packet.writeC(1); // Its the type in this case Point @@ -408,7 +405,6 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(point.getY()); packet.writeD(point.getZ()); } - for (Line line : _lines) { packet.writeC(2); // Its the type in this case Line diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java index fb32e199b2..51fb91b643 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java @@ -46,7 +46,6 @@ public class ExSetCompassZoneCode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_COMPASS_ZONE_CODE.writeId(packet); - packet.writeD(_zoneType); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java index 1d0fbae3a4..34dee8bda0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java @@ -38,7 +38,6 @@ public class ExSetPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_PARTY_LOOTING.writeId(packet); - packet.writeD(_result); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java index 7b14ec8412..4e491af9d1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java @@ -34,7 +34,6 @@ public class ExShowAdventurerGuideBook implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_ADVENTURER_GUIDE_BOOK.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index 82554fdc5f..1f8df76083 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -39,7 +39,6 @@ public class ExShowAgitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AGIT_INFO.writeId(packet); - final Collection clanHalls = ClanHallData.getInstance().getClanHalls(); packet.writeD(clanHalls.size()); clanHalls.forEach(clanHall -> diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index dd11ee0150..51e6646ff5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -44,7 +44,6 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BASE_ATTRIBUTE_CANCEL_WINDOW.writeId(packet); - packet.writeD(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java index 14e55d39f3..e22345c4fd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java @@ -25,13 +25,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExShowBeautyMenu implements IClientOutgoingPacket { - private final Player _player; - private final int _type; - // TODO: Enum public static final int MODIFY_APPEARANCE = 0; public static final int RESTORE_APPEARANCE = 1; + private final Player _player; + private final int _type; + public ExShowBeautyMenu(Player player, int type) { _player = player; @@ -42,7 +42,6 @@ public class ExShowBeautyMenu implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BEAUTY_MENU.writeId(packet); - packet.writeD(_type); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 6ca5edc29b..c0cd4bc02a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -41,7 +41,6 @@ public class ExShowCastleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CASTLE_INFO.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java index aeb4079f3a..f9a6ebe0e7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java @@ -38,7 +38,6 @@ public class ExShowContactList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_SHOW_POST_FRIEND.writeId(packet); - packet.writeD(_contacts.size()); _contacts.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index a079ea3129..94b989b583 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -37,7 +37,6 @@ public class ExShowCropInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _crops = (nextPeriod && !manor.isManorApproved()) ? null : manor.getCropProcure(manorId, nextPeriod); } @@ -46,10 +45,9 @@ public class ExShowCropInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Crop Sales" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Crop Sales" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); + packet.writeD(0); if (_crops != null) { packet.writeD(_crops.size()); @@ -64,17 +62,17 @@ public class ExShowCropInfo implements IClientOutgoingPacket if (seed == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(seed.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(seed.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(seed.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index ebffd775d8..1f01ee7b87 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -62,10 +62,8 @@ public class ExShowCropSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getCropId()); // crop id diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index ee9fa9fd37..b625a1e4e7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -39,7 +39,6 @@ public class ExShowFortressInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_INFO.writeId(packet); - final Collection forts = FortManager.getInstance().getForts(); packet.writeD(forts.size()); for (Fort fort : forts) @@ -47,7 +46,7 @@ public class ExShowFortressInfo implements IClientOutgoingPacket final Clan clan = fort.getOwnerClan(); packet.writeD(fort.getResidenceId()); packet.writeS(clan != null ? clan.getName() : ""); - packet.writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00); + packet.writeD(fort.getSiege().isInProgress() ? 1 : 0); // Time of possession packet.writeD(fort.getOwnedTime()); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index f389b26ed5..678ab43e96 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -42,11 +42,9 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_MAP_INFO.writeId(packet); - packet.writeD(_fortress.getResidenceId()); packet.writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status packet.writeD(_fortress.getFortSize()); // barracks count - final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId()); if ((commanders != null) && !commanders.isEmpty() && _fortress.getSiege().isInProgress()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 27da99cf41..da186103ae 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -51,7 +51,6 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_SIEGE_INFO.writeId(packet); - packet.writeD(_fortId); // Fortress Id packet.writeD(_size); // Total Barracks Count if (_csize > 0) @@ -64,22 +63,22 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { case 0: { - packet.writeD(0x03); + packet.writeD(3); break; } case 1: { - packet.writeD(0x02); + packet.writeD(2); break; } case 2: { - packet.writeD(0x01); + packet.writeD(1); break; } case 3: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -92,27 +91,27 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket // TODO: once control room supported, update packet.writeD(0x0x) to support 5th room case 0: { - packet.writeD(0x05); + packet.writeD(5); break; } case 1: { - packet.writeD(0x04); + packet.writeD(4); break; } case 2: { - packet.writeD(0x03); + packet.writeD(3); break; } case 3: { - packet.writeD(0x02); + packet.writeD(2); break; } case 4: { - packet.writeD(0x01); + packet.writeD(1); break; } } @@ -124,7 +123,7 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { for (int i = 0; i < _size; i++) { - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java index f7aca7dffd..912839e242 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java @@ -41,8 +41,7 @@ public class ExShowManorDefaultInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_MANOR_DEFAULT_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" and "Crop Sales" buttons + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" and "Crop Sales" buttons packet.writeD(_crops.size()); for (Seed crop : _crops) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 1d3312d668..d03ce2a5fd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -52,10 +52,8 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet); - packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java index cf38d18c1c..f41999329f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java @@ -34,7 +34,6 @@ public class ExShowQuestInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_INFO.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java index 70f31e318f..0fa64c401d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java @@ -37,7 +37,6 @@ public class ExShowQuestMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_MARK.writeId(packet); - packet.writeD(_questId); packet.writeD(_questState); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index ab85228caf..1a6ee00a10 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ExShowReceivedPostList implements IClientOutgoingPacket { - private final List _inbox; - private static final int MESSAGE_FEE = 100; private static final int MESSAGE_FEE_PER_SLOT = 1000; + private final List _inbox; + public ExShowReceivedPostList(int objectId) { _inbox = MailManager.getInstance().getInbox(objectId); @@ -45,7 +45,6 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { @@ -64,18 +63,18 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getSenderName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); + packet.writeD(msg.isUnread() ? 1 : 0); packet.writeD(((msg.getMailType() == MailType.COMMISSION_ITEM_SOLD) || (msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED)) ? 0 : 1); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(msg.isReturned() ? 0x01 : 0x00); - packet.writeD(0x00); // SysString in some case it seems + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(msg.isReturned() ? 1 : 0); + packet.writeD(0); // SysString in some case it seems } } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(MESSAGE_FEE); packet.writeD(MESSAGE_FEE_PER_SLOT); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java index 9679468789..deebb99c8f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java @@ -33,6 +33,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; */ public class ExShowScreenMessage implements IClientOutgoingPacket { + // Positions + public static final byte TOP_LEFT = 1; + public static final byte TOP_CENTER = 2; + public static final byte TOP_RIGHT = 3; + public static final byte MIDDLE_LEFT = 4; + public static final byte MIDDLE_CENTER = 5; + public static final byte MIDDLE_RIGHT = 6; + public static final byte BOTTOM_CENTER = 7; + public static final byte BOTTOM_RIGHT = 8; + private final int _type; private final int _sysMessageId; private final int _unk1; @@ -48,15 +58,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket private List _parameters; // Localisation related. private String _lang; - // Positions - public static final byte TOP_LEFT = 0x01; - public static final byte TOP_CENTER = 0x02; - public static final byte TOP_RIGHT = 0x03; - public static final byte MIDDLE_LEFT = 0x04; - public static final byte MIDDLE_CENTER = 0x05; - public static final byte MIDDLE_RIGHT = 0x06; - public static final byte BOTTOM_CENTER = 0x07; - public static final byte BOTTOM_RIGHT = 0x08; public void setLang(String lang) { @@ -265,7 +266,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SCREEN_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -284,9 +284,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(sml.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -308,9 +308,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -318,7 +318,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket } } } - packet.writeD(_type); packet.writeD(_sysMessageId); packet.writeD(_position); @@ -326,9 +325,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java index 29ab5d355f..6123b08991 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java @@ -37,7 +37,6 @@ public class ExShowSeedInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _seeds = (nextPeriod && !manor.isManorApproved()) ? null : manor.getSeedProduction(manorId, nextPeriod); } @@ -46,16 +45,14 @@ public class ExShowSeedInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown if (_seeds == null) { packet.writeD(0); return true; } - packet.writeD(_seeds.size()); for (SeedProduction seed : _seeds) { @@ -67,17 +64,17 @@ public class ExShowSeedInfo implements IClientOutgoingPacket if (s == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(s.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(s.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(s.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java index 009dce459b..7c757f08a9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java @@ -32,15 +32,12 @@ public class ExShowSeedMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_MAP_INFO.writeId(packet); - packet.writeD(2); // seed count - // Seed of Destruction packet.writeD(-246857); // x coord packet.writeD(251960); // y coord packet.writeD(4331); // z coord packet.writeD(2770 + GraciaSeedsManager.getInstance().getSoDState()); // sys msg id - // Seed of Infinity packet.writeD(-213770); // x coord packet.writeD(210760); // y coord diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index 4fd891a466..373c314eba 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -62,10 +62,8 @@ public class ExShowSeedSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getSeedId()); // seed id diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 1994402da2..269bec5b97 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -47,7 +47,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _cropsItems.put(cropId, item); } } - for (CropProcure crop : CastleManorManager.getInstance().getCropProcure(_manorId, false)) { if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) @@ -61,7 +60,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_cropsItems.size()); // size for (Item item : _cropsItems.values()) @@ -70,9 +68,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket packet.writeD(item.getObjectId()); // Object id packet.writeD(item.getId()); // crop id packet.writeD(seed.getLevel()); // seed level - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(1)); // reward 1 id - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(2)); // reward 2 id if (_castleCrops.containsKey(item.getId())) { @@ -85,9 +83,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket else { packet.writeD(0xFFFFFFFF); // manor - packet.writeQ(0x00); // buy residual - packet.writeQ(0x00); // buy price - packet.writeC(0x00); // reward + packet.writeQ(0); // buy residual + packet.writeQ(0); // buy price + packet.writeC(0); // reward } packet.writeQ(item.getCount()); // my crops } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index db4bccc928..b61d5b2301 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -40,7 +40,6 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { @@ -50,17 +49,17 @@ public class ExShowSentPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getReceiverName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); - packet.writeD(0x01); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(msg.isUnread() ? 1 : 0); + packet.writeD(1); + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(0); } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java index 0e4e9fd2ef..0dca57f2f8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java @@ -48,7 +48,6 @@ public class ExShowTerritory implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TERRITORY.writeId(packet); - packet.writeD(_vertices.size()); packet.writeD(_minZ); packet.writeD(_maxZ); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java index 4e284f82c5..86e1009bbf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java @@ -46,7 +46,6 @@ public class ExShowTrace implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TRACE.writeId(packet); - packet.writeH(0); // type broken in H5 packet.writeD(0); // time broken in H5 packet.writeH(_locations.size()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java index 3245767ed7..836a5c9624 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java @@ -44,7 +44,6 @@ public class ExShowUsm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_USM.writeId(packet); - packet.writeD(_videoId); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java index 4acdffa842..1f1a14c31b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java @@ -34,7 +34,6 @@ public class ExShowVariationCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_CANCEL_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java index 3a2298019e..9870424e26 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java @@ -35,7 +35,6 @@ public class ExShowVariationMakeWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_MAKE_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java index 169827bab3..86211c8d97 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java @@ -44,10 +44,9 @@ public class ExSpawnEmitter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SPAWN_EMITTER.writeId(packet); - packet.writeD(_npcObjectId); packet.writeD(_playerObjectId); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java index 620800c1c4..534549b4fe 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java @@ -36,7 +36,6 @@ public class ExStartScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_START_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java index 0bd990cf34..babac59129 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java index 0e2689d598..d3e67afe99 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipObjId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java index 44b064113f..f5b3e1340f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java @@ -36,7 +36,6 @@ public class ExStopScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index 0b1e077353..7c8def3864 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -66,7 +66,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket } OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet); - packet.writeD(_inventory); packet.writeD(_warehouse); packet.writeD(_freight); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java index 3293a5b557..57563ca2f9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java @@ -39,7 +39,6 @@ public class ExSubPledgeSkillAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUB_PLEDGET_SKILL_ADD.writeId(packet); - packet.writeD(_type); packet.writeD(_skillId); packet.writeD(_skillLevel); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java index d61dfa20ab..816d6f16a6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java @@ -97,7 +97,6 @@ public class ExSubjobInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUBJOB_INFO.writeId(packet); - packet.writeC(_type); packet.writeD(_currClassId); packet.writeD(_currRace); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java index 85616016c7..b7a152629d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java @@ -38,7 +38,6 @@ public class ExTacticalSign implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TACTICAL_SIGN.writeId(packet); - packet.writeD(_target.getObjectId()); packet.writeD(_tokenId); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java index 3486e6281d..9e03a8bd0a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java @@ -39,7 +39,6 @@ public class ExTeleportToLocationActivate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_TO_LOCATION_ACTIVATE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java index a214c53a0f..7bcddd964d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java @@ -27,6 +27,7 @@ public class ExUISetting implements IClientOutgoingPacket { public static final String UI_KEY_MAPPING_VAR = "UI_KEY_MAPPING"; public static final String SPLIT_VAR = " "; + private final byte[] _uiKeyMapping; public ExUISetting(Player player) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java index 187770cfc8..eff4285a8b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java @@ -37,7 +37,6 @@ public class ExUnReadMailCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_UN_READ_MAIL_COUNT.writeId(packet); - packet.writeD(_mailUnreadCount); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java index f992b3c937..e59c651371 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java @@ -41,7 +41,6 @@ public class ExUseSharedGroupItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USE_SHARED_GROUP_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeD(_grpId); packet.writeD(_remainingTime); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java index 474fcc5208..f49d451587 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class ExUserInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getTransformationId()); - final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); final boolean isInvisible = _player.isInvisible(); packet.writeD(abnormalVisualEffects.size() + (isInvisible ? 1 : 0)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java index b841449ab3..1069a64e3e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java @@ -36,12 +36,9 @@ public class ExUserInfoCubic implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_CUBIC.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(_player.getCubics().size()); - _player.getCubics().keySet().forEach(packet::writeH); - packet.writeD(_player.getAgathionId()); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java index 048986d108..7a0d1bfd74 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java @@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExUserInfoEquipSlot extends AbstractMaskPacket { private final Player _player; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -63,11 +62,9 @@ public class ExUserInfoEquipSlot extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_EQUIP_SLOT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(InventorySlot.values().length); packet.writeB(_masks); - final PlayerInventory inventory = _player.getInventory(); for (InventorySlot slot : InventorySlot.values()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java index 3eb1cf9578..d655e48843 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java @@ -36,7 +36,6 @@ public class ExUserInfoInvenWeight implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_INVEN_WEIGHT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java index 91e0e92338..16aa81e9c0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java @@ -44,7 +44,6 @@ public class ExValidateLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java index 727267c9d5..50cb4025e4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java @@ -35,7 +35,6 @@ public class ExVariationCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_CANCEL_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java index 5cdc1b8d0e..4fde190ae2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java @@ -32,14 +32,13 @@ public class ExVariationResult implements IClientOutgoingPacket { _option1 = option1; _option2 = option2; - _success = success ? 0x01 : 0x00; + _success = success ? 1 : 0; } @Override public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_RESULT.writeId(packet); - packet.writeD(_option1); packet.writeD(_option2); packet.writeD(_success); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java index db0acfd5ff..60fb57c0b3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java @@ -41,10 +41,9 @@ public class ExVitalityEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_EFFECT_INFO.writeId(packet); - packet.writeD(_points); packet.writeD(_vitalityBonus); // Vitality Bonus - packet.writeH(0x00); // Vitality additional bonus in % + packet.writeH(0); // Vitality additional bonus in % packet.writeH(_vitalityItemsRemaining); // How much vitality items remaining for use packet.writeH(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java index 3cd9d26602..9a401c2321 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java @@ -35,7 +35,6 @@ public class ExVitalityPointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_POINT_INFO.writeId(packet); - packet.writeD(_vitalityPoints); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java index 71baff96ea..c4c5539ca4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java @@ -45,7 +45,6 @@ public class ExVoteSystemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VOTE_SYSTEM_INFO.writeId(packet); - packet.writeD(_recomLeft); packet.writeD(_recomHave); packet.writeD(_bonusTime); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java index bc41adf7f2..8abcfc022e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java @@ -37,7 +37,6 @@ public class ExWorldChatCnt implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_WORLD_CHAT_CNT.writeId(packet); - packet.writeD(_points); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java index 7e252afb21..2760599847 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java @@ -82,15 +82,13 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // vehicleId + packet.writeD(0); // vehicleId packet.writeD(_objId); packet.writeS(_npc.getName()); - packet.writeH(_npc.getRace().ordinal()); - packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 0x01 : 0x00); + packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 1 : 0); packet.writeD(_fpcHolder.getClassId()); - - packet.writeD(0x00); // Inventory.PAPERDOLL_UNDER + packet.writeD(0); // Inventory.PAPERDOLL_UNDER packet.writeD(_fpcHolder.getEquipHead()); packet.writeD(_fpcHolder.getEquipRHand()); packet.writeD(_fpcHolder.getEquipLHand()); @@ -102,28 +100,22 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_fpcHolder.getEquipRHand()); // dual hand packet.writeD(_fpcHolder.getEquipHair()); packet.writeD(_fpcHolder.getEquipHair2()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderAugument()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } - packet.writeC(_fpcHolder.getArmorEnchantLevel()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderVisualId()) { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeC(_npc.getScriptValue()); // getPvpFlag() packet.writeD(_npc.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -134,16 +126,12 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_npc.getCollisionRadius()); packet.writeF(_npc.getCollisionHeight()); - packet.writeD(_fpcHolder.getHair()); packet.writeD(_fpcHolder.getHairColor()); packet.writeD(_fpcHolder.getFace()); - packet.writeS(_npc.getTemplate().getTitle()); - if (_clan != null) { packet.writeD(_clan.getId()); @@ -153,71 +141,51 @@ public class FakePlayerInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - - packet.writeC(0x01); // isSitting() ? 0x00 : 0x01 (at some initial tests it worked) - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); - packet.writeC(_npc.isInCombat() ? 0x01 : 0x00); - - packet.writeC(_npc.isAlikeDead() ? 0x01 : 0x00); - - packet.writeC(_npc.isInvisible() ? 0x01 : 0x00); - - packet.writeC(0x00); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount - packet.writeC(0x00); // getPrivateStoreType().getId() - - packet.writeH(0x00); // getCubics().size() + packet.writeC(1); // isSitting() ? 0 : 1 (at some initial tests it worked) + packet.writeC(_npc.isRunning() ? 1 : 0); + packet.writeC(_npc.isInCombat() ? 1 : 0); + packet.writeC(_npc.isAlikeDead() ? 1 : 0); + packet.writeC(_npc.isInvisible() ? 1 : 0); + packet.writeC(0); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount + packet.writeC(0); // getPrivateStoreType().getId() + packet.writeH(0); // getCubics().size() // getCubics().keySet().forEach(packet::writeH); - packet.writeC(0x00); - + packet.writeC(0); packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : 0); packet.writeH(_fpcHolder.getRecommends()); - packet.writeD(0x00); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 - + packet.writeD(0); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 packet.writeD(_fpcHolder.getClassId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(_fpcHolder.getWeaponEnchantLevel()); // isMounted() ? 0 : _enchantLevel - packet.writeC(_npc.getTeam().getId()); - - packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0x00); + packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0); packet.writeC(_fpcHolder.getNobleLevel()); - packet.writeC(_fpcHolder.isHero() ? 0x01 : 0x00); - - packet.writeC(_fpcHolder.isFishing() ? 0x01 : 0x00); - + packet.writeC(_fpcHolder.isHero() ? 1 : 0); + packet.writeC(_fpcHolder.isFishing() ? 1 : 0); packet.writeD(_fpcHolder.getBaitLocationX()); packet.writeD(_fpcHolder.getBaitLocationY()); packet.writeD(_fpcHolder.getBaitLocationZ()); - packet.writeD(_fpcHolder.getNameColor()); - packet.writeD(_heading); - packet.writeC(_fpcHolder.getPledgeStatus()); - packet.writeH(0x00); // getPledgeType() - + packet.writeH(0); // getPledgeType() packet.writeD(_fpcHolder.getTitleColor()); - - packet.writeC(0x00); // isCursedWeaponEquipped - - packet.writeD(0x00); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 - packet.writeD(0x00); // getTransformationDisplayId() + packet.writeC(0); // isCursedWeaponEquipped + packet.writeD(0); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 + packet.writeD(0); // getTransformationDisplayId() packet.writeD(_fpcHolder.getAgathionId()); - - packet.writeC(0x00); - - packet.writeD(0x00); // getCurrentCp() + packet.writeC(0); + packet.writeD(0); // getCurrentCp() packet.writeD(_npc.getMaxHp()); packet.writeD((int) Math.round(_npc.getCurrentHp())); packet.writeD(_npc.getMaxMp()); packet.writeD((int) Math.round(_npc.getCurrentMp())); - - packet.writeC(0x00); + packet.writeC(0); final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) @@ -228,9 +196,9 @@ public class FakePlayerInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(0x00); // cocPlayer.getPosition() - packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 0x01 : 0x00); - packet.writeC(0x00); // Used Ability Points + packet.writeC(0); // cocPlayer.getPosition() + packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 1 : 0); + packet.writeC(0); // Used Ability Points return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java index ae088538da..03223c8a3e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java @@ -62,7 +62,6 @@ public class FlyToLocation implements IClientOutgoingPacket _destY = destY; _destZ = destZ; _type = type; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -82,7 +81,6 @@ public class FlyToLocation implements IClientOutgoingPacket _flySpeed = flySpeed; _flyDelay = flyDelay; _animationSpeed = animationSpeed; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -103,7 +101,6 @@ public class FlyToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FLY_TO_LOCATION.writeId(packet); - packet.writeD(_chaObjId); packet.writeD(_destX); packet.writeD(_destY); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java index 1e52b0ef72..471d70f791 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java @@ -35,8 +35,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x01); + packet.writeC(1); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index ef1d37297e..2ee6ffbcd9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -50,25 +50,24 @@ public class GMHennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GMHENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON packet.writeH(_player.getHennaValue(BaseStat.MEN)); // equip MEN packet.writeH(_player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeH(_player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeH(0x00); // equip LUC - packet.writeH(0x00); // equip CHA + packet.writeH(0); // equip LUC + packet.writeH(0); // equip CHA packet.writeD(3); // Slots packet.writeD(_hennas.size()); // Size for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java index 38ca4c7be0..59bf0d9d93 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java @@ -38,7 +38,6 @@ public class GMHide implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_HIDE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index 5e6fadd313..0c7a4684a5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -50,7 +50,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -69,8 +68,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getINT()); packet.writeD(_player.getWIT()); packet.writeD(_player.getMEN()); - packet.writeD(0x00); // LUC - packet.writeD(0x00); // CHA + packet.writeD(0); // LUC + packet.writeD(0); // CHA packet.writeD(_player.getMaxHp()); packet.writeD((int) _player.getCurrentHp()); packet.writeD(_player.getMaxMp()); @@ -79,28 +78,24 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); packet.writeD(_player.getPkKills()); - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollObjectId(slot)); } - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); } - for (int slot : getPaperdollOrder()) { final VariationInstance augment = _player.getInventory().getPaperdollAugmentation(slot); packet.writeD(augment != null ? augment.getOption1Id() : 0); // Confirmed packet.writeD(augment != null ? augment.getOption2Id() : 0); // Confirmed } - packet.writeC(_player.getInventory().getTalismanSlots()); // CT2.3 packet.writeC(_player.getInventory().canEquipCloak() ? 1 : 0); // CT2.3 - packet.writeD(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeH(0); packet.writeD(_player.getPAtk()); packet.writeD(_player.getPAtkSpd()); packet.writeD(_player.getPDef()); @@ -108,18 +103,14 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAccuracy()); packet.writeD(_player.getCriticalHit()); packet.writeD(_player.getMAtk()); - packet.writeD(_player.getMAtkSpd()); packet.writeD(_player.getPAtkSpd()); - packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicEvasionRate()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name packet.writeD(_player.getReputation()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -135,8 +126,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeD(_player.isGM() ? 0x01 : 0x00); // builder level - + packet.writeD(_player.isGM() ? 1 : 0); // builder level packet.writeS(_player.getTitle()); packet.writeD(_player.getClanId()); // pledge id packet.writeD(_player.getClanCrestId()); // pledge crest id @@ -146,26 +136,19 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeC(_player.hasDwarvenCraft() ? 1 : 0); packet.writeD(_player.getPkKills()); packet.writeD(_player.getPvpKills()); - packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); - - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeC(321); - packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window - - packet.writeC(_player.isNoble() ? 0x01 : 0x00); - packet.writeC(_player.isHero() ? 0x01 : 0x00); - + packet.writeC(_player.isNoble() ? 1 : 0); + packet.writeC(_player.isHero() ? 1 : 0); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); - final AttributeType attackAttribute = _player.getAttackElement(); packet.writeH(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); @@ -175,8 +158,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket } packet.writeD(_player.getFame()); packet.writeD(_player.getVitalityPoints()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index f212539af7..41f151be6f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -55,10 +55,9 @@ public class GMViewItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_ITEM_LIST.writeId(packet); - packet.writeS(_playerName); packet.writeD(_limit); // inventory limit - packet.writeH(0x01); // show window ?? + packet.writeH(1); // show window ?? packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index 1d88596096..552b6e6168 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -37,14 +37,12 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_player.getName()); packet.writeD(_clan.getId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); @@ -52,15 +50,14 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 packet.writeD(_clan.getAllyCrestId()); // c2 packet.writeD(_clan.isAtWar() ? 1 : 0); // c3 - packet.writeD(0x00); // T3 Unknown - + packet.writeD(0); // T3 Unknown packet.writeD(_clan.getMembers().size()); for (ClanMember member : _clan.getMembers()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java index 93af10e254..3c155ff816 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -38,10 +38,8 @@ public class GMViewSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_SKILL_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_skills.size()); - final boolean isDisabled = (_player.getClan() != null) && (_player.getClan().getReputationScore() < 0); for (Skill skill : _skills) { @@ -49,7 +47,7 @@ public class GMViewSkillInfo implements IClientOutgoingPacket packet.writeH(skill.getDisplayLevel()); packet.writeH(skill.getSubLevel()); packet.writeD(skill.getDisplayId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(isDisabled && skill.isClanSkill() ? 1 : 0); packet.writeC(skill.isEnchantable() ? 1 : 0); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java index d8c273f914..449271993b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java @@ -35,7 +35,6 @@ public class GameGuardQuery implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GAME_GUARD_QUERY.writeId(packet); - packet.writeD(0x27533DD9); packet.writeD(0x2E72A51D); packet.writeD(0x2017038B); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index b0c011b696..037b2e6b6b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -35,10 +35,8 @@ public class GetItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ITEM.writeId(packet); - packet.writeD(_playerId); packet.writeD(_item.getObjectId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java index f8c6126c87..5f4d7bf3ca 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java @@ -50,7 +50,6 @@ public class GetOffVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_OFF_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java index ffa8d5f310..77d1e6ba28 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java @@ -45,7 +45,6 @@ public class GetOnVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ON_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java index e5dcb9ded6..b1f5b588f9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java @@ -44,14 +44,13 @@ public class GmViewQuestInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_QUEST_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeH(_questList.size()); // quest count - for (Quest quest : _questList) { final QuestState qs = _player.getQuestState(quest.getName()); packet.writeD(quest.getId()); packet.writeD(qs == null ? 0 : qs.getCond()); } - packet.writeH(0x00); // some size + packet.writeH(0); // some size // for size; ddQQ return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 9ab9f0a836..0b7edbbd7f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -51,7 +51,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeQ(_player.getAdena()); // activeChar current amount of Adena packet.writeD(3); // available equip slot packet.writeD(_hennaEquipList.size()); - for (Henna henna : _hennaEquipList) { // Player must have at least one dye in inventory @@ -62,7 +61,7 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); // item Id of the dye packet.writeQ(henna.getWearCount()); // amount of dyes required packet.writeQ(henna.getWearFee()); // amount of Adena required - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // meet the requirement or not } } return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 0e6e64c7b2..23364ad722 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -50,25 +50,24 @@ public class HennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON packet.writeH(_player.getHennaValue(BaseStat.MEN)); // equip MEN packet.writeH(_player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeH(_player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeH(0x00); // equip LUC - packet.writeH(0x00); // equip CHA + packet.writeH(0); // equip LUC + packet.writeH(0); // equip CHA packet.writeD(3 - _player.getHennaEmptySlots()); // Slots packet.writeD(_hennas.size()); // Size for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); } - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 658087380a..9a22f0a564 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -40,12 +40,11 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_ITEM_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getWearCount()); // total amount of dye require packet.writeQ(_henna.getWearFee()); // total amount of Adena require to draw symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to draw or not 0 is false and 1 is true + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to draw or not 0 is false and 1 is true packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() + _player.getHennaValue(BaseStat.INT)); // equip INT @@ -59,7 +58,7 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket packet.writeH(_player.getDEX() + _player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeD(_player.getWIT()); // current WIT packet.writeH(_player.getWIT() + _player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 3800940bac..162812f30b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -40,12 +40,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getCancelCount()); // total amount of dye require packet.writeQ(_henna.getCancelFee()); // total amount of Adena require to remove symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to remove or not + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to remove or not packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() - _player.getHennaValue(BaseStat.INT)); // equip INT @@ -59,11 +58,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket packet.writeH(_player.getDEX() - _player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeD(_player.getWIT()); // current WIT packet.writeH(_player.getWIT() - _player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeD(0x00); // current LUC - packet.writeH(0x00); // equip LUC - packet.writeD(0x00); // current CHA - packet.writeH(0x00); // equip CHA - packet.writeD(0x00); + packet.writeD(0); // current LUC + packet.writeH(0); // equip LUC + packet.writeD(0); // current CHA + packet.writeH(0); // equip CHA + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index a79c0f59f2..68e7ae6ccd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -37,11 +37,9 @@ public class HennaRemoveList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); - packet.writeD(0x03); // seems to be max size + packet.writeD(3); // seems to be max size packet.writeD(3 - _player.getHennaEmptySlots()); - for (Henna henna : _player.getHennaList()) { if (henna != null) @@ -50,7 +48,7 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); packet.writeQ(henna.getCancelCount()); packet.writeQ(henna.getCancelFee()); - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); } } return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index 650261e010..9399a1626e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -62,14 +62,12 @@ public interface IClientOutgoingPacket extends IOutgoingPacket Inventory.PAPERDOLL_BROOCH_JEWEL5, Inventory.PAPERDOLL_BROOCH_JEWEL6 }; - int[] PAPERDOLL_ORDER_AUGMENT = new int[] { Inventory.PAPERDOLL_RHAND, Inventory.PAPERDOLL_LHAND, Inventory.PAPERDOLL_RHAND }; - int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 0c54e810f0..3378827f34 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -46,7 +46,6 @@ public class InventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index 8735b315b6..7912558f00 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -47,8 +47,7 @@ public class ItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.ITEM_LIST.writeId(packet); - - packet.writeH(_showWindow ? 0x01 : 0x00); + packet.writeH(_showWindow ? 1 : 0); packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java index b32b4df4a3..c3b9918230 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java @@ -32,9 +32,8 @@ public class JoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PARTY.writeId(packet); - packet.writeD(_response); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java index 65e06efeb7..f347f7efcd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java @@ -32,7 +32,6 @@ public class JoinPledge implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PLEDGE.writeId(packet); - packet.writeD(_pledgeId); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index 96f6d7c34d..996622b9e9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -35,17 +35,16 @@ public class KeyPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VERSION_CHECK.writeId(packet); - packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok for (int i = 0; i < 8; i++) { packet.writeC(_key[i]); // key } - packet.writeD(0x01); + packet.writeD(1); packet.writeD(Config.SERVER_ID); // server id - packet.writeC(0x01); - packet.writeD(0x00); // obfuscation key - packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 0x01 : 0x00); // isClassic + packet.writeC(1); + packet.writeD(0); // obfuscation key + packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 1 : 0); // isClassic return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java index 484c10f0c4..62424fd03a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java @@ -40,7 +40,6 @@ public class L2FriendSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_SAY.writeId(packet); - packet.writeD(0); // ?? packet.writeS(_receiver); packet.writeS(_sender); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java index b875edb772..790d599b5b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java @@ -32,11 +32,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ListPartyWaiting implements IClientOutgoingPacket { + private static final int NUM_PER_PAGE = 64; + private final List _rooms = new LinkedList<>(); private final int _size; - private static final int NUM_PER_PAGE = 64; - public ListPartyWaiting(PartyMatchingRoomLevelType type, int location, int page, int requestorLevel) { final List rooms = MatchingRoomManager.getInstance().getPartyMathchingRooms(location, type, requestorLevel); @@ -57,7 +57,6 @@ public class ListPartyWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_PARTY_WATING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java index 4f8f9adc64..bb0ac61dbd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java @@ -54,7 +54,6 @@ public class LoginFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LOGIN_FAIL.writeId(packet); - packet.writeD(_success); packet.writeD(_reason); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java index 18a522c315..6743e3e66f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java @@ -32,7 +32,6 @@ public class MagicSkillCanceld implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_CANCELED.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java index d56de10079..7ab29cc1a8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java @@ -66,7 +66,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // MagicSkillUse castingType packet.writeD(_objectId); packet.writeD(_skillId); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java index 3df8463279..a86626cfa6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java @@ -84,7 +84,6 @@ public class MagicSkillUse implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_USE.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // Casting bar type: 0 - default, 1 - default up, 2 - blue, 3 - green, 4 - red. packet.writeD(_creature.getObjectId()); packet.writeD(_target.getObjectId()); @@ -111,7 +110,7 @@ public class MagicSkillUse implements IClientOutgoingPacket packet.writeD(_target.getX()); packet.writeD(_target.getY()); packet.writeD(_target.getZ()); - packet.writeD(_actionId >= 0 ? 0x01 : 0x00); // 1 when ID from RequestActionUse is used + packet.writeD(_actionId >= 0 ? 1 : 0); // 1 when ID from RequestActionUse is used packet.writeD(_actionId >= 0 ? _actionId : 0); // ID from RequestActionUse. Used to set cooldown on summon skills. return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java index 6b710c692e..12e2488f24 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java @@ -37,11 +37,9 @@ public class ManagePledgePower implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet); - packet.writeD(_rank); packet.writeD(_action); packet.writeD(_clan.getRankPrivs(_rank).getBitmask()); - return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 95f4b6f201..4e2ab3f00b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -42,11 +42,9 @@ public class MonRaceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MON_RACE_INFO.writeId(packet); - packet.writeD(_unknown1); packet.writeD(_unknown2); - packet.writeD(0x08); - + packet.writeD(8); for (int i = 0; i < 8; i++) { packet.writeD(_monsters[i].getObjectId()); // npcObjectID @@ -68,7 +66,7 @@ public class MonRaceInfo implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java index 0093b3edc9..e6386921ff 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java @@ -45,13 +45,10 @@ public class MoveToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_xDst); packet.writeD(_yDst); packet.writeD(_zDst); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java index b1fb3ea003..59103c6c4c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java @@ -48,7 +48,6 @@ public class MoveToLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java index 30ff3c96af..aa261f924f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java @@ -50,11 +50,9 @@ public class MoveToPawn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_PAWN.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetId); packet.writeD(_distance); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index d9901a9961..b06a839efd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -58,17 +58,15 @@ public class MultiSellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.MULTI_SELL_LIST.writeId(packet); - - packet.writeC(0x00); // Helios + packet.writeC(0); // Helios packet.writeD(_list.getId()); // list id - packet.writeC(0x00); // GOD Unknown + packet.writeC(0); // GOD Unknown packet.writeD(1 + (_index / PAGE_SIZE)); // page started from 1 - packet.writeD(_finished ? 0x01 : 0x00); // finished + packet.writeD(_finished ? 1 : 0); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window - packet.writeD(0x20); // Helios - Always 32 - + packet.writeC(_list.isChanceMultisell() ? 1 : 0); // new multisell window + packet.writeD(32); // Helios - Always 32 while (_size-- > 0) { ItemInfo itemEnchantment = _list.getItemEnchantment(_index); @@ -85,19 +83,15 @@ public class MultiSellList extends AbstractItemPacket } } } - packet.writeD(_index); // Entry ID. Start from 1. packet.writeC(entry.isStackable() ? 1 : 0); - // Those values will be passed down to MultiSellChoose packet. packet.writeH(itemEnchantment != null ? itemEnchantment.getEnchantLevel() : 0); // enchant level writeItemAugment(packet, itemEnchantment); writeItemElemental(packet, itemEnchantment); writeItemEnsoulOptions(packet, itemEnchantment); - packet.writeH(entry.getProducts().size()); packet.writeH(entry.getIngredients().size()); - for (ItemChanceHolder product : entry.getProducts()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(product.getId()); @@ -121,7 +115,6 @@ public class MultiSellList extends AbstractItemPacket writeItemElemental(packet, displayItemEnchantment); writeItemEnsoulOptions(packet, displayItemEnchantment); } - for (ItemChanceHolder ingredient : entry.getIngredients()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(ingredient.getId()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java index 5482659004..29265f5734 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java @@ -45,10 +45,9 @@ public class MyTargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MY_TARGET_SELECTED.writeId(packet); - packet.writeD(_objectId); packet.writeH(_color); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java index 1901ad1297..166c5c1e00 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java @@ -36,7 +36,6 @@ public class NewCharacterSuccess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NEW_CHARACTER_SUCCESS.writeId(packet); - packet.writeD(_chars.size()); for (PlayerTemplate chr : _chars) { @@ -44,31 +43,24 @@ public class NewCharacterSuccess implements IClientOutgoingPacket { continue; } - // TODO: Unhardcode these packet.writeD(chr.getRace().ordinal()); packet.writeD(chr.getClassId().getId()); - packet.writeD(99); packet.writeD(chr.getBaseSTR()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseDEX()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseCON()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseINT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseWIT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseMEN()); packet.writeD(1); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java index be1605f679..6061ea26ef 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java @@ -38,7 +38,6 @@ public class NicknameChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NICK_NAME_CHANGED.writeId(packet); - packet.writeD(_objectId); packet.writeS(_title); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index f9cd107e2c..3e4837b4a4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -54,24 +54,20 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public NpcHtmlMessage(int npcObjId, int itemId) { super(npcObjId); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } public NpcHtmlMessage(int npcObjId, int itemId, String html) { super(npcObjId, html); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } @@ -79,11 +75,10 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java index 61f195e35d..05489103cb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java @@ -47,10 +47,8 @@ public class NpcInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -58,7 +56,6 @@ public class NpcInfo extends AbstractMaskPacket private int _clanId = 0; private int _statusMask = 0; private final Set _abnormalVisualEffects; - private String[] _localisation; public void setLang(String lang) @@ -101,112 +98,90 @@ public class NpcInfo extends AbstractMaskPacket { addComponentType(NpcInfoType.HEADING); } - if ((npc.getStat().getPAtkSpd() > 0) || (npc.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (npc.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((npc.getLeftHandItem() > 0) || (npc.getRightHandItem() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (npc.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (npc.getDisplayEffect() > 0) { addComponentType(NpcInfoType.DISPLAY_EFFECT); } - if (npc.isInsideZone(ZoneId.WATER) || npc.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (npc.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (npc.getCloneObjId() > 0) { addComponentType(NpcInfoType.CLONE); } - if (npc.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (npc.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (npc.getCurrentHp() <= npc.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (npc.getCurrentMp() <= npc.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (npc.getTemplate().isUsingServerSideName()) { addComponentType(NpcInfoType.NAME); } - if (npc.getTemplate().isUsingServerSideTitle() || (npc.isMonster() && (Config.SHOW_NPC_LEVEL || Config.SHOW_NPC_AGGRESSION)) || npc.isChampion() || npc.isTrap()) { addComponentType(NpcInfoType.TITLE); } - if (npc.getNameString() != null) { addComponentType(NpcInfoType.NAME_NPCSTRINGID); } - if (npc.getTitleString() != null) { addComponentType(NpcInfoType.TITLE_NPCSTRINGID); } - if (_npc.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (!_abnormalVisualEffects.isEmpty() || npc.isInvisible()) { addComponentType(NpcInfoType.ABNORMALS); } - if (npc.getEnchantEffect() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (npc.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (npc.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (npc.getClanId() > 0) { final Clan clan = ClanTable.getInstance().getClan(npc.getClanId()); @@ -220,14 +195,11 @@ public class NpcInfo extends AbstractMaskPacket addComponentType(NpcInfoType.CLAN); } } - addComponentType(NpcInfoType.COLOR_EFFECT); - if (npc.getPvpFlag() > 0) { addComponentType(NpcInfoType.PVP_FLAG); } - // TODO: Confirm me if (npc.isInCombat()) { @@ -245,8 +217,7 @@ public class NpcInfo extends AbstractMaskPacket { _statusMask |= 0x08; } - - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -296,27 +267,23 @@ public class NpcInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO.writeId(packet); - packet.writeD(_npc.getObjectId()); - packet.writeC(_npc.isShowSummonAnimation() ? 0x02 : 0x00); // // 0=teleported 1=default 2=summoned + packet.writeC(_npc.isShowSummonAnimation() ? 2 : 0); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 0x01 : 0x00); + packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { String title = _npc.getTitle(); - // Localisation related. if ((_localisation != null) && !_localisation[1].equals("")) { @@ -329,10 +296,8 @@ public class NpcInfo extends AbstractMaskPacket title = title.replace(NpcData.getInstance().getTemplate(_npc.getId()).getTitle(), _localisation[1]); } } - packet.writeS(title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -351,7 +316,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -366,20 +331,20 @@ public class NpcInfo extends AbstractMaskPacket if (containsMask(NpcInfoType.EQUIPPED)) { packet.writeD(_npc.getRightHandItem()); - packet.writeD(0x00); // Armor id? + packet.writeD(0); // Armor id? packet.writeD(_npc.getLeftHandItem()); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_npc.isDead() ? 0x00 : 0x01); + packet.writeC(_npc.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); + packet.writeC(_npc.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 0x01 : _npc.isFlying() ? 0x02 : 0x00); + packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -391,7 +356,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_npc.isFlying() ? 0x01 : 0x00); + packet.writeD(_npc.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { @@ -427,12 +392,12 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(0x00); // 2 - do some animation on spawn + packet.writeC(0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -464,12 +429,10 @@ public class NpcInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java index c95a8e5274..923e9cebad 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class NpcInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_npc.getObjectId()); packet.writeD(_npc.getTransformationDisplayId()); - final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size()); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java index a294edc57a..2a0ba41eeb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java @@ -38,7 +38,6 @@ public class NpcQuestHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NPC_QUEST_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_questId); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java index d3328ade97..fc6d0d4a3a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java @@ -106,7 +106,6 @@ public class NpcSay implements IClientOutgoingPacket { _parameters = new ArrayList<>(); } - for (String item : params) { if ((item != null) && (item.length() > 0)) @@ -127,11 +126,9 @@ public class NpcSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_SAY.writeId(packet); - packet.writeD(_objectId); packet.writeD(_textType.getClientId()); packet.writeD(_npcId); - // Localisation related. if (_lang != null) { @@ -147,7 +144,6 @@ public class NpcSay implements IClientOutgoingPacket } } } - packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java index 356e3f48a9..ac61f9d247 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java @@ -33,11 +33,10 @@ public class ObservationMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_START.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me packet.writeD(0xc0); // TODO: Find me return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java index 5c0a0766b3..896ccea02b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java @@ -33,7 +33,6 @@ public class ObservationReturn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_END.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java index c2f7ab404f..173772c870 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java @@ -37,7 +37,6 @@ public class OnEventTrigger implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EVENT_TRIGGER.writeId(packet); - packet.writeD(_emitterId); packet.writeC(_enabled); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index d499719f31..70a51b2b0d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -44,7 +44,6 @@ public class PackageSendableList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet); - packet.writeD(_objectId); packet.writeQ(_adena); packet.writeD(_items.size()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java index a53f589386..e24d63f717 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java @@ -39,7 +39,6 @@ public class PackageToList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_TO_LIST.writeId(packet); - packet.writeD(_players.size()); for (Entry entry : _players.entrySet()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 655c7abcd1..44b23b37f4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -55,7 +55,6 @@ public class PartyMemberPosition implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); - packet.writeD(locations.size()); for (Entry entry : locations.entrySet()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java index 9e275ec246..c9d3595037 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java @@ -36,7 +36,6 @@ public class PartyRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java index b9c7d06769..8c97cac6b5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java @@ -36,12 +36,10 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ADD.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); // c3 packet.writeD(_party.getDistributionType().getId()); // c3 packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); - packet.writeD((int) _member.getCurrentCp()); // c4 packet.writeD(_member.getMaxCp()); // c4 packet.writeD((int) _member.getCurrentHp()); @@ -51,7 +49,7 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket packet.writeD(_member.getVitalityPoints()); packet.writeC(_member.getLevel()); packet.writeH(_member.getClassId().getId()); - packet.writeC(0x00); + packet.writeC(0); packet.writeH(_member.getRace().ordinal()); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java index 65d0c60c2e..5ad91f5463 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java @@ -37,21 +37,17 @@ public class PartySmallWindowAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ALL.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); packet.writeC(_party.getDistributionType().getId()); packet.writeC(_party.getMemberCount() - 1); - for (Player member : _party.getMembers()) { if ((member != null) && (member != _exclude)) { packet.writeD(member.getObjectId()); packet.writeS(member.getName()); - packet.writeD((int) member.getCurrentCp()); // c4 packet.writeD(member.getMaxCp()); // c4 - packet.writeD((int) member.getCurrentHp()); packet.writeD(member.getMaxHp()); packet.writeD((int) member.getCurrentMp()); @@ -59,7 +55,7 @@ public class PartySmallWindowAll implements IClientOutgoingPacket packet.writeD(member.getVitalityPoints()); packet.writeC(member.getLevel()); packet.writeH(member.getClassId().getId()); - packet.writeC(0x01); // Unk + packet.writeC(1); // Unk packet.writeH(member.getRace().ordinal()); final Summon pet = member.getPet(); packet.writeD(member.getServitors().size() + (pet != null ? 1 : 0)); // Summon size, one only atm diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java index 94a8a5a2ce..09ce132af4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java @@ -33,7 +33,6 @@ public class PartySmallWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_DELETE.writeId(packet); - packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java index c53c6c7779..e9ea2efbbe 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java @@ -42,7 +42,6 @@ public class PartySmallWindowUpdate extends AbstractMaskPacket _summon.getStat().getExp()) { packet.writeQ(_summon.getStat().getExp()); // 0% absolute value @@ -160,9 +148,7 @@ public class PetInfo implements IClientOutgoingPacket { packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value } - packet.writeQ(_summon.getExpForNextLevel()); // 100% absoulte value - packet.writeD(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight packet.writeD(_summon.getMaxLoad()); // max weight it can carry packet.writeD(_summon.getPAtk()); // patk @@ -178,25 +164,20 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD((int) _summon.getStat().getMoveSpeed()); // speed packet.writeD(_summon.getPAtkSpd()); // atkspeed packet.writeD(_summon.getMAtkSpd()); // casting speed - packet.writeC(0); // TODO: Check me, might be ride status packet.writeC(_summon.getTeam().getId()); // Confirmed packet.writeC(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed packet.writeC(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed - - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. - + packet.writeD(0); // TODO: Find me + packet.writeD(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. packet.writeC(_summon.getOwner().getSummonPoints()); // Used Summon Points packet.writeC(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points - final Set aves = _summon.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeH(aves.size()); // Confirmed for (AbnormalVisualEffect ave : aves) { packet.writeH(ave.getClientId()); // Confirmed } - packet.writeC(_statusMask); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 5b43daa74b..1f60ec39d1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -46,7 +46,6 @@ public class PetInventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.PET_INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index e4cf35779f..16dc83b7ed 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -35,7 +35,6 @@ public class PetItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java index fdb00ddbb1..913f65d470 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java @@ -38,7 +38,6 @@ public class PetStatusShow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_SHOW.writeId(packet); - packet.writeD(_summonType); packet.writeD(_summonObjectId); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 25c2c74292..823a8c405a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -52,7 +52,6 @@ public class PetStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_UPDATE.writeId(packet); - packet.writeD(_summon.getSummonType()); packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getX()); @@ -69,7 +68,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket packet.writeQ(_summon.getStat().getExp()); packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value packet.writeQ(_summon.getExpForNextLevel()); // 100% absolute value - packet.writeD(0x01); // TODO: Find me! + packet.writeD(1); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java index 4bc3570779..0898b01f67 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java @@ -63,7 +63,6 @@ public class PlaySound implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLAY_SOUND.writeId(packet); - packet.writeD(_unknown1); // unknown 0 for quest and ship; packet.writeS(_soundFile); packet.writeD(_unknown3); // unknown 0 for quest; 1 for ship; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java index fbe57d4aaf..5108fe7e1b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java @@ -44,7 +44,6 @@ public class PledgeCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java index aa11b1213e..6805f64d7c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java @@ -34,7 +34,6 @@ public class PledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_INFO.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getId()); packet.writeS(_clan.getName()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java index 72f2c71838..193ee17589 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java @@ -36,12 +36,10 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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 - // clan or subpledge name if (_member.getPledgeType() != 0) { @@ -51,7 +49,6 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket { packet.writeS(_member.getClan().getName()); } - packet.writeS(_member.getApprenticeOrSponsorName()); // name of this member's apprentice/sponsor return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java index eefd482979..6aa5067c8f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java @@ -36,7 +36,6 @@ public class PledgeReceivePowerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_POWER_INFO.writeId(packet); - packet.writeD(_member.getPowerGrade()); // power grade packet.writeS(_member.getName()); packet.writeD(_member.getClan().getRankPrivs(_member.getPowerGrade()).getBitmask()); // privileges diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 818c38a076..01f71eea17 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -40,8 +40,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_SUB_PLEDGE_CREATED.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); packet.writeD(_subPledge.getId()); packet.writeS(_subPledge.getName()); packet.writeS(getLeaderName()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java index 4d0efeb82a..7649947064 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java @@ -43,7 +43,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(packet); - packet.writeD(_tab); // page packet.writeD(_clanList.size()); for (ClanWar clanWar : _clanList) @@ -53,7 +52,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket { continue; } - packet.writeS(clan.getName()); packet.writeD(clanWar.getState().ordinal()); // type: 0 = Declaration, 1 = Blood Declaration, 2 = In War, 3 = Victory, 4 = Defeat, 5 = Tie, 6 = Error packet.writeD(clanWar.getRemainingTime()); // Time if friends to start remaining diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java index 2cbbdbf046..80d10fcb66 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java @@ -34,26 +34,25 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_INFO_UPDATE.writeId(packet); - // sending empty data so client will ask all the info in response ;) packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getLevel()); // clan level packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); // castle state ? + packet.writeD(0); // castle state ? packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); // clan reputation score - packet.writeD(0x00); // ? - packet.writeD(0x00); // ? + packet.writeD(0); // ? + packet.writeD(0); // ? packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); // c5 packet.writeD(_clan.getAllyCrestId()); // c5 packet.writeD(_clan.isAtWar() ? 1 : 0); // c5 - packet.writeD(0x00); // TODO: Find me! - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java index ae26e50dbb..2fa9f26d4a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java @@ -51,12 +51,11 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ADD.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); - packet.writeD(0x00); - packet.writeD(0x01); + packet.writeD(0); + packet.writeD(1); packet.writeD(_isOnline); // 1 = online 0 = offline packet.writeD(_pledgeType); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index c5ea7b284b..a1be315cf4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -41,7 +41,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket { _clan = clan; _pledge = pledge; - _pledgeId = _pledge == null ? 0x00 : _pledge.getId(); + _pledgeId = _pledge == null ? 0 : _pledge.getId(); _leaderName = pledge == null ? clan.getLeaderName() : CharNameTable.getInstance().getNameById(pledge.getLeaderId()); _name = pledge == null ? clan.getName() : pledge.getName(); _members = _clan.getMembers(); @@ -65,31 +65,28 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(packet); - - packet.writeD(_isSubPledge ? 0x00 : 0x01); + packet.writeD(_isSubPledge ? 0 : 1); packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_pledgeId); packet.writeS(_name); packet.writeS(_leaderName); - packet.writeD(_clan.getCrestId()); // crest id .. is used again packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); // 0 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(0); // 0 packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.isAtWar() ? 1 : 0); // new c3 - packet.writeD(0x00); // Territory castle ID + packet.writeD(0); // Territory castle ID packet.writeD(_clan.getSubPledgeMembersCount(_pledgeId)); - for (ClanMember m : _members) { if (m.getPledgeType() != _pledgeId) @@ -107,8 +104,8 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket } else { - packet.writeD(0x01); // no visible effect - packet.writeD(0x01); // packet.writeD(1); + packet.writeD(1); // no visible effect + packet.writeD(1); // packet.writeD(1); } packet.writeD(m.isOnline() ? m.getObjectId() : 0); // objectId = online 0 = offline packet.writeD(m.getSponsor() != 0 ? 1 : 0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java index 0fd387e419..154bcc610d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java @@ -32,7 +32,6 @@ public class PledgeShowMemberListDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_DELETE.writeId(packet); - packet.writeS(_player); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java index c61f412ed0..7b8c7c516b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java @@ -66,7 +66,6 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index 4e89797e45..09f70ea024 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -62,14 +62,14 @@ public class PledgeSkillList implements IClientOutgoingPacket { packet.writeD(sk.getDisplayId()); packet.writeH(sk.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } for (SubPledgeSkill sk : _subSkills) { packet.writeD(sk._subType); // Clan Sub-unit types packet.writeD(sk._skillId); packet.writeH(sk._skillLevel); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java index f3b8d4c26c..a94601294f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java @@ -37,7 +37,6 @@ public class PledgeSkillListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST_ADD.writeId(packet); - packet.writeD(_id); packet.writeD(_level); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java index 9e1b4843ac..5f32f2bf54 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java @@ -33,15 +33,14 @@ public class PledgeStatusChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_STATUS_CHANGED.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getLeaderId()); packet.writeD(_clan.getId()); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getAllyId()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.getCrestLargeId()); - packet.writeD(0x00); // pledge type ? + packet.writeD(0); // pledge type ? return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java index 5b56d0b28d..41d0f9f7d8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java @@ -44,12 +44,10 @@ public class PrivateStoreListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_LIST.writeId(packet); - packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); // Viewer's item count? + packet.writeD(0); // Viewer's item count? packet.writeD(_items.size()); - int slotNumber = 0; for (TradeItem item : _items) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 67b6ba8d94..d72050283e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -43,11 +43,10 @@ public class PrivateStoreListSell extends AbstractItemPacket else { OutgoingPackets.PRIVATE_STORE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index bb462b6cd2..5e95f8b9b8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -43,17 +43,14 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MANAGE_LIST.writeId(packet); - packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(_itemList.size()); // inventory items for potential buy for (Item item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(_buyList.size()); // count for all items already added for buy for (TradeItem item : _buyList) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index 400307eb79..94ff06a790 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -45,18 +45,15 @@ public class PrivateStoreManageListSell extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MANAGE_LIST.writeId(packet); - packet.writeD(_objId); packet.writeD(_packageSale ? 1 : 0); // Package sell packet.writeQ(_playerAdena); - packet.writeD(_itemList.size()); // for potential sells for (TradeItem item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(_sellList.size()); // count for any items already added for sell for (TradeItem item : _sellList) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java index 8a5b9eef92..0d7bcbea16 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgBuy implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java index b00bd2add2..8fdb5701b8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgSell implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java index c3958367e8..5ddaa46ba0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java @@ -40,7 +40,6 @@ public class RadarControl implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RADAR_CONTROL.writeId(packet); - packet.writeD(_showRadar); packet.writeD(_type); // maybe type packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java index 3918894601..5d67413b6f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java @@ -43,10 +43,8 @@ public class RecipeBookItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_BOOK_ITEM_LIST.writeId(packet); - - packet.writeD(_isDwarvenCraft ? 0x00 : 0x01); // 0 = Dwarven - 1 = Common + packet.writeD(_isDwarvenCraft ? 0 : 1); // 0 = Dwarven - 1 = Common packet.writeD(_maxMp); - if (_recipes == null) { packet.writeD(0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 59ec218c84..9f460fe896 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -55,11 +55,10 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeD((int) _player.getCurrentMp()); packet.writeD(_player.getMaxMp()); packet.writeD(_success ? 1 : 0); // item creation success/failed - packet.writeC(0x00); - packet.writeQ(0x00); + packet.writeC(0); + packet.writeQ(0); return true; } - PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java index 4474a37c03..f4db5be9df 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java @@ -35,15 +35,14 @@ public class RecipeShopItemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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); - packet.writeQ(0x00); - packet.writeC(0x00); // Trigger offering window if 1 - packet.writeQ(0x00); + packet.writeQ(0); + packet.writeC(0); // Trigger offering window if 1 + packet.writeQ(0); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java index 75e45f5877..38b0b8ea4e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java @@ -43,7 +43,6 @@ public class RecipeShopManageList implements IClientOutgoingPacket { _recipes = _seller.getCommonRecipeBook(); } - if (_seller.hasManufactureShop()) { final Iterator it = _seller.getManufactureItems().values().iterator(); @@ -63,11 +62,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MANAGE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD((int) _seller.getAdena()); - packet.writeD(_isDwarven ? 0x00 : 0x01); - + packet.writeD(_isDwarven ? 0 : 1); if (_recipes == null) { packet.writeD(0); @@ -83,10 +80,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket packet.writeD(count); } } - if (!_seller.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -94,7 +90,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket for (ManufactureItem item : _seller.getManufactureItems().values()) { packet.writeD(item.getRecipeId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeQ(item.getCost()); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java index c025b5e4ed..2b9bc5b6e7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java @@ -33,7 +33,6 @@ public class RecipeShopMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MSG.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeS(_player.getStoreName()); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java index be8ae1181e..8b3cb42f47 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java @@ -36,14 +36,13 @@ public class RecipeShopSellList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_SELL_LIST.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD((int) _manufacturer.getCurrentMp()); // Creator's MP packet.writeD(_manufacturer.getMaxMp()); // Creator's MP packet.writeQ(_buyer.getAdena()); // Buyer Adena if (!_manufacturer.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -51,7 +50,7 @@ public class RecipeShopSellList implements IClientOutgoingPacket for (ManufactureItem temp : _manufacturer.getManufactureItems().values()) { packet.writeD(temp.getRecipeId()); - packet.writeD(0x00); // unknown + packet.writeD(0); // unknown packet.writeQ(temp.getCost()); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 74700e29b0..269e14d50b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -88,7 +88,6 @@ public class RelationChanged implements IClientOutgoingPacket { return; } - final Relation r = new Relation(); r._objId = activeChar.getObjectId(); r._relation = relation; @@ -102,7 +101,6 @@ public class RelationChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RELATION_CHANGED.writeId(packet); - packet.writeC(_mask); if (_multi == null) { @@ -122,7 +120,6 @@ public class RelationChanged implements IClientOutgoingPacket private void writeRelation(PacketWriter packet, Relation relation) { packet.writeD(relation._objId); - if ((_mask & SEND_DEFAULT) != SEND_DEFAULT) { packet.writeD(relation._relation); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java index b4e9dc25c5..4477cfb705 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java @@ -35,7 +35,6 @@ public class RequestEnchant implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java index 4ef15fb74c..7a0a6cbe58 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java @@ -33,7 +33,6 @@ public class Revive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.REVIVE.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java index 9c409601e3..b9ddf7733f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java @@ -42,7 +42,6 @@ public class Ride implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RIDE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_mounted); packet.writeD(_rideType); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 813ce03f4d..13ef62f55f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -49,11 +49,9 @@ public class SellListProcure implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SELL_LIST_PROCURE.writeId(packet); - packet.writeQ(_money); // money - packet.writeD(0x00); // lease ? + packet.writeD(0); // lease ? packet.writeH(_sellList.size()); // list size - for (Entry entry : _sellList.entrySet()) { final Item item = entry.getKey(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java index baa37a8507..75b5b07854 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java @@ -39,12 +39,10 @@ public class SendMacroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MACRO_LIST.writeId(packet); - packet.writeC(_updateType.getId()); - packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0x00); // modified, created or deleted macro's id + packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0); // modified, created or deleted macro's id packet.writeC(_count); // count of Macros packet.writeC(_macro != null ? 1 : 0); // unknown - if ((_macro != null) && (_updateType != MacroUpdateType.DELETE)) { packet.writeD(_macro.getId()); // Macro ID @@ -52,9 +50,7 @@ public class SendMacroList implements IClientOutgoingPacket packet.writeS(_macro.getDescr()); // Desc packet.writeS(_macro.getAcronym()); // acronym packet.writeD(_macro.getIcon()); // icon - packet.writeC(_macro.getCommands().size()); // count - int i = 1; for (MacroCmd cmd : _macro.getCommands()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java index 47fada25be..21622b5f19 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java @@ -32,7 +32,6 @@ public class SendTradeRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_REQUEST.writeId(packet); - packet.writeD(_senderId); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java index 69aa749406..1513a0e3d1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java @@ -55,7 +55,6 @@ public class ServerObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SERVER_OBJECT_INFO.writeId(packet); - packet.writeD(_activeChar.getObjectId()); packet.writeD(_displayId + 1000000); packet.writeS(_name); // name @@ -70,8 +69,8 @@ public class ServerObjectInfo implements IClientOutgoingPacket packet.writeF(_collisionHeight); packet.writeD((int) (_isAttackable ? _activeChar.getCurrentHp() : 0)); packet.writeD(_isAttackable ? _activeChar.getMaxHp() : 0); - packet.writeD(0x01); // object type - packet.writeD(0x00); // special effects + packet.writeD(1); // object type + packet.writeD(0); // special effects return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java index 88b370ad8b..0164e5c4a2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java @@ -34,7 +34,6 @@ public class SetSummonRemainTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SET_SUMMON_REMAIN_TIME.writeId(packet); - packet.writeD(_maxTime); packet.writeD(_remainingTime); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java index db28b72acf..016f5a0c9a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java @@ -38,7 +38,6 @@ public class ShopPreviewInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_INFO.writeId(packet); - packet.writeD(Inventory.PAPERDOLL_TOTALSLOTS); // Slots packet.writeD(getFromList(Inventory.PAPERDOLL_UNDER)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index df50db952f..a55186f551 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -51,11 +51,9 @@ public class ShopPreviewList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_LIST.writeId(packet); - packet.writeD(5056); packet.writeQ(_money); // current money packet.writeD(_listId); - int newlength = 0; for (Product product : _list) { @@ -65,23 +63,20 @@ public class ShopPreviewList implements IClientOutgoingPacket } } packet.writeH(newlength); - for (Product product : _list) { if ((product.getItem().getCrystalType().getLevel() <= _expertise) && product.getItem().isEquipable()) { packet.writeD(product.getItemId()); packet.writeH(product.getItem().getType2()); // item type2 - if (product.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { packet.writeQ(product.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } else { - packet.writeQ(0x00); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand + packet.writeQ(0); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } - packet.writeQ(Config.WEAR_PRICE); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 298301ed0d..b13080ff28 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -40,7 +40,6 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_BUFF_STATUS_UPDATE.writeId(packet); - packet.writeD(_skillId); packet.writeH(_skillLevel); packet.writeH(_skillSubLevel); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index c6a67fb97c..b8624ce4cd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -33,7 +33,6 @@ public class ShortCutInit implements IClientOutgoingPacket { return; } - _shortCuts = player.getAllShortCuts(); } @@ -41,24 +40,22 @@ public class ShortCutInit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); packet.writeD(sc.getSlot() + (sc.getPage() * 12)); - switch (sc.getType()) { case ITEM: { packet.writeD(sc.getId()); - packet.writeD(0x01); // Enabled or not + packet.writeD(1); // Enabled or not packet.writeD(sc.getSharedReuseGroup()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeQ(0x00); // Augment id - packet.writeD(0x00); // Visual id + packet.writeD(0); + packet.writeD(0); + packet.writeQ(0); // Augment id + packet.writeD(0); // Visual id break; } case SKILL: @@ -67,8 +64,8 @@ public class ShortCutInit implements IClientOutgoingPacket packet.writeH(sc.getLevel()); packet.writeH(sc.getSubLevel()); packet.writeD(sc.getSharedReuseGroup()); - packet.writeC(0x00); // C5 - packet.writeD(0x01); // C6 + packet.writeC(0); // C5 + packet.writeD(1); // C6 break; } case ACTION: @@ -77,7 +74,7 @@ public class ShortCutInit implements IClientOutgoingPacket case BOOKMARK: { packet.writeD(sc.getId()); - packet.writeD(0x01); // C6 + packet.writeD(1); // C6 } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java index 43d61af661..f099eab47e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java @@ -37,7 +37,6 @@ public class ShortCutRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_REGISTER.writeId(packet); - packet.writeD(_shortcut.getType().ordinal()); packet.writeD(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client switch (_shortcut.getType()) @@ -47,10 +46,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeD(_shortcut.getId()); packet.writeD(_shortcut.getCharacterType()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeD(0x00); // unknown - packet.writeD(0x00); // unknown - packet.writeD(0x00); // item augment id - packet.writeD(0x00); // TODO: Find me, item visual id ? + packet.writeD(0); // unknown + packet.writeD(0); // unknown + packet.writeD(0); // item augment id + packet.writeD(0); // TODO: Find me, item visual id ? break; } case SKILL: @@ -59,10 +58,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeH(_shortcut.getLevel()); packet.writeH(_shortcut.getSubLevel()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeC(0x00); // C5 + packet.writeC(0); // C5 packet.writeD(_shortcut.getCharacterType()); - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me + packet.writeD(0); // TODO: Find me break; } case ACTION: diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java index d6f71b5f70..cfae3b3fad 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java @@ -54,7 +54,6 @@ public class ShowBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - packet.writeC(_showBoard); // c4 1 to show community 00 to hide packet.writeS("bypass _bbshome"); // top packet.writeS("bypass _bbsgetfav"); // favorite diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java index 4b62a7001b..4d62e99d7a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java @@ -32,7 +32,6 @@ public class ShowCalculator implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_CALC.writeId(packet); - packet.writeD(_calculatorId); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java index 55f58d5375..4574762467 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java @@ -32,9 +32,8 @@ public class ShowMiniMap implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_MINIMAP.writeId(packet); - packet.writeD(_mapId); - packet.writeC(0x00); // Seven Signs state + packet.writeC(0); // Seven Signs state return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java index 303eab4e8a..97100d09d2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java @@ -34,7 +34,6 @@ public class ShowPCCafeCouponShowUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_PCCAFE_COUPON_SHOW_UI.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java index d86958e586..0a0f3ae861 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java @@ -35,7 +35,6 @@ public class ShowXMasSeal implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_XMAS_SEAL.writeId(packet); - packet.writeD(_item); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java index 66eccc7fbf..1baa030c4d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java @@ -28,9 +28,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = ca
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Attackers Clans?
* d = Number of Attackers Clans
* { //repeats
@@ -58,11 +58,10 @@ public class SiegeAttackerList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _castle.getSiege().getAttackerClans().size(); if (size > 0) { @@ -76,12 +75,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -90,8 +88,8 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index 5d5c831f14..8afd1f38ce 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -29,9 +29,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = 0xcb
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Defending Clans?
* d = Number of Defending Clans
* { //repeats
@@ -60,16 +60,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // Unknown - packet.writeD(0x01); // Unknown - packet.writeD(0x00); // Unknown - + packet.writeD(0); // Unknown + packet.writeD(1); // Unknown + packet.writeD(0); // Unknown final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0); packet.writeD(size); packet.writeD(size); - // Add owners final Clan ownerClan = _castle.getOwner(); if (ownerClan != null) @@ -78,14 +75,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket packet.writeS(ownerClan.getName()); packet.writeS(ownerClan.getLeaderName()); packet.writeD(ownerClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.OWNER.ordinal()); packet.writeD(ownerClan.getAllyId()); packet.writeS(ownerClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(ownerClan.getAllyCrestId()); } - // List of confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans()) { @@ -94,19 +90,17 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(defendingClan.getAllyCrestId()); } - // List of not confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans()) { @@ -115,12 +109,11 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER_PENDING.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 0a3fe46cb7..dfeefdaecf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -59,13 +59,11 @@ public class SiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_INFO.writeId(packet); - if (_castle != null) { packet.writeD(_castle.getResidenceId()); - final int ownerId = _castle.getOwnerId(); - packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 0x01 : 0x00); + packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0); packet.writeD(ownerId); if (ownerId > 0) { @@ -89,7 +87,6 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { @@ -97,7 +94,7 @@ public class SiegeInfo implements IClientOutgoingPacket cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis()); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(Config.SIEGE_HOUR_LIST.size()); for (int hour : Config.SIEGE_HOUR_LIST) { @@ -108,7 +105,7 @@ public class SiegeInfo implements IClientOutgoingPacket else { packet.writeD((int) (_castle.getSiegeDate().getTimeInMillis() / 1000)); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index d11b3817c0..3c4c475339 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -51,12 +51,11 @@ public class SkillCoolTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SKILL_COOL_TIME.writeId(packet); - packet.writeD(_skillReuseTimeStamps.size()); for (TimeStamp ts : _skillReuseTimeStamps) { packet.writeD(ts.getSkillId()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD((int) ts.getReuse() / 1000); packet.writeD((int) Math.max(ts.getStamp() - _currentTime, 0) / 1000); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index de54232b51..ed4615c403 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -41,10 +41,9 @@ public class Snoop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SNOOP.writeId(packet); - packet.writeD(_convoId); packet.writeS(_name); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_type.getClientId()); packet.writeS(_speaker); packet.writeS(_msg); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java index 37827bdf6c..52f15519a5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java @@ -37,10 +37,9 @@ public class SocialAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SOCIAL_ACTION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_actionId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index c2fedd99c0..f2b0fadabd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -33,16 +33,15 @@ public class SpawnItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPAWN_ITEM.writeId(packet); - packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeD(_item.isStackable() ? 0x01 : 0x00); + packet.writeD(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java index ccae75b850..04f3ad716c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java @@ -110,7 +110,6 @@ public class SpecialCamera implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPECIAL_CAMERA.writeId(packet); - packet.writeD(_id); packet.writeD(_force); packet.writeD(_angle1); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java index cdd3821740..281756e793 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java @@ -34,7 +34,6 @@ public class StartPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_PLEDGE_WAR.writeId(packet); - packet.writeS(_playerName); packet.writeS(_pledgeName); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java index 48b4238eea..27fb4f606b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java @@ -38,7 +38,6 @@ public class StartRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_side); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java index b4f421df36..067bdeb082 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java @@ -72,7 +72,6 @@ public class StaticObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATIC_OBJECT.writeId(packet); - packet.writeD(_staticObjectId); packet.writeD(_objectId); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index 928b54aa48..40836e4af8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -46,7 +46,6 @@ public class StatusUpdate implements IClientOutgoingPacket public void addUpdate(StatusUpdateType type, int level) { _updates.put(type, level); - if (_isPlayable) { switch (type) @@ -75,10 +74,9 @@ public class StatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATUS_UPDATE.writeId(packet); - packet.writeD(_objectId); // casterId - packet.writeD(_isVisible ? _casterObjectId : 0x00); - packet.writeC(_isVisible ? 0x01 : 0x00); + packet.writeD(_isVisible ? _casterObjectId : 0); + packet.writeC(_isVisible ? 1 : 0); packet.writeC(_updates.size()); for (Entry entry : _updates.entrySet()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java index 9919307366..cf2b71df5a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java @@ -53,7 +53,6 @@ public class StopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java index 50fdc3fe4c..78fdb5d70c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java @@ -43,7 +43,6 @@ public class StopMoveInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java index 9c828c3962..b254cad8b1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java @@ -34,7 +34,6 @@ public class StopPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java index b0392de226..ca69cd5346 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java @@ -36,7 +36,6 @@ public class StopRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FINISH_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_speed); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index c1feb37b2f..2d92796c75 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -43,10 +43,8 @@ public class SummonInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class SummonInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class SummonInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,11 +154,9 @@ public class SummonInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - // Show red aura? - // if (_statusMask != 0) + // if (_statusMask != 0x00) // { // addComponentType(NpcInfoType.VISUAL_STATE); // } @@ -229,28 +206,24 @@ public class SummonInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.SUMMON_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -269,7 +242,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -285,19 +258,19 @@ public class SummonInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -309,20 +282,20 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -346,12 +319,12 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -381,12 +354,10 @@ public class SummonInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java index 864462f76f..6f88551204 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java @@ -34,7 +34,6 @@ public class SurrenderPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SURRENDER_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 746b2da3f7..b509d599db 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -161,7 +161,6 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } - _params[_paramIndex++] = param; } @@ -267,7 +266,6 @@ public class SystemMessage implements IClientOutgoingPacket { return addString(item.getName()); } - append(new SMParam(TYPE_ITEM_NAME, id)); return this; } @@ -389,7 +387,6 @@ public class SystemMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SYSTEM_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -402,13 +399,12 @@ public class SystemMessage implements IClientOutgoingPacket params[i] = _params[i].getValue(); } packet.writeH(SystemMessageId.S1_2.getId()); - packet.writeC(0x01); + packet.writeC(1); packet.writeC(TYPE_TEXT); packet.writeS(sml.getLocalisation(params)); return true; } } - packet.writeH(getId()); packet.writeC(_params.length); for (SMParam param : _params) @@ -418,9 +414,7 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } - packet.writeC(param.getType()); - switch (param.getType()) { case TYPE_ELEMENT_NAME: diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java index a91da07e77..d357efbb0e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java @@ -47,13 +47,12 @@ public class TargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_SELECTED.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java index 3dadd249f6..3d7208c06f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java @@ -42,12 +42,11 @@ public class TargetUnselected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_UNSELECTED.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index 943b5078b6..13f9b9565a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -41,14 +41,13 @@ public class TeleportToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TELEPORT_TO_LOCATION.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // Fade 0, Instant 1. + packet.writeD(0); // Fade 0, Instant 1. packet.writeD(_heading); - packet.writeD(0x00); // Unknown. + packet.writeD(0); // Unknown. return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java index cb82f2da59..8d09576d9d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java @@ -32,7 +32,6 @@ public class TradeDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_DONE.writeId(packet); - packet.writeD(_num); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index 470ce757db..0635e50548 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -56,7 +56,6 @@ public class TradeStart extends AbstractItemPacket { _mask |= 0x08; } - // Does not shows level if (_partner.isGM()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java index 0b92812a6f..aec0ace924 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java @@ -39,7 +39,6 @@ public class TradeUpdate extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_UPDATE.writeId(packet); - packet.writeH(1); packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2); writeItem(packet, _item); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java index c7102ca385..728020c0b1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java @@ -32,7 +32,6 @@ public class TutorialEnableClientEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_ENABLE_CLIENT_EVENT.writeId(packet); - packet.writeD(_eventId); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java index 92ac75afcf..7cc33a0f80 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java @@ -48,7 +48,6 @@ public class TutorialShowHtml extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_HTML.writeId(packet); - packet.writeD(_type); packet.writeS(getHtml()); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java index 75a57be38b..2ee62835db 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java @@ -37,7 +37,6 @@ public class TutorialShowQuestionMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_QUESTION_MARK.writeId(packet); - packet.writeC(_markType); packet.writeD(_markId); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 0a8afb62a6..4605ca4b57 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class UserInfo extends AbstractMaskPacket { private Player _player; - private int _relation; private int _runSpd; private int _walkSpd; @@ -46,14 +45,12 @@ public class UserInfo extends AbstractMaskPacket private int _enchantLevel; private int _armorEnchant; private String _title; - private final byte[] _masks = new byte[] { (byte) 0x00, (byte) 0x00, (byte) 0x00 }; - private int _initSize = 5; public UserInfo(Player player) @@ -77,6 +74,7 @@ public class UserInfo extends AbstractMaskPacket _enchantLevel = player.getInventory().getWeaponEnchant(); _armorEnchant = player.getInventory().getArmorMinEnchant(); _title = player.getTitle(); + if (player.isGM() && player.isInvisible()) { _title = "[Invisible]"; @@ -132,29 +130,25 @@ public class UserInfo extends AbstractMaskPacket } OutgoingPackets.USER_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_initSize); packet.writeH(23); packet.writeB(_masks); - if (containsMask(UserInfoType.RELATION)) { packet.writeD(_relation); } - if (containsMask(UserInfoType.BASIC_INFO)) { packet.writeH(16 + (_player.getAppearance().getVisibleName().length() * 2)); packet.writeString(_player.getName()); - packet.writeC(_player.isGM() ? 0x01 : 0x00); + packet.writeC(_player.isGM() ? 1 : 0); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } - if (containsMask(UserInfoType.BASE_STATS)) { packet.writeH(18); @@ -164,10 +158,9 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getINT()); packet.writeH(_player.getWIT()); packet.writeH(_player.getMEN()); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); } - if (containsMask(UserInfoType.MAX_HPCPMP)) { packet.writeH(14); @@ -175,7 +168,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMaxMp()); packet.writeD(_player.getMaxCp()); } - if (containsMask(UserInfoType.CURRENT_HPMPCP_EXP_SP)) { packet.writeH(38); @@ -186,32 +178,28 @@ public class UserInfo extends AbstractMaskPacket packet.writeQ(_player.getExp()); packet.writeF((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel()))); } - if (containsMask(UserInfoType.ENCHANTLEVEL)) { packet.writeH(4); packet.writeC(_enchantLevel); packet.writeC(_armorEnchant); } - if (containsMask(UserInfoType.APPAREANCE)) { packet.writeH(15); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); } - if (containsMask(UserInfoType.STATUS)) { packet.writeH(6); packet.writeC(_player.getMountType().ordinal()); packet.writeC(_player.getPrivateStoreType().getId()); packet.writeC(_player.hasDwarvenCraft() || (_player.getSkillLevel(248) > 0) ? 1 : 0); - packet.writeC(0x00); + packet.writeC(0); } - if (containsMask(UserInfoType.STATS)) { packet.writeH(56); @@ -230,18 +218,16 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); } - if (containsMask(UserInfoType.ELEMENTALS)) { packet.writeH(14); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); } - if (containsMask(UserInfoType.POSITION)) { packet.writeH(18); @@ -250,7 +236,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getZ()); packet.writeD(_player.isInVehicle() ? _player.getVehicle().getObjectId() : 0); } - if (containsMask(UserInfoType.SPEED)) { packet.writeH(18); @@ -263,28 +248,24 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_flyRunSpd); packet.writeH(_flyWalkSpd); } - if (containsMask(UserInfoType.MULTIPLIER)) { packet.writeH(18); packet.writeF(_moveMultiplier); packet.writeF(_player.getAttackSpeedMultiplier()); } - if (containsMask(UserInfoType.COL_RADIUS_HEIGHT)) { packet.writeH(18); packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); } - if (containsMask(UserInfoType.ATK_ELEMENTAL)) { packet.writeH(5); - packet.writeC(0x00); - packet.writeH(0x00); + packet.writeC(0); + packet.writeH(0); } - if (containsMask(UserInfoType.CLAN)) { packet.writeH(32 + (_title.length() * 2)); @@ -294,12 +275,11 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getClanCrestLargeId()); packet.writeD(_player.getClanCrestId()); packet.writeD(_player.getClanPrivileges().getBitmask()); - packet.writeC(_player.isClanLeader() ? 0x01 : 0x00); + packet.writeC(_player.isClanLeader() ? 1 : 0); packet.writeD(_player.getAllyId()); packet.writeD(_player.getAllyCrestId()); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); } - if (containsMask(UserInfoType.SOCIAL)) { packet.writeH(22); @@ -313,59 +293,52 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); } - if (containsMask(UserInfoType.VITA_FAME)) { packet.writeH(15); - packet.writeD(0x00); - packet.writeC(0x00); // Vita Bonus + packet.writeD(0); + packet.writeC(0); // Vita Bonus packet.writeD(_player.getFame()); packet.writeD(_player.getRaidbossPoints()); } - if (containsMask(UserInfoType.SLOTS)) { packet.writeH(9); packet.writeC(_player.getInventory().getTalismanSlots()); // Confirmed packet.writeC(_player.getInventory().getBroochJewelSlots()); // Confirmed packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeC(0x00); // (1 = Red, 2 = White, 3 = White Pink) dotted ring on the floor - packet.writeC(0x00); - packet.writeC(0x00); - packet.writeC(0x00); + packet.writeC(0); // (1 = Red, 2 = White, 3 = White Pink) dotted ring on the floor + packet.writeC(0); + packet.writeC(0); + packet.writeC(0); } - if (containsMask(UserInfoType.MOVEMENTS)) { packet.writeH(4); packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); - packet.writeC(_player.isRunning() ? 0x01 : 0x00); + packet.writeC(_player.isRunning() ? 1 : 0); } - if (containsMask(UserInfoType.COLOR)) { packet.writeH(10); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); } - if (containsMask(UserInfoType.INVENTORY_LIMIT)) { packet.writeH(9); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); packet.writeH(_player.getInventoryLimit()); packet.writeC(0); } - if (containsMask(UserInfoType.TRUE_HERO)) { packet.writeH(9); - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeC(_player.isTrueHero() ? 100 : 0x00); + packet.writeD(0); + packet.writeH(0); + packet.writeC(_player.isTrueHero() ? 100 : 0); } - return true; } @@ -382,7 +355,6 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x10; // Party leader } } - if (clan != null) { relation |= 0x20; // Clan member @@ -391,12 +363,10 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x40; // Clan leader } } - if (player.isInSiege()) { relation |= 0x80; // In siege } - return relation; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java index 283bcf1614..90c416726a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java @@ -36,7 +36,6 @@ public class ValidateLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java index 4d8f9683d0..83f72bf981 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java @@ -40,7 +40,6 @@ public class ValidateLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java index b684e70bdc..71367cd26d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java @@ -36,7 +36,6 @@ public class VehicleCheckLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_CHECK_LOCATION.writeId(packet); - packet.writeD(_boat.getObjectId()); packet.writeD(_boat.getX()); packet.writeD(_boat.getY()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java index a4a5780f30..5b565c08b7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java @@ -46,7 +46,6 @@ public class VehicleDeparture implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_DEPARTURE.writeId(packet); - packet.writeD(_objId); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java index ec611028bf..4a995a6352 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java @@ -44,7 +44,6 @@ public class VehicleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java index 207a6fd899..bf629dcbbc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java @@ -42,7 +42,6 @@ public class VehicleStarted implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_START.writeId(packet); - packet.writeD(_objectId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 455305ce79..76b391afc6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -30,6 +30,7 @@ public class WareHouseDepositList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; public static final int FREIGHT = 1; + private final long _playerAdena; private final int _warehouseSize; private final List _items = new ArrayList<>(); @@ -49,7 +50,6 @@ public class WareHouseDepositList extends AbstractItemPacket _whType = type; _playerAdena = player.getAdena(); _warehouseSize = player.getActiveWarehouse() != null ? player.getActiveWarehouse().getSize() : 0; - final boolean isPrivate = _whType == PRIVATE; for (Item temp : player.getInventory().getAvailableItems(true, isPrivate, false)) { @@ -68,19 +68,15 @@ public class WareHouseDepositList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.WAREHOUSE_DEPOSIT_LIST.writeId(packet); - packet.writeH(_whType); packet.writeQ(_playerAdena); packet.writeD(_warehouseSize); packet.writeH(_itemsStackable.size()); - for (int itemId : _itemsStackable) { packet.writeD(itemId); } - packet.writeH(_items.size()); - for (Item item : _items) { writeItem(packet, item); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 6f57005e47..785f0a0849 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -32,6 +32,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private Player _player; private long _playerAdena; private final int _invSize; @@ -58,7 +59,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } - _items = _player.getActiveWarehouse().getItems(); for (Item item : _items) { @@ -73,7 +73,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.WAREHOUSE_WITHDRAW_LIST.writeId(packet); - packet.writeH(_whType); packet.writeQ(_playerAdena); packet.writeH(_items.size()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java index 5f2dd05f3b..aea1476fb2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java @@ -35,8 +35,7 @@ public class ExDivideAdenaCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_CANCEL.writeId(packet); - - packet.writeC(0x00); // TODO: Find me + packet.writeC(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java index 6af912cebf..de4e955aba 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java @@ -46,9 +46,8 @@ public class ExDivideAdenaDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_DONE.writeId(packet); - - packet.writeC(_isPartyLeader ? 0x01 : 0x00); - packet.writeC(_isCCLeader ? 0x01 : 0x00); + packet.writeC(_isPartyLeader ? 1 : 0); + packet.writeC(_isCCLeader ? 1 : 0); packet.writeD(_memberCount); packet.writeQ(_distributedAdenaCount); packet.writeQ(_adenaCount); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index 549def456e..84b5fead76 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -43,7 +43,6 @@ public class ExChooseShapeShiftingItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_SHAPE_SHIFTING_ITEM.writeId(packet); - packet.writeD(_targetType != null ? _targetType.ordinal() : 0); packet.writeD(_type != null ? _type.ordinal() : 0); packet.writeD(_itemId); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java index 33fb439aa5..ba55887a1a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java @@ -45,7 +45,6 @@ public class ExCuriousHouseMemberUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_UPDATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_maxHp); packet.writeD(_maxCp); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java index 8ad3659725..be2d29d864 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPacket { - public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0x00); - public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(0x01); + public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0); + public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(1); private final int _result; @@ -39,7 +39,6 @@ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPa public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_EXTRACTION_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java index ec82cc14f3..e84d7a7255 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; public static final ExPutShapeShiftingTargetItemResult FAILED = new ExPutShapeShiftingTargetItemResult(RESULT_FAILED, 0); @@ -43,7 +43,6 @@ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_resultId); packet.writeQ(_price); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java index f4d3118cc4..038eae0042 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExShapeShiftingResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; - public static final int RESULT_CLOSE = 0x02; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; + public static final int RESULT_CLOSE = 2; public static final ExShapeShiftingResult FAILED = new ExShapeShiftingResult(RESULT_FAILED, 0, 0); public static final ExShapeShiftingResult CLOSE = new ExShapeShiftingResult(RESULT_CLOSE, 0, 0); @@ -47,7 +47,6 @@ public class ExShapeShiftingResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHAPE_SHIFTING_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_targetItemId); packet.writeD(_extractItemId); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java index eaf0d209fd..4b48b09002 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java @@ -38,7 +38,7 @@ public class ExConfirmVipAttendanceCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CONFIRM_VIP_ATTENDANCE_CHECK.writeId(packet); - packet.writeC(_available ? 0x01 : 0x00); // can receive reward today? 1 else 0 + packet.writeC(_available ? 1 : 0); // can receive reward today? 1 else 0 packet.writeC(_index); // active reward index packet.writeD(0); packet.writeD(0); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java index 9d61fe68d6..dd94df023f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java @@ -45,10 +45,10 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket OutgoingPackets.EX_VIP_ATTENDANCE_ITEM_LIST.writeId(packet); packet.writeC(_available ? _index + 1 : _index); // index to receive? packet.writeC(_index); // last received index? - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeC(0x01); - packet.writeC(_available ? 0x01 : 0x00); // player can receive reward today? + packet.writeD(0); + packet.writeD(0); + packet.writeC(1); + packet.writeC(_available ? 1 : 0); // player can receive reward today? packet.writeC(250); packet.writeC(AttendanceRewardData.getInstance().getRewardsCount()); // reward size int rewardCounter = 0; @@ -57,11 +57,11 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket rewardCounter++; packet.writeD(reward.getId()); packet.writeQ(reward.getCount()); - packet.writeC(0x01); // is unknown? - packet.writeC((rewardCounter % 7) == 0 ? 0x01 : 0x00); // is last in row? + packet.writeC(1); // is unknown? + packet.writeC((rewardCounter % 7) == 0 ? 1 : 0); // is last in row? } - packet.writeC(0x00); - packet.writeD(0x00); + packet.writeC(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java index 4c3ae253ea..c79b68becc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java @@ -39,7 +39,6 @@ public class ExResponseCommissionBuyInfo extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_INFO.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java index ddfa8b6db1..c1d29735b8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java @@ -40,7 +40,6 @@ public class ExResponseCommissionBuyItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_ITEM.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java index aa4bbbde24..01e4782408 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java @@ -39,7 +39,6 @@ public class ExResponseCommissionDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_DELETE.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java index e7e3c39816..b915574175 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java @@ -55,7 +55,6 @@ public class ExResponseCommissionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_INFO.writeId(packet); - packet.writeD(_result); packet.writeD(_itemId); packet.writeQ(_presetPricePerUnit); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 876a24c7ad..89000dd57f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -39,7 +39,6 @@ public class ExResponseCommissionItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_ITEM_LIST.writeId(packet); - packet.writeD(_items.size()); for (Item itemInstance : _items) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java index 4963393b42..a012b3ab30 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java @@ -64,7 +64,6 @@ public class ExResponseCommissionList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_LIST.writeId(packet); - packet.writeD(_replyType.getClientId()); switch (_replyType) { @@ -73,13 +72,11 @@ public class ExResponseCommissionList extends AbstractItemPacket { packet.writeD((int) Instant.now().getEpochSecond()); packet.writeD(_chunkId); - int chunkSize = _items.size() - _listIndexStart; if (chunkSize > MAX_CHUNK_SIZE) { chunkSize = MAX_CHUNK_SIZE; } - packet.writeD(chunkSize); for (int i = _listIndexStart; i < (_listIndexStart + chunkSize); i++) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java index b1b0a97d7a..183547af06 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java @@ -39,7 +39,6 @@ public class ExResponseCommissionRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_REGISTER.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java index 74d8a95587..b68386e4ed 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java @@ -35,8 +35,7 @@ public class ExShowCommission implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_COMMISSION.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java index 0c267ecf34..11b1ff1e0a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExEnchantFail implements IClientOutgoingPacket { public static final ExEnchantFail STATIC_PACKET = new ExEnchantFail(0, 0); + private final int _itemOne; private final int _itemTwo; @@ -39,7 +40,6 @@ public class ExEnchantFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_FAIL.writeId(packet); - packet.writeD(_itemOne); packet.writeD(_itemTwo); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java index 71ba811ed5..87d29a8e7c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java @@ -36,7 +36,6 @@ public class ExEnchantSucess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SUCESS.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java index eb4eb8b26c..ec67d50fb6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java @@ -39,7 +39,6 @@ public class ExGetCrystalizingEstimation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - packet.writeD(_items.size()); for (ItemChanceHolder holder : _items) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java index 33554a7050..96b250046c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java @@ -39,7 +39,7 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket OutgoingPackets.EX_CONNECTED_TIME_AND_GETTABLE_REWARD.writeId(packet); for (int i = 0; i < 16; i++) // TODO : Find what the hell it is { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index d4910c376d..5dac65c6c9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -49,7 +49,6 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket } OutgoingPackets.EX_ONE_DAY_RECEIVE_REWARD_LIST.writeId(packet); - packet.writeC(0x23); packet.writeD(_player.getClassId().getId()); packet.writeD(LocalDate.now().getDayOfWeek().ordinal()); // Day of week @@ -58,7 +57,7 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket { packet.writeH(reward.getId()); packet.writeC(reward.getStatus(_player)); - packet.writeC(reward.getRequiredCompletions() > 0 ? 0x01 : 0x00); + packet.writeC(reward.getRequiredCompletions() > 0 ? 1 : 0); packet.writeD(reward.getProgress(_player)); packet.writeD(reward.getRequiredCompletions()); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java index fa605b548a..a99ad7f4e3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java @@ -52,7 +52,7 @@ public class ExFishingStart implements IClientOutgoingPacket packet.writeD(_baitLocation.getX()); packet.writeD(_baitLocation.getY()); packet.writeD(_baitLocation.getZ()); - packet.writeC(0x01); // 0 = newbie, 1 = normal, 2 = night + packet.writeC(1); // 0 = newbie, 1 = normal, 2 = night return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java index 046ad04cb6..74501fe7ff 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java @@ -49,7 +49,6 @@ public class ExUserInfoFishing implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_FISHING.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_isFishing ? 1 : 0); if (_baitLocation == null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index dc0e3e05bc..336a384bcc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -47,9 +47,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FRIEND_DETAIL_INFO.writeId(packet); - packet.writeD(_objectId); - if (_friend == null) { packet.writeS(_name); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java index 0d4bb47ff0..a90b7b6083 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java @@ -33,8 +33,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x00); + packet.writeC(0); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java index 9add9c9caa..d24139644c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java @@ -49,7 +49,6 @@ public class FriendAddRequestResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_charId); packet.writeS(_charName); @@ -57,7 +56,7 @@ public class FriendAddRequestResult implements IClientOutgoingPacket packet.writeD(_charObjectId); packet.writeD(_charLevel); packet.writeD(_charClassId); - packet.writeH(0x00); // Always 0 on retail + packet.writeH(0); // Always 0 on retail return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java index a135944662..13a7d01967 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java @@ -86,12 +86,10 @@ public class FriendList implements IClientOutgoingPacket } continue; } - if (player1.isOnline()) { online = true; } - classid = player1.getClassId().getId(); level = player1.getLevel(); _info.add(new FriendInfo(objId, name, online, classid, level)); @@ -102,14 +100,13 @@ public class FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._classid); packet.writeD(info._level); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java index 07c23f9fd2..1bb4142e34 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java @@ -38,7 +38,6 @@ public class FriendRemove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_REMOVE.writeId(packet); - packet.writeD(_responce); packet.writeS(_charName); return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java index e8dbddcd63..a3990c0879 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java @@ -52,7 +52,6 @@ public class FriendStatus implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_STATUS.writeId(packet); - packet.writeD(_type); packet.writeS(_name); switch (_type) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java index 8752104e06..78da5850b8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java @@ -50,7 +50,6 @@ public class L2Friend implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND.writeId(packet); - packet.writeD(_action ? 1 : 3); // 1-add 3-remove packet.writeD(_objid); packet.writeS(_name); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java index b69a253635..e50693cb11 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java @@ -81,17 +81,16 @@ public class L2FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._level); packet.writeD(info._classId); - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java index 677c09091f..706c179a9c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java @@ -37,7 +37,6 @@ public class ExMentorAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_ADD.writeId(packet); - packet.writeS(_mentor.getName()); packet.writeD(_mentor.getActiveClass()); packet.writeD(_mentor.getLevel()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java index 4722a9cab3..18c1cdeedf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java @@ -64,9 +64,8 @@ public class ExMentorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_LIST.writeId(packet); - packet.writeD(_type); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mentees.size()); for (Mentee mentee : _mentees) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java index d739dd94b7..2283920b98 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ListMenteeWaiting implements IClientOutgoingPacket { private static final int PLAYERS_PER_PAGE = 64; + private final List _possibleCandiates = new ArrayList<>(); private final int _page; @@ -51,18 +52,15 @@ public class ListMenteeWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_MENTEE_WAITING.writeId(packet); - - packet.writeD(0x01); // always 1 in retail + packet.writeD(1); // always 1 in retail if (_possibleCandiates.isEmpty()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } - packet.writeD(_possibleCandiates.size()); packet.writeD(_possibleCandiates.size() % PLAYERS_PER_PAGE); - for (Player player : _possibleCandiates) { if ((1 <= (PLAYERS_PER_PAGE * _page)) && (1 > (PLAYERS_PER_PAGE * (_page - 1)))) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java index ead46c2174..eaf44d3181 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java @@ -51,7 +51,6 @@ public class ExPledgeBonusList implements IClientOutgoingPacket packet.writeD(0); return; } - packet.writeD(bonus.getSkillReward().getSkillId()); break; } @@ -63,7 +62,6 @@ public class ExPledgeBonusList implements IClientOutgoingPacket packet.writeD(0); return; } - packet.writeD(bonus.getItemReward().getId()); break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java index af3c790bc6..cfedfaa438 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java @@ -50,7 +50,6 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Player: " + _player + " attempting to write to a null clan!"); return false; } - final ClanRewardBonus highestMembersOnlineBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.MEMBERS_ONLINE); final ClanRewardBonus highestHuntingBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.HUNTING_MONSTERS); final ClanRewardBonus membersOnlineBonus = ClanRewardType.MEMBERS_ONLINE.getAvailableBonus(clan); @@ -75,23 +74,20 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Couldn't find item reward for highest available hunting bonus!!"); return false; } - // General OP Code OutgoingPackets.EX_PLEDGE_BONUS_OPEN.writeId(packet); - // Members online bonus packet.writeD(highestMembersOnlineBonus.getRequiredAmount()); packet.writeD(clan.getMaxOnlineMembers()); - packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0x00); - packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 0x01 : 0x00); - + packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0); + packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 1 : 0); // Hunting bonus packet.writeD(highestHuntingBonus.getRequiredAmount()); packet.writeD(clan.getHuntingPoints()); - packet.writeD(huntingBonus != null ? highestHuntingBonus.getItemReward().getId() : 0x00); - packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 0x01 : 0x00); + packet.writeD(huntingBonus != null ? highestHuntingBonus.getItemReward().getId() : 0); + packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index fb735b8925..e75426e598 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -69,7 +69,6 @@ public class ExBRBuyProduct implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUY_PRODUCT.writeId(packet); - packet.writeD(_reply); return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java index 742b3eba9d..91a186b81d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java @@ -39,10 +39,9 @@ public class ExBRGamePoint implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_GAME_POINT.writeId(packet); - packet.writeD(_charId); packet.writeQ(_charPoints); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java index 50f21df46a..e36f2ff502 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java @@ -45,7 +45,6 @@ public class ExBRProductInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_INFO.writeId(packet); - packet.writeD(_item.getBrId()); packet.writeD(_item.getPrice()); packet.writeD(_item.getItems().size()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java index dc851ffd43..0f042ba043 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java @@ -45,9 +45,8 @@ public class ExBRProductList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); // Adena - packet.writeQ(0x00); // Hero coins + packet.writeQ(0); // Hero coins packet.writeC(_type); // Type 0 - Home, 1 - History, 2 - Favorites packet.writeD(_primeList.size()); for (PrimeShopGroup brItem : _primeList) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java index 2463589c81..c09b3e899d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java @@ -47,18 +47,15 @@ public class ExFlyMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_mapId); - packet.writeD(_locations.size()); for (SayuneEntry loc : _locations) { packet.writeD(loc.getId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(loc.getX()); packet.writeD(loc.getY()); packet.writeD(loc.getZ()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java index 03fc6b580d..70b3fb25d2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java @@ -47,16 +47,13 @@ public class ExFlyMoveBroadcast implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE_BROADCAST.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); packet.writeD(_mapId); - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD(_currentLoc.getX()); packet.writeD(_currentLoc.getY()); packet.writeD(_currentLoc.getZ()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java index cfe11a27e0..49e5d86910 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java @@ -35,7 +35,6 @@ public class ExNotifyFlyMoveStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_FLY_MOVE_START.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java index d5640a47ef..0efa37ae8c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java @@ -51,7 +51,6 @@ public class ExMoveToLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_SUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_targetX); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java index 0cbe2c3e02..a0314c39aa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java @@ -46,7 +46,6 @@ public class ExShuttleGetOff implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_OFF.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java index 5211bef5ba..061bcafed9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java @@ -43,7 +43,6 @@ public class ExShuttleGetOn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_ON.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java index 97d54a9019..c8aee1fde7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java @@ -43,7 +43,6 @@ public class ExShuttleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHUTTLE_INFO.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD(_shuttle.getX()); packet.writeD(_shuttle.getY()); @@ -60,8 +59,8 @@ public class ExShuttleInfo implements IClientOutgoingPacket packet.writeD(loc.getY()); packet.writeD(loc.getZ()); } - packet.writeD(stop.isDoorOpen() ? 0x01 : 0x00); - packet.writeD(stop.hasDoorChanged() ? 0x01 : 0x00); + packet.writeD(stop.isDoorOpen() ? 1 : 0); + packet.writeD(stop.hasDoorChanged() ? 1 : 0); } return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java index 6ba38f29a1..28b33b998e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java @@ -43,7 +43,6 @@ public class ExShuttleMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_MOVE.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD((int) _shuttle.getStat().getMoveSpeed()); packet.writeD((int) _shuttle.getStat().getRotationSpeed()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java index bf2b6ea6eb..6c31189d6a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java @@ -44,7 +44,6 @@ public class ExStopMoveInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_SHUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java index f7f6849732..8492f42a6e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java @@ -44,7 +44,6 @@ public class ExValidateLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_SHUTTLE.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipProductList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipProductList.java index e2ced450b3..562f88d22b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipProductList.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipProductList.java @@ -45,13 +45,11 @@ public class ReceiveVipProductList implements IClientOutgoingPacket } final Collection products = PrimeShopData.getInstance().getPrimeItems().values(); final PrimeShopGroup gift = PrimeShopData.getInstance().getVipGiftOfTier(_player.getVipTier()); - OutgoingPackets.RECIVE_VIP_PRODUCT_LIST.writeId(packet); packet.writeQ(_player.getAdena()); packet.writeQ(_player.getGoldCoin()); // Gold Coin Amount packet.writeQ(_player.getSilverCoin()); // Silver Coin Amount packet.writeC(1); // Show Reward tab - if (gift != null) { packet.writeD(products.size() + 1); @@ -61,7 +59,6 @@ public class ReceiveVipProductList implements IClientOutgoingPacket { packet.writeD(products.size()); } - for (PrimeShopGroup product : products) { writeProduct(product, packet); @@ -79,7 +76,6 @@ public class ReceiveVipProductList implements IClientOutgoingPacket buffer.writeC(product.getPanelType()); // NEW - 6; HOT - 5 ... Unk buffer.writeC(product.getVipTier()); buffer.writeC(10); - buffer.writeC(product.getItems().size()); for (PrimeShopItem item : product.getItems()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java index 1d59c6d002..e7654ed911 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java @@ -60,7 +60,7 @@ public class AccountKicked implements IOutgoingPacket { OutgoingPackets.ACCOUNT_KICKED.writeId(packet); packet.writeD(_reason.getCode()); - return true; } } + diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 2e3a1f6163..1fe813e393 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: response + * Format: d d: response */ public class GGAuth implements IOutgoingPacket { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/network/serverpackets/Init.java index 4b3f71f30e..d725f45ca2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/network/serverpackets/Init.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/network/serverpackets/Init.java @@ -52,7 +52,6 @@ public class Init implements IOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.INIT.writeId(packet); - packet.writeD(_sessionId); // session id packet.writeD(0x0000c621); // protocol revision diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index 8c534554a8..f4dcd22b00 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: the failure reason + * Format: d d: the failure reason */ public class LoginFail implements IOutgoingPacket { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/network/BaseRecievePacket.java index c682cb741d..a6ed15ce32 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/network/BaseRecievePacket.java @@ -73,7 +73,7 @@ public abstract class BaseRecievePacket try { result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE); - result = result.substring(0, result.indexOf(0x00)); + result = result.substring(0, result.indexOf(0)); _off += (result.length() * 2) + 2; } catch (Exception e) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/network/BaseSendablePacket.java index a9d918de4c..8fa8491cbf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/network/BaseSendablePacket.java @@ -117,16 +117,16 @@ public abstract class BaseSendablePacket public byte[] getBytes() { // if (this instanceof Init) - // writeD(0x00); // reserve for XOR initial key + // writeD(0); // reserve for XOR initial key - writeD(0x00); // reserve for checksum + writeD(0); // reserve for checksum final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++) { - writeC(0x00); + writeC(0); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/AttackType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/AttackType.java index 6064b10ed7..e9983f15e3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/AttackType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/AttackType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum AttackType { - MISSED(0x01), - BLOCKED(0x02), - CRITICAL(0x04), - SHOT_USED(0x08); + MISSED(1), + BLOCKED(2), + CRITICAL(4), + SHOT_USED(8); private final int _mask; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/GroupType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/GroupType.java index 954aaace8b..916a14fd05 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/GroupType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/GroupType.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum GroupType implements IUpdateTypeComponent { - NONE(0x01), - PARTY(0x02), - COMMAND_CHANNEL(0x04); + NONE(1), + PARTY(2), + COMMAND_CHANNEL(4); private int _mask; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/ItemListType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/ItemListType.java index 2d38c8f5b1..c80234439f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/ItemListType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/ItemListType.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum ItemListType implements IUpdateTypeComponent { - AUGMENT_BONUS(0x01), - ELEMENTAL_ATTRIBUTE(0x02), - ENCHANT_EFFECT(0x04), - VISUAL_ID(0x08), - SOUL_CRYSTAL(0x10); + AUGMENT_BONUS(1), + ELEMENTAL_ATTRIBUTE(2), + ENCHANT_EFFECT(4), + VISUAL_ID(8), + SOUL_CRYSTAL(16); private final int _mask; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java index b3d08596c6..29403b783d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum MacroUpdateType { - ADD(0x01), - LIST(0x01), - MODIFY(0x02), - DELETE(0x00); + ADD(1), + LIST(1), + MODIFY(2), + DELETE(0); private final int _id; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java index 86c6159869..7776721c0f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java @@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum PartySmallWindowUpdateType implements IUpdateTypeComponent { - CURRENT_CP(0x01), - MAX_CP(0x02), - CURRENT_HP(0x04), - MAX_HP(0x08), - CURRENT_MP(0x10), - MAX_MP(0x20), - LEVEL(0x40), - CLASS_ID(0x80), - PARTY_SUBSTITUTE(0x100), - VITALITY_POINTS(0x200); + CURRENT_CP(1), + MAX_CP(2), + CURRENT_HP(4), + MAX_HP(8), + CURRENT_MP(16), + MAX_MP(32), + LEVEL(64), + CLASS_ID(128), + PARTY_SUBSTITUTE(256), + VITALITY_POINTS(512); private final int _mask; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 00bb331778..667ce7f17c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.Broadcast; import org.l2jmobius.gameserver.util.Util; /** - * Fromat:(ch) dddddc + * Format:(ch) dddddc * @author -Wooden- */ public class RequestExMagicSkillUseGround implements IClientIncomingPacket diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java index 8744393432..033095e74d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java @@ -39,7 +39,6 @@ public class AbnormalStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ABNORMAL_STATUS_UPDATE.writeId(packet); - packet.writeH(_effects.size()); for (BuffInfo info : _effects) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 1b8ddb2042..bec794bef3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -44,7 +44,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; } @@ -60,7 +59,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; setHtml(html); } @@ -77,13 +75,11 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } - if (!html.contains(""; return; } - _html = html; } @@ -96,7 +92,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } - setHtml(content); return true; } @@ -138,12 +133,10 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { player.clearHtmlActions(getScope()); } - if (_disabledValidation) { return; } - if (player != null) { Util.buildHtmlActionCache(player, getScope(), _npcObjId, _html); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 9964cd1f64..b4b72650cf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -110,12 +110,10 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket= 0) || (item.getAttributeDefence(AttributeType.FIRE) > 0) || (item.getAttributeDefence(AttributeType.WATER) > 0) || (item.getAttributeDefence(AttributeType.WIND) > 0) || (item.getAttributeDefence(AttributeType.EARTH) > 0) || (item.getAttributeDefence(AttributeType.HOLY) > 0) || (item.getAttributeDefence(AttributeType.DARK) > 0)) { mask |= ItemListType.ELEMENTAL_ATTRIBUTE.getMask(); } - if (item.getEnchantOptions() != null) { for (int id : item.getEnchantOptions()) @@ -127,17 +125,14 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket 0) { mask |= ItemListType.VISUAL_ID.getMask(); } - if (((item.getSoulCrystalOptions() != null) && !item.getSoulCrystalOptions().isEmpty()) || ((item.getSoulCrystalSpecialOptions() != null) && !item.getSoulCrystalSpecialOptions().isEmpty())) { mask |= ItemListType.SOUL_CRYSTAL.getMask(); } - return mask; } @@ -205,7 +200,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); packet.writeC(removeSkills.size()); for (Skill removed : removeSkills) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java index 8fa6259f64..6451dffd02 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ActionFailed implements IClientOutgoingPacket { public static final ActionFailed STATIC_PACKET = new ActionFailed(); - private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); + private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); static { for (SkillCastingType castingType : SkillCastingType.values()) @@ -57,7 +57,6 @@ public class ActionFailed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ACTION_FAIL.writeId(packet); - packet.writeD(_castingType); // MagicSkillUse castingType return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java index 6e868368c9..30ce58da60 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java @@ -44,9 +44,8 @@ public class AgitDecoInfo implements IClientOutgoingPacket { continue; } - packet.writeC(_residense.hasFunction(type) ? 0x01 : 0x00); + packet.writeC(_residense.hasFunction(type) ? 1 : 0); } - // Unknown packet.writeD(0); // TODO: Find me! packet.writeD(0); // TODO: Find me! diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java index 6cb71fc985..4683fb30f0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java @@ -44,7 +44,6 @@ public class AllianceInfo implements IClientOutgoingPacket _name = leader.getAllyName(); _leaderC = leader.getName(); _leaderP = leader.getLeaderName(); - final Collection allies = ClanTable.getInstance().getClanAllies(allianceId); _allies = new ClanInfo[allies.size()]; int idx = 0; @@ -57,7 +56,6 @@ public class AllianceInfo implements IClientOutgoingPacket total += ci.getTotal(); online += ci.getOnline(); } - _total = total; _online = online; } @@ -66,18 +64,16 @@ public class AllianceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_INFO.writeId(packet); - packet.writeS(_name); packet.writeD(_total); packet.writeD(_online); packet.writeS(_leaderC); packet.writeS(_leaderP); - packet.writeD(_allies.length); for (ClanInfo aci : _allies) { packet.writeS(aci.getClan().getName()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(aci.getClan().getLevel()); packet.writeS(aci.getClan().getLeaderName()); packet.writeD(aci.getTotal()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java index f9d08f6600..186fd12e81 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java @@ -44,7 +44,6 @@ public class AllyCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java index 6218f1717f..1ae4653f91 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java @@ -38,7 +38,6 @@ public class AskJoinAlly implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_ALLIANCE.writeId(packet); - packet.writeD(_requestorObjId); packet.writeS(null); // Ally Name ? packet.writeS(null); // TODO: Find me! diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java index a66bb3cd33..b9cfbe81b9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java @@ -39,7 +39,6 @@ public class AskJoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_PARTY.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 05c420ff59..227ab571be 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -45,7 +45,6 @@ public class Attack implements IClientOutgoingPacket _attackerObjId = attacker.getObjectId(); _attackerLoc = new Location(attacker); _targetLoc = new Location(target); - final Player player = attacker.getActingPlayer(); if (player == null) { @@ -111,7 +110,6 @@ public class Attack implements IClientOutgoingPacket final Iterator it = _hits.iterator(); final Hit firstHit = it.next(); OutgoingPackets.ATTACK.writeId(packet); - packet.writeD(_attackerObjId); packet.writeD(firstHit.getTargetId()); packet.writeD(_soulshotVisualSubstitute); // Ertheia @@ -121,13 +119,11 @@ public class Attack implements IClientOutgoingPacket packet.writeD(_attackerLoc.getX()); packet.writeD(_attackerLoc.getY()); packet.writeD(_attackerLoc.getZ()); - packet.writeH(_hits.size() - 1); while (it.hasNext()) { writeHit(packet, it.next()); } - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java index bd6878eb42..8b85fe85e3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java @@ -35,7 +35,6 @@ public class AutoAttackStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_START.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java index e767d1877a..a294b1e212 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java @@ -35,7 +35,6 @@ public class AutoAttackStop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_STOP.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java index 3f329415df..0c79677eae 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java @@ -38,7 +38,6 @@ public class BlockListPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BLOCK_LIST.writeId(packet); - packet.writeD(_playersId.size()); for (int playerId : _playersId) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index f610cdc6aa..d95f0543b9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -45,8 +45,7 @@ public class BuyList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x00); // Type BUY + packet.writeD(0); // Type BUY packet.writeQ(_money); // current money packet.writeD(_listId); packet.writeD(_inventorySlots); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index cd25af908d..7cb2bf4425 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -50,36 +50,34 @@ public class BuyListSeed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BUY_LIST_SEED.writeId(packet); - packet.writeQ(_money); // current money - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeD(_manorId); // manor id - if (!_list.isEmpty()) { packet.writeH(_list.size()); // list length for (SeedProduction s : _list) { - packet.writeC(0x00); // mask item 0 to print minimal item information + packet.writeC(0); // mask item 0 to print minimal item information packet.writeD(s.getId()); // ObjectId packet.writeD(s.getId()); // ItemId packet.writeC(0xFF); // T1 packet.writeQ(s.getAmount()); // Quantity - packet.writeC(0x05); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item - packet.writeC(0x00); // Filler (always 0) - packet.writeH(0x00); // Equipped : 00-No, 01-yes - packet.writeQ(0x00); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand - packet.writeH(0x00); // Enchant level (pet level shown in control item) + packet.writeC(5); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item + packet.writeC(0); // Filler (always 0) + packet.writeH(0); // Equipped : 00-No, 01-yes + packet.writeQ(0); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand + packet.writeH(0); // Enchant level (pet level shown in control item) packet.writeD(-1); packet.writeD(-9999); - packet.writeC(0x01); // GOD Item enabled = 1 disabled (red) = 0 + packet.writeC(1); // GOD Item enabled = 1 disabled (red) = 0 packet.writeQ(s.getPrice()); // price } _list.clear(); } else { - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java index 3a7b67af23..f3dc872dca 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java @@ -32,8 +32,7 @@ public class CSShowComBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - - packet.writeC(0x01); // c4 1 to show community 00 to hide + packet.writeC(1); // c4 1 to show community 00 to hide packet.writeB(_html); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java index eacc27aa07..b18dac4cc3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java @@ -36,7 +36,6 @@ public class CameraMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CAMERA_MODE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java index 1682f5bc62..adea754676 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java @@ -39,7 +39,6 @@ public class ChairSit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAIR_SIT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_staticObjectId); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java index 2bc31a285a..de141fa067 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java @@ -38,7 +38,6 @@ public class ChangeMoveType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_MOVE_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_running ? RUN : WALK); packet.writeD(0); // c2 diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index 73277d923d..fbe5e39e2e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -22,17 +22,17 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ChangeWaitType implements IClientOutgoingPacket { + public static final int WT_SITTING = 0; + public static final int WT_STANDING = 1; + public static final int WT_START_FAKEDEATH = 2; + public static final int WT_STOP_FAKEDEATH = 3; + private final int _objectId; private final int _moveType; private final int _x; private final int _y; private final int _z; - public static final int WT_SITTING = 0; - public static final int WT_STANDING = 1; - public static final int WT_START_FAKEDEATH = 2; - public static final int WT_STOP_FAKEDEATH = 3; - public ChangeWaitType(Creature creature, int newMoveType) { _objectId = creature.getObjectId(); @@ -46,7 +46,6 @@ public class ChangeWaitType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_WAIT_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_moveType); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index 41180bac50..aa2e7b2eaa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -30,7 +30,6 @@ public class CharCreateFail implements IClientOutgoingPacket public static final int REASON_CREATE_NOT_ALLOWED = 0x05; // "Characters cannot be created from this server." public static final int REASON_CHOOSE_ANOTHER_SVR = 0x06; // "Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please // choose another server." - private final int _error; public CharCreateFail(int errorCode) @@ -42,7 +41,6 @@ public class CharCreateFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index f0e99885ad..768617e558 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -31,8 +31,7 @@ public class CharCreateOk implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_SUCCESS.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index bed289ca0a..1674eef343 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -33,7 +33,6 @@ public class CharDeleteFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_DELETE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 607352f62b..d11d416867 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -33,6 +33,22 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { + private static final int[] PAPERDOLL_ORDER = new int[] + { + Inventory.PAPERDOLL_UNDER, + Inventory.PAPERDOLL_HEAD, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_LHAND, + Inventory.PAPERDOLL_GLOVES, + Inventory.PAPERDOLL_CHEST, + Inventory.PAPERDOLL_LEGS, + Inventory.PAPERDOLL_FEET, + Inventory.PAPERDOLL_CLOAK, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_HAIR, + Inventory.PAPERDOLL_HAIR2 + }; + private final Player _player; private final Clan _clan; private int _objId; @@ -55,22 +71,6 @@ public class CharInfo implements IClientOutgoingPacket private int _vehicleId = 0; private final boolean _gmSeeInvis; - private static final int[] PAPERDOLL_ORDER = new int[] - { - Inventory.PAPERDOLL_UNDER, - Inventory.PAPERDOLL_HEAD, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_LHAND, - Inventory.PAPERDOLL_GLOVES, - Inventory.PAPERDOLL_CHEST, - Inventory.PAPERDOLL_LEGS, - Inventory.PAPERDOLL_FEET, - Inventory.PAPERDOLL_CLOAK, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_HAIR, - Inventory.PAPERDOLL_HAIR2 - }; - public CharInfo(Player player, boolean gmSeeInvis) { _player = player; @@ -119,16 +119,15 @@ public class CharInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); // Confirmed packet.writeD(_y); // Confirmed packet.writeD(_z); // Confirmed packet.writeD(_vehicleId); // Confirmed packet.writeD(_objId); // Confirmed packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed - packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) @@ -152,10 +151,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.getPvpFlag()); packet.writeD(_player.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -166,53 +163,40 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); - packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeS(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle()); - packet.writeD(_player.getAppearance().getVisibleClanId()); packet.writeD(_player.getAppearance().getVisibleClanCrestId()); packet.writeD(_player.getAppearance().getVisibleAllyId()); packet.writeD(_player.getAppearance().getVisibleAllyCrestId()); - - packet.writeC(_player.isSitting() ? 0x00 : 0x01); // Confirmed - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // Confirmed - packet.writeC(_player.isInCombat() ? 0x01 : 0x00); // Confirmed - - packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 0x01 : 0x00); // Confirmed - - packet.writeC(_player.isInvisible() ? 0x01 : 0x00); - + packet.writeC(_player.isSitting() ? 0 : 1); // Confirmed + packet.writeC(_player.isRunning() ? 1 : 0); // Confirmed + packet.writeC(_player.isInCombat() ? 1 : 0); // Confirmed + packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 1 : 0); // Confirmed + packet.writeC(_player.isInvisible() ? 1 : 0); packet.writeC(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount packet.writeC(_player.getPrivateStoreType().getId()); // Confirmed packet.writeH(_player.getCubics().size()); // Confirmed _player.getCubics().keySet().forEach(packet::writeH); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); // Confirmed packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); packet.writeH(_player.getRecomHave()); // Confirmed packet.writeD(_player.getMountNpcId() == 0 ? 0 : _player.getMountNpcId() + 1000000); - packet.writeD(_player.getClassId().getId()); // Confirmed - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeC(_player.isMounted() ? 0 : _enchantLevel); // Confirmed - packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeD(_player.getClanCrestLargeId()); packet.writeC(_player.isNoble() ? 1 : 0); // Confirmed packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed - final ILocational baitLocation = _player.getFishing().getBaitLocation(); if (baitLocation != null) { @@ -228,29 +212,21 @@ public class CharInfo implements IClientOutgoingPacket } packet.writeD(_player.getAppearance().getNameColor()); // Confirmed - packet.writeD(_heading); // Confirmed - packet.writeC(_player.getPledgeClass()); packet.writeH(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); // Confirmed - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - - packet.writeC(0x00); // nPvPRestrainStatus - + packet.writeC(0); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentHp())); // Confirmed packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - - packet.writeC(0x00); // cBRLectureMark + packet.writeC(0); // cBRLectureMark final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed @@ -262,8 +238,9 @@ public class CharInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } + packet.writeC(_player.isTrueHero() ? 100 : 0); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); // Hair accessory + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); // Hair accessory packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 7187b73184..11f5f4df52 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -40,17 +40,16 @@ public class CharSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTED.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getTitle()); packet.writeD(_sessionId); packet.writeD(_player.getClanId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x01); // active ?? + packet.writeD(1); // active ?? packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -62,25 +61,20 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_player.getReputation()); packet.writeD(_player.getPkKills()); packet.writeD(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_player.getClassId().getId()); - packet.writeB(new byte[16]); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeB(new byte[28]); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 32fa8610ca..84daad43be 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -44,10 +44,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { private static final Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); - private final String _loginName; - private final int _sessionId; - private int _activeId; - private final List _characterPackages; private static final int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { @@ -62,6 +58,11 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_HAIR2, }; + private final String _loginName; + private final int _sessionId; + private int _activeId; + private final List _characterPackages; + /** * Constructor for CharSelectionInfo. * @param loginName @@ -92,16 +93,13 @@ public class CharSelectionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.size(); packet.writeD(size); // Created character count - packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) - packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 0x01 : 0x00); // if 1 can't create new char - packet.writeC(0x01); // 0=can't play, 1=can play free until level 85, 2=100% free play - packet.writeD(0x02); // if 1, Korean client - packet.writeC(0x00); // Balthus Knights, if 1 suggests premium account - + packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 1 : 0); // if 1 can't create new char + packet.writeC(1); // 0=can't play, 1=can play free until level 85, 2=100% free play + packet.writeD(2); // if 1, Korean client + packet.writeC(0); // Balthus Knights, if 1 suggests premium account long lastAccess = 0; if (_activeId == -1) { @@ -114,7 +112,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - for (int i = 0; i < size; i++) { final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); @@ -122,90 +119,73 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name packet.writeD(_sessionId); // Account ID - packet.writeD(0x00); // Clan ID - packet.writeD(0x00); // Builder level - + packet.writeD(0); // Clan ID + packet.writeD(0); // Builder level packet.writeD(charInfoPackage.getSex()); // Sex packet.writeD(charInfoPackage.getRace()); // Race packet.writeD(charInfoPackage.getBaseClassId()); - - packet.writeD(0x01); // GameServerName - + packet.writeD(1); // GameServerName packet.writeD(charInfoPackage.getX()); packet.writeD(charInfoPackage.getY()); packet.writeD(charInfoPackage.getZ()); packet.writeF(charInfoPackage.getCurrentHp()); packet.writeF(charInfoPackage.getCurrentMp()); - packet.writeQ(charInfoPackage.getSp()); packet.writeQ(charInfoPackage.getExp()); packet.writeF((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel()))); // High // Five packet.writeD(charInfoPackage.getLevel()); - packet.writeD(charInfoPackage.getReputation()); packet.writeD(charInfoPackage.getPkKills()); packet.writeD(charInfoPackage.getPvPKills()); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); // Ertheia - packet.writeD(0x00); // Ertheia - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); // Ertheia + packet.writeD(0); // Ertheia for (int slot : getPaperdollOrder()) { packet.writeD(charInfoPackage.getPaperdollItemId(slot)); } - for (int slot : getPaperdollOrderVisualId()) { packet.writeD(charInfoPackage.getPaperdollItemVisualId(slot)); } - packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_CHEST)); // Upper Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_LEGS)); // Lower Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_HEAD)); // Headgear enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_GLOVES)); // Gloves enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_FEET)); // Boots enchant level - packet.writeD(charInfoPackage.getHairStyle()); packet.writeD(charInfoPackage.getHairColor()); packet.writeD(charInfoPackage.getFace()); - packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); - packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption1Id() : 0); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption2Id() : 0); - // packet.writeD(charInfoPackage.getTransformId()); // Used to display Transformations - packet.writeD(0x00); // Currently on retail when you are on character select you don't see your transformation. - - packet.writeD(0x00); // Pet NpcId - packet.writeD(0x00); // Pet level - packet.writeD(0x00); // Pet Food - packet.writeD(0x00); // Pet Food Level - packet.writeF(0x00); // Current pet HP - packet.writeF(0x00); // Current pet MP - + packet.writeD(0); // Currently on retail when you are on character select you don't see your transformation. + packet.writeD(0); // Pet NpcId + packet.writeD(0); // Pet level + packet.writeD(0); // Pet Food + packet.writeD(0); // Pet Food Level + packet.writeF(0); // Current pet HP + packet.writeF(0); // Current pet MP packet.writeD(charInfoPackage.getVitalityPoints()); // Vitality packet.writeD((int) Config.RATE_VITALITY_EXP_MULTIPLIER * 100); // Vitality Percent packet.writeD(charInfoPackage.getVitalityItemsUsed()); // Remaining vitality item uses - packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0x00 : 0x01); // Char is active or not - packet.writeC(charInfoPackage.isNoble() ? 0x01 : 0x00); - packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 0x01 : 0x00); // Hero glow - packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 0x01 : 0x00); // Show hair accessory if enabled + packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0 : 1); // Char is active or not + packet.writeC(charInfoPackage.isNoble() ? 1 : 0); + packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 1 : 0); // Hero glow + packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 1 : 0); // Show hair accessory if enabled } return true; } @@ -214,7 +194,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); - try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate")) { @@ -227,7 +206,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (charInfopackage != null) { characterList.add(charInfopackage); - final Player player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { @@ -241,7 +219,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return characterList; } @@ -283,7 +260,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { clan.removeClanMember(objectId, 0); } - GameClient.deleteCharByObjId(objectId); return null; } @@ -302,20 +278,16 @@ public class CharSelectionInfo implements IClientOutgoingPacket charInfopackage.setHairStyle(chardata.getInt("hairstyle")); charInfopackage.setHairColor(chardata.getInt("haircolor")); charInfopackage.setSex(chardata.getInt("sex")); - charInfopackage.setExp(chardata.getLong("exp")); charInfopackage.setSp(chardata.getLong("sp")); charInfopackage.setVitalityPoints(chardata.getInt("vitality_points")); charInfopackage.setClanId(chardata.getInt("clanid")); - charInfopackage.setRace(chardata.getInt("race")); - final int baseClassId = chardata.getInt("base_class"); final int activeClassId = chardata.getInt("classid"); charInfopackage.setX(chardata.getInt("x")); charInfopackage.setY(chardata.getInt("y")); charInfopackage.setZ(chardata.getInt("z")); - final int faction = chardata.getInt("faction"); if (faction == 1) { @@ -325,7 +297,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setEvil(); } - if (Config.MULTILANG_ENABLE) { String lang = chardata.getString("language"); @@ -335,22 +306,18 @@ public class CharSelectionInfo implements IClientOutgoingPacket } charInfopackage.setHtmlPrefix("data/lang/" + lang + "/"); } - // if is in subclass, load subclass exp, sp, level info if (baseClassId != activeClassId) { loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId); } - charInfopackage.setClassId(activeClassId); - // Get the augmentation id for equipped weapon int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); if (weaponObjId < 1) { weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); } - if (weaponObjId > 0) { try (Connection con = DatabaseFactory.getConnection(); @@ -376,7 +343,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } - // Check if the base class is set to zero and also doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly. if ((baseClassId == 0) && (activeClassId > 0)) { @@ -386,7 +352,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setBaseClassId(baseClassId); } - charInfopackage.setDeleteTimer(deletetime); charInfopackage.setLastAccess(chardata.getLong("lastAccess")); charInfopackage.setNoble(chardata.getInt("nobless") == 1); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java index 847e24db87..d59df7911a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java @@ -32,7 +32,6 @@ public class ChooseInventoryItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHOOSE_INVENTORY_ITEM.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java index 12a3940521..ac66c2fa0f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java @@ -32,7 +32,6 @@ public class ClientSetTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CLIENT_SET_TIME.writeId(packet); - packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // time in client minutes packet.writeD(6); // constant to match the server time( this determines the speed of the client clock) return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java index 195824578b..5fdb62f544 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java @@ -68,7 +68,6 @@ public class ConfirmDlg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CONFIRM_DLG.writeId(packet); - final SMParam[] params = _systemMessage.getParams(); packet.writeD(_systemMessage.getId()); packet.writeD(params.length); @@ -130,7 +129,6 @@ public class ConfirmDlg implements IClientOutgoingPacket } } } - packet.writeD(_time); packet.writeD(_requesterId); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 2a98428740..85d5630327 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -71,7 +71,6 @@ public class CreatureSay implements IClientOutgoingPacket _mask |= 0x08; } } - // Does not shows level if (sender.isGM()) { @@ -123,7 +122,6 @@ public class CreatureSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_sender == null ? 0 : _sender.getObjectId()); packet.writeD(_chatType.getClientId()); if (_senderName != null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index dfc40d995f..a307b06e4b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -38,9 +38,8 @@ public class DeleteObject implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DELETE_OBJECT.writeId(packet); - packet.writeD(_objectId); - packet.writeC(0x00); // c2 + packet.writeC(0); // c2 return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java index 982c8f3311..3b5917e55b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java @@ -50,7 +50,6 @@ public class Dice implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DICE.writeId(packet); - packet.writeD(_objectId); // object id of player packet.writeD(_itemId); // item id of dice (spade) 4625,4626,4627,4628 packet.writeD(_number); // number rolled diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 3d741a86a6..ebc93d0fc4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -68,7 +68,6 @@ public class Die implements IClientOutgoingPacket siegeClan = fort.getSiege().getAttackerClan(clan); isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan); } - _toVillage = creature.canRevive() && !creature.isPendingRevive(); _toClanHall = (clan != null) && (clan.getHideoutId() > 0); _toCastle = ((clan != null) && (clan.getCastleId() > 0)) || isInCastleDefense; @@ -76,7 +75,6 @@ public class Die implements IClientOutgoingPacket _useFeather = creature.getAccessLevel().allowFixedRes() || creature.getInventory().haveItemForSelfResurrection(); _toFortress = ((clan != null) && (clan.getFortId() > 0)) || isInFortDefense; } - _isSweepable = creature.isAttackable() && creature.isSweepActive(); } @@ -91,7 +89,6 @@ public class Die implements IClientOutgoingPacket { _items = new ArrayList<>(8); } - if (_items.size() < 8) { _items.add(itemId); @@ -116,20 +113,18 @@ public class Die implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DIE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_toVillage ? 0x01 : 0x00); - packet.writeD(_toClanHall ? 0x01 : 0x00); - packet.writeD(_toCastle ? 0x01 : 0x00); - packet.writeD(_toOutpost ? 0x01 : 0x00); - packet.writeD(_isSweepable ? 0x01 : 0x00); - packet.writeD(_useFeather ? 0x01 : 0x00); - packet.writeD(_toFortress ? 0x01 : 0x00); - packet.writeD(0x00); // Disables use Feather button for X seconds - packet.writeD(0x00); // Adventure's Song - packet.writeC(_hideAnimation ? 0x01 : 0x00); - - packet.writeD(_itemsEnabled ? 0x01 : 0x00); + packet.writeD(_toVillage ? 1 : 0); + packet.writeD(_toClanHall ? 1 : 0); + packet.writeD(_toCastle ? 1 : 0); + packet.writeD(_toOutpost ? 1 : 0); + packet.writeD(_isSweepable ? 1 : 0); + packet.writeD(_useFeather ? 1 : 0); + packet.writeD(_toFortress ? 1 : 0); + packet.writeD(0); // Disables use Feather button for X seconds + packet.writeD(0); // Adventure's Song + packet.writeC(_hideAnimation ? 1 : 0); + packet.writeD(_itemsEnabled ? 1 : 0); packet.writeD(getItems().size()); getItems().forEach(packet::writeD); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java index 15404f9dee..5837faec19 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java @@ -33,7 +33,6 @@ public class DoorInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_INFO.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.getId()); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java index 54f8742a73..14d41afee7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java @@ -33,7 +33,6 @@ public class DoorStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_STATUS_UPDATE.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.isOpen() ? 0 : 1); packet.writeD(_door.getDamage()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index b12458e719..3035890956 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -40,20 +40,17 @@ public class DropItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DROP_ITEM.writeId(packet); - packet.writeD(_objectId); packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeC(_item.isStackable() ? 0x01 : 0x00); + packet.writeC(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - - packet.writeC(0x00); - // packet.writeD(0x01); if above C == true (1) then packet.readD() + packet.writeC(0); + // packet.writeD(1); if above C == true (1) then packet.readD() packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java index 631c43ba0c..99bd80d97e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java @@ -62,13 +62,12 @@ public class Earthquake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EARTHQUAKE.writeId(packet); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_intensity); packet.writeD(_duration); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index db168592f1..335ea9dced 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -58,7 +58,6 @@ public class EnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_crystal); packet.writeQ(_count); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java index 837be1f5e3..169410245b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java @@ -41,7 +41,6 @@ public class EtcStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ETC_STATUS_UPDATE.writeId(packet); - packet.writeC(_player.getCharges()); // 1-7 increase force, level packet.writeD(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%) packet.writeC(_player.getExpertiseWeaponPenalty()); // Weapon Grade Penalty [1-4] diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java index 5dca90f960..9f8d576148 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java @@ -24,13 +24,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class Ex2ndPasswordAck implements IClientOutgoingPacket { + // TODO: Enum + public static final int SUCCESS = 0; + public static final int WRONG_PATTERN = 1; + private final int _status; private final int _response; - // TODO: Enum - public static final int SUCCESS = 0x00; - public static final int WRONG_PATTERN = 0x01; - public Ex2ndPasswordAck(int status, int response) { _status = status; @@ -41,10 +41,9 @@ public class Ex2ndPasswordAck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_ACK.writeId(packet); - packet.writeC(_status); - packet.writeD(_response == WRONG_PATTERN ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(_response == WRONG_PATTERN ? 1 : 0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java index 48bde5161d..c86b5185d0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordCheck implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_NEW = 0x00; - public static final int PASSWORD_PROMPT = 0x01; - public static final int PASSWORD_OK = 0x02; + public static final int PASSWORD_NEW = 0; + public static final int PASSWORD_PROMPT = 1; + public static final int PASSWORD_OK = 2; private final int _windowType; @@ -40,9 +40,8 @@ public class Ex2ndPasswordCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_CHECK.writeId(packet); - packet.writeD(_windowType); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java index 1abf50ab01..f6731bf18f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordVerify implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_OK = 0x00; - public static final int PASSWORD_WRONG = 0x01; - public static final int PASSWORD_BAN = 0x02; + public static final int PASSWORD_OK = 0; + public static final int PASSWORD_WRONG = 1; + public static final int PASSWORD_BAN = 2; private final int _wrongTentatives; private final int _mode; @@ -42,7 +42,6 @@ public class Ex2ndPasswordVerify implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_VERIFY.writeId(packet); - packet.writeD(_mode); packet.writeD(_wrongTentatives); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java index 55abf718c5..db551344ef 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java @@ -45,10 +45,8 @@ public class ExAbnormalStatusUpdateFromTarget implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ABNORMAL_STATUS_UPDATE_FROM_TARGET.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeH(_effects.size()); - for (BuffInfo info : _effects) { packet.writeD(info.getSkill().getDisplayId()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java index c4b9cd8356..f3abd6ec5c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java @@ -41,7 +41,6 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRABLE_SKILL_LIST_BY_CLASS.writeId(packet); - packet.writeH(_type.getId()); packet.writeH(_learnable.size()); for (SkillLearn skill : _learnable) @@ -54,7 +53,7 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket packet.writeC(skill.getRequiredItems().size()); if (_type == AcquireSkillType.SUBPLEDGE) { - packet.writeH(0x00); + packet.writeH(0); } } return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java index fd0e2fc97c..8555bb6e86 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java @@ -61,7 +61,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_SKILL_INFO.writeId(packet); - packet.writeD(_id); packet.writeD(_level); packet.writeQ(_spCost); @@ -73,7 +72,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket packet.writeD(holder.getId()); packet.writeQ(holder.getCount()); } - packet.writeD(_skillRem.size()); for (Skill skill : _skillRem) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java index 29793f4d6c..ff8c526ec4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java @@ -36,7 +36,6 @@ public class ExAdenaInvenCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ADENA_INVEN_COUNT.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeH(_player.getInventory().getSize()); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java index 2aa2d85bc5..5ef11e0f1e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java @@ -50,13 +50,11 @@ public class ExAirShipInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_INFO.writeId(packet); - packet.writeD(_ship.getObjectId()); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(_captain); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); @@ -73,14 +71,13 @@ public class ExAirShipInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - packet.writeD(_ship.getFuel()); packet.writeD(_ship.getMaxFuel()); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java index 4cfc76bfba..8b37f4fc0a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java @@ -42,7 +42,6 @@ public class ExAirShipStopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_airShipId); packet.writeD(_playerId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java index 33c57712da..52958f931b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java @@ -37,12 +37,10 @@ public class ExAirShipTeleportList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_TELEPORT_LIST.writeId(packet); - packet.writeD(_dockId); if (_teleports != null) { packet.writeD(_teleports.length); - for (int i = 0; i < _teleports.length; i++) { packet.writeD(i - 1); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java index 392b228f0d..7918022c72 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java @@ -50,13 +50,12 @@ public class ExAlchemySkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_SKILL_LIST.writeId(packet); - packet.writeD(_skills.size()); for (Skill skill : _skills) { packet.writeD(skill.getId()); packet.writeD(skill.getLevel()); - packet.writeQ(0x00); // Always 0 on Naia, SP i guess? + packet.writeQ(0); // Always 0 on Naia, SP i guess? packet.writeC(skill.getId() == CommonSkill.ALCHEMY_CUBE.getId() ? 0 : 1); // This is type in flash, visible or not } return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java index 3d7ee12a81..1990e1e701 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java @@ -37,7 +37,6 @@ public class ExAskCoupleAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_COUPLE_ACTION.writeId(packet); - packet.writeD(_actionId); packet.writeD(_objectId); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java index 61cabedd98..45615daf5a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java @@ -39,9 +39,8 @@ public class ExAskJoinMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_MPCC.writeId(packet); - packet.writeS(_requestorName); // name of CCLeader - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java index 17fa9d028f..908022ff7e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java @@ -38,7 +38,6 @@ public class ExAskJoinPartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_PARTY_ROOM.writeId(packet); - packet.writeS(_charName); packet.writeS(_roomName); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java index 2a6b958dc9..1551840013 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java @@ -38,7 +38,6 @@ public class ExAskModifyPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_MODIFY_PARTY_LOOTING.writeId(packet); - packet.writeS(_requestor); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java index 958e7c3d06..fa62c8a207 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java @@ -45,7 +45,6 @@ public class ExAttributeEnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ATTRIBUTE_ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeC(_isWeapon); packet.writeH(_type); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java index 1a3a1ef3fe..3d65055b3c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java @@ -41,9 +41,8 @@ public class ExAutoSoulShot implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AUTO_SOUL_SHOT.writeId(packet); - packet.writeD(_itemId); - packet.writeD(_enable ? 0x01 : 0x00); + packet.writeD(_enable ? 1 : 0); packet.writeD(_type); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java index 8680c6bd7a..a8137347ec 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java @@ -37,8 +37,7 @@ public class ExBaseAttributeCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASE_ATTRIBUTE_CANCEL_RESULT.writeId(packet); - - packet.writeD(0x01); // result + packet.writeD(1); // result packet.writeD(_objId); packet.writeD(_attribute); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java index acbad69599..27f7fb5a63 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java @@ -75,7 +75,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 1149, 1150, 1151, 1152, 1153, 1154, 1155 }; - public static final int[] DEFAULT_ACTION_LIST = { 0, 1, 2, 3, @@ -145,7 +144,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 5012, 5013, 5014, 5015 }; //@formatter:on - public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST); private final int[] _actionIds; @@ -159,7 +157,6 @@ public class ExBasicActionList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASIC_ACTION_LIST.writeId(packet); - packet.writeD(_actionIds.length); for (int _actionId : _actionIds) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java index 4c4fac8c91..d32dca4d21 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java @@ -34,13 +34,14 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBeautyItemList implements IClientOutgoingPacket { - private int _colorCount; - private final BeautyData _beautyData; - private final Map> _colorData = new HashMap<>(); private static final int HAIR_TYPE = 0; private static final int FACE_TYPE = 1; private static final int COLOR_TYPE = 2; + private int _colorCount; + private final BeautyData _beautyData; + private final Map> _colorData = new HashMap<>(); + public ExBeautyItemList(Player player) { _beautyData = BeautyShopData.getInstance().getBeautyData(player.getRace(), player.getAppearance().getSexType()); @@ -60,7 +61,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BEAUTY_ITEM_LIST.writeId(packet); - packet.writeD(HAIR_TYPE); packet.writeD(_beautyData.getHairList().size()); for (BeautyItem hair : _beautyData.getHairList().values()) @@ -72,7 +72,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(hair.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(FACE_TYPE); packet.writeD(_beautyData.getFaceList().size()); for (BeautyItem face : _beautyData.getFaceList().values()) @@ -84,7 +83,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(face.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(COLOR_TYPE); packet.writeD(_colorCount); for (Entry> entry : _colorData.entrySet()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java index 1825236886..6d4c45cb2b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java @@ -34,7 +34,6 @@ public class ExBirthdayPopup implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_BIRTH_DAY.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java index 7d2f17e697..43e525f05f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java @@ -26,6 +26,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBrBroadcastEventState implements IClientOutgoingPacket { + public static final int APRIL_FOOLS = 20090401; + public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) + public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) + public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) + public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) + private final int _eventId; private final int _eventState; private int _param0; @@ -36,12 +42,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket private String _param5; private String _param6; - public static final int APRIL_FOOLS = 20090401; - public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) - public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) - public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) - public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) - public ExBrBroadcastEventState(int eventId, int eventState) { _eventId = eventId; @@ -65,7 +65,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BROADCAST_EVENT_STATE.writeId(packet); - packet.writeD(_eventId); packet.writeD(_eventState); packet.writeD(_param0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java index 1fd7ec663a..c0683c8797 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java @@ -44,7 +44,6 @@ public class ExBrBuffEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUFF_EVENT_STATE.writeId(packet); - packet.writeD(_type); packet.writeD(_value); packet.writeD(_state); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java index 943aae8a62..8e009d7b09 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java @@ -43,7 +43,6 @@ public class ExBrLoadEventTopRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_LOAD_EVENT_TOP_RANKERS.writeId(packet); - packet.writeD(_eventId); packet.writeD(_day); packet.writeD(_count); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java index 0a0ddf31b8..291f7a6b55 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java @@ -36,9 +36,8 @@ public class ExBrPremiumState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PREMIUM_STATE.writeId(packet); - packet.writeD(_player.getObjectId()); - packet.writeC(_player.hasPremiumStatus() || (_player.getVipTier() > 0) ? 0x01 : 0x00); + packet.writeC(_player.hasPremiumStatus() || (_player.getVipTier() > 0) ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 381dd859ad..567cfc70f9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -59,10 +59,8 @@ public class ExBuySellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x01); // Type SELL + packet.writeD(1); // Type SELL packet.writeD(_inventorySlots); - if ((_sellList != null)) { packet.writeH(_sellList.size()); @@ -74,9 +72,8 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - if ((_refundList != null) && !_refundList.isEmpty()) { packet.writeH(_refundList.size()); @@ -90,10 +87,9 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - - packet.writeC(_done ? 0x01 : 0x00); + packet.writeC(_done ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java index 2b43c0ce4b..e0ec81e0e7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java @@ -39,7 +39,6 @@ public class ExCastleState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CASTLE_STATE.writeId(packet); - packet.writeD(_castleId); packet.writeD(_castleSide.ordinal()); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java index b7f90d261b..a8196c7a83 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java @@ -52,7 +52,6 @@ public class ExChangeClientEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_CLIENT_EFFECT_INFO.writeId(packet); - packet.writeD(_type); packet.writeD(_key); packet.writeD(_value); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java index 472abc88df..eea59162ee 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java @@ -37,7 +37,6 @@ public class ExChangeNpcState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NPC_STATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java index 8cdcb4460d..45f2805517 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java @@ -49,7 +49,6 @@ public class ExChangePostState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_POST_STATE.writeId(packet); - packet.writeD(_receivedBoard ? 1 : 0); packet.writeD(_changedMsgIds.length); for (int postId : _changedMsgIds) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java index fc58ec9a2e..d765ab54e0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java @@ -35,7 +35,6 @@ public class ExChangeToAwakenedClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_TO_AWAKENED_CLASS.writeId(packet); - packet.writeD(_classId); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index f51a3eb3ae..1e9b8e9dc8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -47,7 +47,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket throw new IllegalArgumentException("Undefined Atribute item: " + stone); } _level = ElementalAttributeData.getInstance().getMaxElementLevel(_itemId); - // Register only items that can be put an attribute stone/crystal for (Item item : player.getInventory().getItems()) { @@ -62,7 +61,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_INVENTORY_ATTRIBUTE_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeQ(_count); packet.writeD(_atribute == AttributeType.FIRE ? 1 : 0); // Fire diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java index a272d85469..238882cd11 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java @@ -35,7 +35,6 @@ public class ExCloseMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java index d2ecd70952..877bca760a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java @@ -34,7 +34,6 @@ public class ExClosePartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_PARTY_ROOM.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java index 27c112776b..1d02c972b5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java @@ -54,7 +54,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLOSSEUM_FENCE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_clientState); packet.writeD(_x); @@ -62,7 +61,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_width); packet.writeD(_length); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java index 766d3619ad..b72bef93e8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java @@ -37,9 +37,8 @@ public class ExConfirmAddingContact implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AGIT_AUCTION_CMD.writeId(packet); - packet.writeS(_charName); - packet.writeD(_added ? 0x01 : 0x00); + packet.writeD(_added ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java index beded32254..c832d507ed 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameAddPlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x01); - + packet.writeD(1); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java index 5f36f730d0..847ea93e6a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java @@ -45,9 +45,7 @@ public class ExCubeGameChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java index 66abbf4b75..a2f2e61ded 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java @@ -43,12 +43,10 @@ public class ExCubeGameChangeTeam implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x05); - + packet.writeD(5); packet.writeD(_player.getObjectId()); - packet.writeD(_fromRedTeam ? 0x01 : 0x00); - packet.writeD(_fromRedTeam ? 0x00 : 0x01); + packet.writeD(_fromRedTeam ? 1 : 0); + packet.writeD(_fromRedTeam ? 0 : 1); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java index 5273b2099a..136b439283 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java @@ -39,9 +39,7 @@ public class ExCubeGameChangeTimeToStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x03); - + packet.writeD(3); packet.writeD(_seconds); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java index f81a302941..9bdba49029 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java @@ -35,7 +35,6 @@ public class ExCubeGameCloseUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0xffffffff); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java index 259a0e9407..3177e7a488 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java @@ -40,11 +40,9 @@ public class ExCubeGameEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x01); - - packet.writeD(_isRedTeamWin ? 0x01 : 0x00); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(1); + packet.writeD(_isRedTeamWin ? 1 : 0); + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java index 4d89e621ce..8b96bb545f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java @@ -55,14 +55,11 @@ public class ExCubeGameExtendedChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeD(_playerPoints); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java index e5a00f1ab7..c084789f13 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameRemovePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java index 00be884d2f..35a3f289d1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java @@ -35,8 +35,7 @@ public class ExCubeGameRequestReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x04); + packet.writeD(4); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java index 1bc89e0c32..8b755dd3cc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java @@ -30,7 +30,6 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket // Players Lists private final List _bluePlayers; private final List _redPlayers; - // Common Values private final int _roomNumber; @@ -51,12 +50,9 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_roomNumber); packet.writeD(0xffffffff); - packet.writeD(_bluePlayers.size()); for (Player player : _bluePlayers) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java index 2f2c092c08..d000112787 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java @@ -31,7 +31,6 @@ public class ExCursedWeaponList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet); - final Set ids = CursedWeaponsManager.getInstance().getCursedWeaponsIds(); packet.writeD(ids.size()); ids.forEach(packet::writeD); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java index 2f60a1b80c..5bc7ff3238 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java @@ -39,7 +39,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet); - if (!_cursedWeaponInfo.isEmpty()) { packet.writeD(_cursedWeaponInfo.size()); @@ -47,7 +46,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { packet.writeD(w.id); packet.writeD(w.activated); - packet.writeD(w.pos.getX()); packet.writeD(w.pos.getY()); packet.writeD(w.pos.getZ()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java index f475a02b28..0456fb9dae 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java @@ -34,7 +34,6 @@ public class ExDissmissMPCCRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DISSMISS_MPCC_ROOM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java index 258010f717..c731b7c7a9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java @@ -37,7 +37,6 @@ public class ExDuelAskStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_ASK_START.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDuel); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java index 043c82c0db..e9a31bee57 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java @@ -38,7 +38,6 @@ public class ExDuelEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_END.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java index 264409b3d6..e1fa1cea88 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java @@ -38,7 +38,6 @@ public class ExDuelReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_READY.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java index 488aafcb7d..ecdd528a16 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java @@ -38,7 +38,6 @@ public class ExDuelStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_START.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java index 7df040c5e7..5ed0c09675 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java @@ -36,7 +36,6 @@ public class ExDuelUpdateUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_UPDATE_USER_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeD(_player.getClassId().getId()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 7ab055a3d8..f58c0573a8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExEnchantSkillInfo implements IClientOutgoingPacket { private final Set _routes; - private final int _skillId; private final int _skillLevel; private final int _skillSubLevel; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 41368a8efb..e4ee350e64 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -50,7 +50,6 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_INFO_DETAIL.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java index 5cedcd6284..1d32f0d725 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java @@ -43,7 +43,6 @@ public class ExEnchantSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_LIST.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skills.size()); for (Skill skill : _skills) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java index 6ab5e869f2..853d74039f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java @@ -38,7 +38,6 @@ public class ExEnchantSkillResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_RESULT.writeId(packet); - packet.writeD(_enchanted ? 1 : 0); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java index 7b7d2d008d..410bf16510 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java @@ -42,7 +42,6 @@ public class ExEventMatchMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_EVENT_MATCH_MESSAGE.writeId(packet); - packet.writeC(_type); packet.writeS(_message); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java index 7264e90233..1946758bf5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java @@ -37,11 +37,9 @@ public class ExGetBookMarkInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOOK_MARK_INFO.writeId(packet); - - packet.writeD(0x00); // Dummy + packet.writeD(0); // Dummy packet.writeD(_player.getBookMarkSlot()); packet.writeD(_player.getTeleportBookmarks().size()); - for (TeleportBookmark tpbm : _player.getTeleportBookmarks()) { packet.writeD(tpbm.getId()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java index 36e7bb81af..201e8eb49b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java @@ -42,15 +42,14 @@ public class ExGetBossRecord implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOSS_RECORD.writeId(packet); - packet.writeD(_ranking); packet.writeD(_totalPoints); if (_bossRecordInfo == null) { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } else { @@ -59,7 +58,7 @@ public class ExGetBossRecord implements IClientOutgoingPacket { packet.writeD(entry.getKey()); packet.writeD(entry.getValue()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? } } return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java index ea0a5f8b18..85ccad0758 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java @@ -41,7 +41,6 @@ public class ExGetOffAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_OFF_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java index f8e16a4191..9a02e49223 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java @@ -39,7 +39,6 @@ public class ExGetOnAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_ON_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java index 51197344a5..704b3212a1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExGetPremiumItemList implements IClientOutgoingPacket { private final Player _player; - private final Map _map; public ExGetPremiumItemList(Player player) @@ -43,7 +42,6 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_PREMIUM_ITEM_LIST.writeId(packet); - packet.writeD(_map.size()); for (Entry entry : _map.entrySet()) { @@ -51,7 +49,7 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket packet.writeQ(entry.getKey()); packet.writeD(item.getItemId()); packet.writeQ(item.getCount()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeS(item.getSender()); } return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index a005fa8ad8..0200bdee08 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -40,7 +40,6 @@ public class ExHeroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HERO_LIST.writeId(packet); - packet.writeD(_heroList.size()); for (StatSet hero : _heroList.values()) { @@ -51,7 +50,7 @@ public class ExHeroList implements IClientOutgoingPacket packet.writeS(hero.getString(Hero.ALLY_NAME, "")); packet.writeD(hero.getInt(Hero.ALLY_CREST, 0)); packet.writeD(hero.getInt(Hero.COUNT)); - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index d5b5430142..0baca7cd86 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -48,8 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); - - packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade + packet.writeC(_hide ? 0 : 1); // Grand Crusade packet.writeD(_currentTemplateId); packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java index 81db66b88f..323c0cdf1e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java @@ -35,7 +35,6 @@ public class ExIsCharNameCreatable implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_IS_CHAR_NAME_CREATABLE.writeId(packet); - packet.writeD(_allowed); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java index ecc751eab3..45def9e0be 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java @@ -38,7 +38,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { throw new NullPointerException(); } - if (currentAuction.getAuctionState() != ItemAuctionState.STARTED) { _timeRemaining = 0; @@ -47,7 +46,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { _timeRemaining = (int) (currentAuction.getFinishingTimeRemaining() / 1000); // in seconds } - _refresh = refresh; _currentAuction = currentAuction; _nextAuction = nextAuction; @@ -57,16 +55,12 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_AUCTION_INFO.writeId(packet); - - packet.writeC(_refresh ? 0x00 : 0x01); + packet.writeC(_refresh ? 0 : 1); packet.writeD(_currentAuction.getInstanceId()); - final ItemAuctionBid highestBid = _currentAuction.getHighestBid(); packet.writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid()); - packet.writeD(_timeRemaining); writeItem(packet, _currentAuction.getItemInfo()); - if (_nextAuction != null) { packet.writeQ(_nextAuction.getAuctionInitBid()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java index 53ad8abd58..1c5e38cbab 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListMpccWaiting implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _rooms = new LinkedList<>(); @@ -53,7 +54,6 @@ public class ExListMpccWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_MPCC_WAITING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 78f2fec636..eafea24fa6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _players = new LinkedList<>(); @@ -60,7 +61,6 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(packet); - packet.writeD(_size); packet.writeD(_players.size()); for (Player player : _players) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java index 786c616875..c8723a9fc0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java @@ -46,7 +46,6 @@ public class ExMPCCPartyInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCPARTY_INFO_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_LeaderOID); packet.writeD(_memberCount); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java index 4bf07f0133..08259e4e6c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java @@ -37,7 +37,6 @@ public class ExMPCCPartymasterList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_PARTYMASTER_LIST.writeId(packet); - packet.writeD(_leadersName.size()); _leadersName.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java index abbdc8fe76..f021ef5f1f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java @@ -36,7 +36,6 @@ public class ExMPCCRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java index 154e156270..2eec590cb4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java @@ -41,7 +41,6 @@ public class ExMPCCRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java index 06e3027bfc..a0e9d0a4b0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java @@ -37,7 +37,6 @@ public class ExMPCCShowPartyMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCSHOW_PARTY_MEMBER_INFO.writeId(packet); - packet.writeD(_party.getMemberCount()); for (Player pc : _party.getMembers()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java index e454a746f3..771b2f22cb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java @@ -49,7 +49,6 @@ public class ExMagicAttackInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAGIC_ATTACK_INFO.writeId(packet); - packet.writeD(_caster); packet.writeD(_target); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java index 9cfbeb5aee..1aaa5b6520 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java @@ -35,7 +35,6 @@ public class ExMailArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAIL_ARRIVED.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java index 983ff22b92..48156c0600 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java @@ -44,7 +44,6 @@ public class ExManageMpccRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MANAGE_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java index f710c006e8..9d7d14211e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java @@ -45,7 +45,6 @@ public class ExMoveToLocationAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_objId); packet.writeD(_tx); packet.writeD(_ty); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java index 3e3bdc9fed..87e44b51cd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java @@ -43,7 +43,6 @@ public class ExMoveToLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java index 7ab0d1c7da..3c1902892a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java @@ -40,11 +40,9 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet); - packet.writeS(_channel.getLeader().getName()); - packet.writeD(0x00); // Channel loot 0 or 1 + packet.writeD(0); // Channel loot 0 or 1 packet.writeD(_channel.getMemberCount()); - packet.writeD(_channel.getParties().size()); for (Party p : _channel.getParties()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java index 1536bd5f9b..f2a32bb6e8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java @@ -43,7 +43,6 @@ public class ExNeedToChangeName implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEED_TO_CHANGE_NAME.writeId(packet); - packet.writeD(_type); packet.writeD(_subType); packet.writeS(_name); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java index be9bec8559..d18b4606b3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java @@ -35,7 +35,6 @@ public class ExNevitAdventEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CHANNELING_EFFECT.writeId(packet); - packet.writeD(_timeLeft); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java index 3a0367c178..09f6250f51 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java @@ -35,7 +35,6 @@ public class ExNevitAdventPointInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_AGATHION_ENERGY_INFO.writeId(packet); - packet.writeD(_points); // 72 = 1%, max 7200 = 100% return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java index 88fdaae499..ef220d86de 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java @@ -37,9 +37,8 @@ public class ExNevitAdventTimeChange implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - // state 0 - pause 1 - started - packet.writeC(_paused ? 0x00 : 0x01); + packet.writeC(_paused ? 0 : 1); // left time in ms max is 16000 its 4m and state is automatically changed to quit packet.writeD(_time); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java index fccdf510cc..4025bf78fa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java @@ -34,7 +34,6 @@ public class ExNewSkillToLearnByLevelUp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEW_SKILL_TO_LEARN_BY_LEVEL_UP.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java index 324c18a517..f2ce8614dc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java @@ -43,8 +43,7 @@ public class ExNoticePostArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTICE_POST_ARRIVED.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java index afe3719d9b..050c7ccea5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java @@ -43,8 +43,7 @@ public class ExNoticePostSent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_WRITE_POST.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java index 5d98c20b09..e0bd08d39a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java @@ -30,7 +30,6 @@ public class ExNotifyPremiumItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_PREMIUM_ITEM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java index 6cb3724448..ba3c0cfeaa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java @@ -34,7 +34,6 @@ public class ExOlympiadMatchEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MATCH_END.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java index 264d5aa484..7ffd5ed3bd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java @@ -55,19 +55,15 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x00); // Type 0 = Match List, 1 = Match Result - + packet.writeD(0); // Type 0 = Match List, 1 = Match Result packet.writeD(_games.size()); - packet.writeD(0x00); - + packet.writeD(0); for (OlympiadGameTask curGame : _games) { final AbstractOlympiadGame game = curGame.getGame(); if (game != null) { packet.writeD(game.getStadiumId()); // Stadium Id (Arena 1 = 0) - if (game instanceof OlympiadGameNonClassed) { packet.writeD(1); @@ -80,8 +76,7 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket { packet.writeD(0); } - - packet.writeD(curGame.isRunning() ? 0x02 : 0x01); // (1 = Standby, 2 = Playing) + packet.writeD(curGame.isRunning() ? 2 : 1); // (1 = Standby, 2 = Playing) packet.writeS(game.getPlayerNames()[0]); // Player 1 Name packet.writeS(game.getPlayerNames()[1]); // Player 2 Name } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java index 712651603d..b387271fba 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java @@ -53,9 +53,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x01); // Type 0 = Match List, 1 = Match Result - + packet.writeD(1); // Type 0 = Match List, 1 = Match Result packet.writeD(_tie ? 1 : 0); // 0 - win, 1 - tie packet.writeS(_winnerList.get(0).getName()); packet.writeD(_winTeam); @@ -69,9 +67,8 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } - packet.writeD(_loseTeam); packet.writeD(_loserList.size()); for (OlympiadInfo info : _loserList) @@ -83,7 +80,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java index 34d81d1f53..712b9e06c6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java @@ -38,7 +38,6 @@ public class ExOlympiadMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MODE.writeId(packet); - packet.writeC(_mode); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java index ebea6c56f3..5b4f2c2523 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java @@ -53,7 +53,6 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_SPELLED_INFO.writeId(packet); - packet.writeD(_playerId); packet.writeD(_effects.size() + _effects2.size()); for (BuffInfo info : _effects) @@ -62,7 +61,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(info.getSkill().getDisplayId()); packet.writeH(info.getSkill().getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(info.getSkill().getAbnormalType().getClientId()); writeOptionalD(packet, info.getSkill().isAura() ? -1 : info.getTime()); } @@ -73,7 +72,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(skill.getDisplayId()); packet.writeH(skill.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(skill.getAbnormalType().getClientId()); packet.writeH(-1); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java index 18c34fe9de..ca473edfcf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java @@ -76,7 +76,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_USER_INFO.writeId(packet); - if (_player != null) { packet.writeC(_player.getOlympiadSide()); @@ -91,7 +90,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket packet.writeS(_par.getName()); packet.writeD(_par.getBaseClass()); } - packet.writeD(_curHp); packet.writeD(_maxHp); packet.writeD(_curCp); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java index e84d0251bd..7ec64cc8c3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java @@ -35,7 +35,6 @@ public class ExOpenMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OPEN_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java index 90349cc1a2..5661dc9f57 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java @@ -56,7 +56,6 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PCCAFE_POINT_INFO.writeId(packet); - packet.writeD(_points); // num points packet.writeD(_mAddPoint); // points inc display packet.writeC(_mPeriodType); // period(0=don't show window,1=acquisition,2=use points) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java index f7e8b4a99a..248a2f7d98 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_ADD.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java index 832bee0012..1f452f4bae 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_DELETE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_summon.getSummonType()); packet.writeD(_summon.getOwner().getObjectId()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java index 0646a67001..703694fa2f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_UPDATE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 0e3edb3ea7..e4c6b79ae0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -47,7 +47,6 @@ public class ExPartyRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2bffdec368..2ebf1dc7f0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -43,10 +43,8 @@ public class ExPetInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class ExPetInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class ExPetInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,9 +154,8 @@ public class ExPetInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -227,28 +205,24 @@ public class ExPetInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PET_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -267,7 +241,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -283,19 +257,19 @@ public class ExPetInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -307,20 +281,20 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -344,12 +318,12 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -379,12 +353,10 @@ public class ExPetInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java index 082f4c7662..0f72c05a3a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java @@ -34,7 +34,6 @@ public class ExPlayScene implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLAY_SCENE.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java index e98d317e14..7e3803bdaa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java @@ -36,7 +36,6 @@ public class ExPledgeCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_COUNT.writeId(packet); - packet.writeD(_count); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java index 838029e284..4084de3481 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java @@ -38,7 +38,6 @@ public class ExPledgeDraftListSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_DRAFT_LIST_SEARCH.writeId(packet); - packet.writeD(_pledgeRecruitList.size()); for (PledgeWaitingInfo prl : _pledgeRecruitList) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java index fb956e9996..44e34004ea 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java @@ -25,11 +25,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExPledgeEmblem implements IClientOutgoingPacket { + private static final int TOTAL_SIZE = 65664; + private final int _crestId; private final int _clanId; private final byte[] _data; private final int _chunkId; - private static final int TOTAL_SIZE = 65664; public ExPledgeEmblem(int crestId, byte[] chunkedData, int clanId, int chunkId) { @@ -43,7 +44,6 @@ public class ExPledgeEmblem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clanId); packet.writeD(_crestId); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java index ed19bf976b..b32f8c0645 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitApplyInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_APPLY_INFO.writeId(packet); - packet.writeD(_status.ordinal()); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java index fc98b7b6f7..af4af9c9c1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitBoardDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_DETAIL.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClanId()); packet.writeD(_pledgeRecruitInfo.getKarma()); packet.writeS(_pledgeRecruitInfo.getInformation()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index b4d48373a6..eda808e754 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -34,7 +34,6 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket private final int _clanOnCurrentPage; private final int _startIndex; private final int _endIndex; - static final int CLAN_PER_PAGE = 12; public ExPledgeRecruitBoardSearch(List clanList, int currentPage) @@ -51,11 +50,9 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_SEARCH.writeId(packet); - packet.writeD(_currentPage); packet.writeD(_totalNumberOfPage); packet.writeD(_clanOnCurrentPage); - for (int i = _startIndex; i < _endIndex; i++) { packet.writeD(_clanList.get(i).getClanId()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 4ae5ffe316..b1f139226d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -40,7 +40,6 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java index 77080a3820..5844f220ec 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java @@ -39,7 +39,6 @@ public class ExPledgeWaitingList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST.writeId(packet); - packet.writeD(pledgePlayerRecruitInfos.size()); for (PledgeApplicantInfo recruitInfo : pledgePlayerRecruitInfos.values()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java index a9245c1309..6b88572057 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java @@ -30,7 +30,6 @@ public class ExPledgeWaitingListAlarm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_ALARM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java index 60997b3da0..28c3967119 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java @@ -40,7 +40,6 @@ public class ExPledgeWaitingListApplied implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_APPLIED.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClan().getId()); packet.writeS(_pledgeRecruitInfo.getClan().getName()); packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java index 66a06892c2..1f53d1bb38 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java @@ -36,7 +36,6 @@ public class ExPledgeWaitingUser implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_USER.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getPlayerId()); packet.writeS(_pledgeRecruitInfo.getMessage()); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java index 49bc9b0995..5f404779f5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java @@ -43,7 +43,6 @@ public class ExPrivateStoreSetWholeMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_objectId); packet.writeS(_msg); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java index cb5e8fbce9..ff996b5d0c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutCommissionResultForVariationMake implements IClientOutgoingPac public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_COMMISSION_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_gemstoneObjId); packet.writeD(_itemId); packet.writeQ(_gemstoneCount); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java index 81721e921f..098472b7ae 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantScrollItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SCROLL_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java index 871f377db2..ffea182a49 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java index c47a4bcff4..8016e128f4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java index c8b46be499..95c0c0e4e1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_INTENSIVE_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_refinerItemObjId); packet.writeD(_lifestoneItemId); packet.writeD(_gemstoneItemId); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 2128b2b19f..2970ca00a2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -41,13 +41,12 @@ public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_CANCEL.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); packet.writeD(_itemAug1); packet.writeD(_itemAug2); packet.writeQ(_price); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java index 80541e65cd..c25dd16b01 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java @@ -34,10 +34,9 @@ public class ExPutItemResultForVariationMake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index b739a94c55..c4d27d1728 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -48,7 +48,6 @@ public class ExQuestItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java index fe5eb74eb0..bc8896164d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java @@ -56,13 +56,12 @@ public class ExQuestNpcLogList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_NPC_LOG_LIST.writeId(packet); - packet.writeD(_questId); packet.writeC(_npcLogList.size()); for (NpcLogListHolder holder : _npcLogList) { packet.writeD(holder.isNpcString() ? holder.getId() : holder.getId() + 1000000); - packet.writeC(holder.isNpcString() ? 0x01 : 0x00); + packet.writeC(holder.isNpcString() ? 1 : 0); packet.writeD(holder.getCount()); } return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java index 62d622caff..60616b256d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java @@ -35,7 +35,6 @@ public class ExRedSky implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RED_SKY.writeId(packet); - packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java index ce40b1a792..163faff855 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java @@ -36,7 +36,6 @@ public class ExRegenMax implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REGEN_MAX.writeId(packet); - packet.writeD(1); packet.writeD(_time); packet.writeD(_tickInterval); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java index d864795cd6..a17525576b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java @@ -34,7 +34,6 @@ public class ExRemoveEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REMOVE_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 29d5eafeef..77458fd485 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -41,7 +41,6 @@ public class ExReplyPostItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_POST_ITEM_LIST.writeId(packet); - packet.writeD(_itemList.size()); for (Item item : _itemList) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 57ed88ac29..4e479e75a6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -56,7 +56,6 @@ public class ExReplyReceivedPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_RECEIVED_POST.writeId(packet); - packet.writeD(_msg.getMailType().ordinal()); // GOD if (_msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED) { @@ -76,11 +75,10 @@ public class ExReplyReceivedPost extends AbstractItemPacket } packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown packet.writeS(_msg.getSenderName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -92,9 +90,8 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeQ(_msg.getReqAdena()); packet.writeD(_msg.hasAttachments() ? 1 : 0); packet.writeD(_msg.isReturned() ? 1 : 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 75f6596194..ed490eae91 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -54,14 +54,12 @@ public class ExReplySentPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_SENT_POST.writeId(packet); - - packet.writeD(0x00); // GOD + packet.writeD(0); // GOD packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); packet.writeS(_msg.getReceiverName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -73,11 +71,11 @@ public class ExReplySentPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeQ(_msg.getReqAdena()); - packet.writeD(_msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(_msg.isReturned() ? 0x01 : 00); + packet.writeD(_msg.hasAttachments() ? 1 : 0); + packet.writeD(_msg.isReturned() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index cc4f7ce1d8..e6a3f9bca2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -35,7 +35,6 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java index 2634aa1cdd..60201b177f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java @@ -35,7 +35,6 @@ public class ExRequestHackShield implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REQUEST_HACK_SHIELD.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java index c51ff31d0b..75e3b3a945 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java @@ -29,13 +29,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyList implements IClientOutgoingPacket { + public static final int SHOW_FACESHAPE = 1; + public static final int SHOW_HAIRSTYLE = 0; + private final Player _player; private final int _type; private final Map _beautyItem; - public static final int SHOW_FACESHAPE = 1; - public static final int SHOW_HAIRSTYLE = 0; - public ExResponseBeautyList(Player player, int type) { _player = player; @@ -54,7 +54,6 @@ public class ExResponseBeautyList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java index ca2ed360ab..4b19201833 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java @@ -25,16 +25,15 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket { + public static final int FAILURE = 0; + public static final int SUCCESS = 1; + public static final int CHANGE = 0; + public static final int RESTORE = 1; + private final Player _player; private final int _type; private final int _result; - public static final int FAILURE = 0; - public static final int SUCCESS = 1; - - public static final int CHANGE = 0; - public static final int RESTORE = 1; - public ExResponseBeautyRegistReset(Player player, int type, int result) { _player = player; @@ -46,7 +45,6 @@ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_REGIST_RESET.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java index 0e313ef3b7..c0922cfb04 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java @@ -36,10 +36,8 @@ public class ExResponseResetList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_RESET_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); - packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java index 01fe1945ef..a230033d67 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java @@ -37,7 +37,6 @@ public class ExRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ROTATION.writeId(packet); - packet.writeD(_charId); packet.writeD(_heading); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index c58ccfc233..2646a71e77 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -36,7 +36,6 @@ public class ExRpItemLink extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RP_ITEM_LINK.writeId(packet); - writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java index 04556bbed2..f0c6eba8e9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java @@ -34,7 +34,6 @@ public class ExSearchOrc implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEARCH_ORC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index 1e06cc2a3f..7a4dced122 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -38,7 +38,6 @@ public class ExSendManorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_MANOR_LIST.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java index b63c69f37e..2c25cc8bfc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java @@ -124,7 +124,6 @@ public class ExSendUIEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_UIEVENT.writeId(packet); - packet.writeD(_objectId); packet.writeD(_type); // 0 = show, 1 = hide (there is 2 = pause and 3 = resume also but they don't work well you can only pause count down and you cannot resume it because resume hides the counter). packet.writeD(0); // unknown diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java index 4378479707..716a3e8623 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java @@ -385,16 +385,13 @@ public class ExServerPrimitive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SERVER_PRIMITIVE.writeId(packet); - packet.writeS(_name); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(65535); // has to do something with display range and angle packet.writeD(65535); // has to do something with display range and angle - packet.writeD(_points.size() + _lines.size()); - for (Point point : _points) { packet.writeC(1); // Its the type in this case Point @@ -408,7 +405,6 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(point.getY()); packet.writeD(point.getZ()); } - for (Line line : _lines) { packet.writeC(2); // Its the type in this case Line diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java index fb32e199b2..51fb91b643 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java @@ -46,7 +46,6 @@ public class ExSetCompassZoneCode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_COMPASS_ZONE_CODE.writeId(packet); - packet.writeD(_zoneType); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java index 1d0fbae3a4..34dee8bda0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java @@ -38,7 +38,6 @@ public class ExSetPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_PARTY_LOOTING.writeId(packet); - packet.writeD(_result); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java index 7b14ec8412..4e491af9d1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java @@ -34,7 +34,6 @@ public class ExShowAdventurerGuideBook implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_ADVENTURER_GUIDE_BOOK.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index 82554fdc5f..1f8df76083 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -39,7 +39,6 @@ public class ExShowAgitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AGIT_INFO.writeId(packet); - final Collection clanHalls = ClanHallData.getInstance().getClanHalls(); packet.writeD(clanHalls.size()); clanHalls.forEach(clanHall -> diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index dd11ee0150..51e6646ff5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -44,7 +44,6 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BASE_ATTRIBUTE_CANCEL_WINDOW.writeId(packet); - packet.writeD(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java index 14e55d39f3..e22345c4fd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java @@ -25,13 +25,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExShowBeautyMenu implements IClientOutgoingPacket { - private final Player _player; - private final int _type; - // TODO: Enum public static final int MODIFY_APPEARANCE = 0; public static final int RESTORE_APPEARANCE = 1; + private final Player _player; + private final int _type; + public ExShowBeautyMenu(Player player, int type) { _player = player; @@ -42,7 +42,6 @@ public class ExShowBeautyMenu implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BEAUTY_MENU.writeId(packet); - packet.writeD(_type); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 15d011befc..b0d2b90494 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -41,7 +41,6 @@ public class ExShowCastleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CASTLE_INFO.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) @@ -65,8 +64,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } packet.writeD(castle.getTaxPercent(TaxType.BUY)); packet.writeD((int) (castle.getSiege().getSiegeDate().getTimeInMillis() / 1000)); - - packet.writeC(castle.getSiege().isInProgress() ? 0x01 : 0x00); // Grand Crusade + packet.writeC(castle.getSiege().isInProgress() ? 1 : 0); // Grand Crusade packet.writeC(castle.getSide().ordinal()); // Grand Crusade } return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java index aeb4079f3a..f9a6ebe0e7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java @@ -38,7 +38,6 @@ public class ExShowContactList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_SHOW_POST_FRIEND.writeId(packet); - packet.writeD(_contacts.size()); _contacts.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index a079ea3129..94b989b583 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -37,7 +37,6 @@ public class ExShowCropInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _crops = (nextPeriod && !manor.isManorApproved()) ? null : manor.getCropProcure(manorId, nextPeriod); } @@ -46,10 +45,9 @@ public class ExShowCropInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Crop Sales" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Crop Sales" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); + packet.writeD(0); if (_crops != null) { packet.writeD(_crops.size()); @@ -64,17 +62,17 @@ public class ExShowCropInfo implements IClientOutgoingPacket if (seed == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(seed.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(seed.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(seed.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index ebffd775d8..1f01ee7b87 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -62,10 +62,8 @@ public class ExShowCropSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getCropId()); // crop id diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index ee9fa9fd37..b625a1e4e7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -39,7 +39,6 @@ public class ExShowFortressInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_INFO.writeId(packet); - final Collection forts = FortManager.getInstance().getForts(); packet.writeD(forts.size()); for (Fort fort : forts) @@ -47,7 +46,7 @@ public class ExShowFortressInfo implements IClientOutgoingPacket final Clan clan = fort.getOwnerClan(); packet.writeD(fort.getResidenceId()); packet.writeS(clan != null ? clan.getName() : ""); - packet.writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00); + packet.writeD(fort.getSiege().isInProgress() ? 1 : 0); // Time of possession packet.writeD(fort.getOwnedTime()); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index f389b26ed5..678ab43e96 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -42,11 +42,9 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_MAP_INFO.writeId(packet); - packet.writeD(_fortress.getResidenceId()); packet.writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status packet.writeD(_fortress.getFortSize()); // barracks count - final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId()); if ((commanders != null) && !commanders.isEmpty() && _fortress.getSiege().isInProgress()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 27da99cf41..da186103ae 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -51,7 +51,6 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_SIEGE_INFO.writeId(packet); - packet.writeD(_fortId); // Fortress Id packet.writeD(_size); // Total Barracks Count if (_csize > 0) @@ -64,22 +63,22 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { case 0: { - packet.writeD(0x03); + packet.writeD(3); break; } case 1: { - packet.writeD(0x02); + packet.writeD(2); break; } case 2: { - packet.writeD(0x01); + packet.writeD(1); break; } case 3: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -92,27 +91,27 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket // TODO: once control room supported, update packet.writeD(0x0x) to support 5th room case 0: { - packet.writeD(0x05); + packet.writeD(5); break; } case 1: { - packet.writeD(0x04); + packet.writeD(4); break; } case 2: { - packet.writeD(0x03); + packet.writeD(3); break; } case 3: { - packet.writeD(0x02); + packet.writeD(2); break; } case 4: { - packet.writeD(0x01); + packet.writeD(1); break; } } @@ -124,7 +123,7 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { for (int i = 0; i < _size; i++) { - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java index f7aca7dffd..912839e242 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java @@ -41,8 +41,7 @@ public class ExShowManorDefaultInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_MANOR_DEFAULT_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" and "Crop Sales" buttons + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" and "Crop Sales" buttons packet.writeD(_crops.size()); for (Seed crop : _crops) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 1d3312d668..d03ce2a5fd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -52,10 +52,8 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet); - packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java index cf38d18c1c..f41999329f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java @@ -34,7 +34,6 @@ public class ExShowQuestInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_INFO.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java index 70f31e318f..0fa64c401d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java @@ -37,7 +37,6 @@ public class ExShowQuestMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_MARK.writeId(packet); - packet.writeD(_questId); packet.writeD(_questState); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index ab85228caf..1a6ee00a10 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ExShowReceivedPostList implements IClientOutgoingPacket { - private final List _inbox; - private static final int MESSAGE_FEE = 100; private static final int MESSAGE_FEE_PER_SLOT = 1000; + private final List _inbox; + public ExShowReceivedPostList(int objectId) { _inbox = MailManager.getInstance().getInbox(objectId); @@ -45,7 +45,6 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { @@ -64,18 +63,18 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getSenderName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); + packet.writeD(msg.isUnread() ? 1 : 0); packet.writeD(((msg.getMailType() == MailType.COMMISSION_ITEM_SOLD) || (msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED)) ? 0 : 1); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(msg.isReturned() ? 0x01 : 0x00); - packet.writeD(0x00); // SysString in some case it seems + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(msg.isReturned() ? 1 : 0); + packet.writeD(0); // SysString in some case it seems } } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(MESSAGE_FEE); packet.writeD(MESSAGE_FEE_PER_SLOT); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java index 9679468789..deebb99c8f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java @@ -33,6 +33,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; */ public class ExShowScreenMessage implements IClientOutgoingPacket { + // Positions + public static final byte TOP_LEFT = 1; + public static final byte TOP_CENTER = 2; + public static final byte TOP_RIGHT = 3; + public static final byte MIDDLE_LEFT = 4; + public static final byte MIDDLE_CENTER = 5; + public static final byte MIDDLE_RIGHT = 6; + public static final byte BOTTOM_CENTER = 7; + public static final byte BOTTOM_RIGHT = 8; + private final int _type; private final int _sysMessageId; private final int _unk1; @@ -48,15 +58,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket private List _parameters; // Localisation related. private String _lang; - // Positions - public static final byte TOP_LEFT = 0x01; - public static final byte TOP_CENTER = 0x02; - public static final byte TOP_RIGHT = 0x03; - public static final byte MIDDLE_LEFT = 0x04; - public static final byte MIDDLE_CENTER = 0x05; - public static final byte MIDDLE_RIGHT = 0x06; - public static final byte BOTTOM_CENTER = 0x07; - public static final byte BOTTOM_RIGHT = 0x08; public void setLang(String lang) { @@ -265,7 +266,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SCREEN_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -284,9 +284,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(sml.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -308,9 +308,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -318,7 +318,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket } } } - packet.writeD(_type); packet.writeD(_sysMessageId); packet.writeD(_position); @@ -326,9 +325,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java index 29ab5d355f..6123b08991 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java @@ -37,7 +37,6 @@ public class ExShowSeedInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _seeds = (nextPeriod && !manor.isManorApproved()) ? null : manor.getSeedProduction(manorId, nextPeriod); } @@ -46,16 +45,14 @@ public class ExShowSeedInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown if (_seeds == null) { packet.writeD(0); return true; } - packet.writeD(_seeds.size()); for (SeedProduction seed : _seeds) { @@ -67,17 +64,17 @@ public class ExShowSeedInfo implements IClientOutgoingPacket if (s == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(s.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(s.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(s.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java index e628099700..eb6e686e10 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java @@ -32,13 +32,10 @@ public class ExShowSeedMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_MAP_INFO.writeId(packet); - packet.writeD(2); // seed count - // Seed of Destruction packet.writeD(1); // id 1? Grand Crusade packet.writeD(2770 + GraciaSeedsManager.getInstance().getSoDState()); // sys msg id - // Seed of Infinity packet.writeD(2); // id 2? Grand Crusade // Manager not implemented yet diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index 4fd891a466..373c314eba 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -62,10 +62,8 @@ public class ExShowSeedSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getSeedId()); // seed id diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 1994402da2..269bec5b97 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -47,7 +47,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _cropsItems.put(cropId, item); } } - for (CropProcure crop : CastleManorManager.getInstance().getCropProcure(_manorId, false)) { if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) @@ -61,7 +60,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_cropsItems.size()); // size for (Item item : _cropsItems.values()) @@ -70,9 +68,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket packet.writeD(item.getObjectId()); // Object id packet.writeD(item.getId()); // crop id packet.writeD(seed.getLevel()); // seed level - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(1)); // reward 1 id - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(2)); // reward 2 id if (_castleCrops.containsKey(item.getId())) { @@ -85,9 +83,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket else { packet.writeD(0xFFFFFFFF); // manor - packet.writeQ(0x00); // buy residual - packet.writeQ(0x00); // buy price - packet.writeC(0x00); // reward + packet.writeQ(0); // buy residual + packet.writeQ(0); // buy price + packet.writeC(0); // reward } packet.writeQ(item.getCount()); // my crops } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index db4bccc928..b61d5b2301 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -40,7 +40,6 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { @@ -50,17 +49,17 @@ public class ExShowSentPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getReceiverName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); - packet.writeD(0x01); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(msg.isUnread() ? 1 : 0); + packet.writeD(1); + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(0); } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java index 0e4e9fd2ef..0dca57f2f8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java @@ -48,7 +48,6 @@ public class ExShowTerritory implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TERRITORY.writeId(packet); - packet.writeD(_vertices.size()); packet.writeD(_minZ); packet.writeD(_maxZ); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java index 4e284f82c5..86e1009bbf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java @@ -46,7 +46,6 @@ public class ExShowTrace implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TRACE.writeId(packet); - packet.writeH(0); // type broken in H5 packet.writeD(0); // time broken in H5 packet.writeH(_locations.size()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java index 3245767ed7..836a5c9624 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java @@ -44,7 +44,6 @@ public class ExShowUsm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_USM.writeId(packet); - packet.writeD(_videoId); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java index 4acdffa842..1f1a14c31b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java @@ -34,7 +34,6 @@ public class ExShowVariationCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_CANCEL_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java index 3a2298019e..9870424e26 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java @@ -35,7 +35,6 @@ public class ExShowVariationMakeWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_MAKE_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java index 169827bab3..86211c8d97 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java @@ -44,10 +44,9 @@ public class ExSpawnEmitter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SPAWN_EMITTER.writeId(packet); - packet.writeD(_npcObjectId); packet.writeD(_playerObjectId); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java index 620800c1c4..534549b4fe 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java @@ -36,7 +36,6 @@ public class ExStartScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_START_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java index 0bd990cf34..babac59129 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java index 0e2689d598..d3e67afe99 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipObjId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java index 44b064113f..f5b3e1340f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java @@ -36,7 +36,6 @@ public class ExStopScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index 0b1e077353..7c8def3864 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -66,7 +66,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket } OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet); - packet.writeD(_inventory); packet.writeD(_warehouse); packet.writeD(_freight); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java index 3293a5b557..57563ca2f9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java @@ -39,7 +39,6 @@ public class ExSubPledgeSkillAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUB_PLEDGET_SKILL_ADD.writeId(packet); - packet.writeD(_type); packet.writeD(_skillId); packet.writeD(_skillLevel); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java index d61dfa20ab..816d6f16a6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java @@ -97,7 +97,6 @@ public class ExSubjobInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUBJOB_INFO.writeId(packet); - packet.writeC(_type); packet.writeD(_currClassId); packet.writeD(_currRace); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java index 85616016c7..b7a152629d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java @@ -38,7 +38,6 @@ public class ExTacticalSign implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TACTICAL_SIGN.writeId(packet); - packet.writeD(_target.getObjectId()); packet.writeD(_tokenId); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java index 3486e6281d..9e03a8bd0a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java @@ -39,7 +39,6 @@ public class ExTeleportToLocationActivate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_TO_LOCATION_ACTIVATE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java index a214c53a0f..7bcddd964d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java @@ -27,6 +27,7 @@ public class ExUISetting implements IClientOutgoingPacket { public static final String UI_KEY_MAPPING_VAR = "UI_KEY_MAPPING"; public static final String SPLIT_VAR = " "; + private final byte[] _uiKeyMapping; public ExUISetting(Player player) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java index 187770cfc8..eff4285a8b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java @@ -37,7 +37,6 @@ public class ExUnReadMailCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_UN_READ_MAIL_COUNT.writeId(packet); - packet.writeD(_mailUnreadCount); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java index f992b3c937..e59c651371 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java @@ -41,7 +41,6 @@ public class ExUseSharedGroupItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USE_SHARED_GROUP_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeD(_grpId); packet.writeD(_remainingTime); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java index 474fcc5208..f49d451587 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class ExUserInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getTransformationId()); - final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); final boolean isInvisible = _player.isInvisible(); packet.writeD(abnormalVisualEffects.size() + (isInvisible ? 1 : 0)); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java index b841449ab3..1069a64e3e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java @@ -36,12 +36,9 @@ public class ExUserInfoCubic implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_CUBIC.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(_player.getCubics().size()); - _player.getCubics().keySet().forEach(packet::writeH); - packet.writeD(_player.getAgathionId()); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java index 048986d108..7a0d1bfd74 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java @@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExUserInfoEquipSlot extends AbstractMaskPacket { private final Player _player; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -63,11 +62,9 @@ public class ExUserInfoEquipSlot extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_EQUIP_SLOT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(InventorySlot.values().length); packet.writeB(_masks); - final PlayerInventory inventory = _player.getInventory(); for (InventorySlot slot : InventorySlot.values()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java index 3eb1cf9578..d655e48843 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java @@ -36,7 +36,6 @@ public class ExUserInfoInvenWeight implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_INVEN_WEIGHT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java index 91e0e92338..16aa81e9c0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java @@ -44,7 +44,6 @@ public class ExValidateLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java index 727267c9d5..50cb4025e4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java @@ -35,7 +35,6 @@ public class ExVariationCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_CANCEL_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java index 5cdc1b8d0e..4fde190ae2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java @@ -32,14 +32,13 @@ public class ExVariationResult implements IClientOutgoingPacket { _option1 = option1; _option2 = option2; - _success = success ? 0x01 : 0x00; + _success = success ? 1 : 0; } @Override public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_RESULT.writeId(packet); - packet.writeD(_option1); packet.writeD(_option2); packet.writeD(_success); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java index db0acfd5ff..60fb57c0b3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java @@ -41,10 +41,9 @@ public class ExVitalityEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_EFFECT_INFO.writeId(packet); - packet.writeD(_points); packet.writeD(_vitalityBonus); // Vitality Bonus - packet.writeH(0x00); // Vitality additional bonus in % + packet.writeH(0); // Vitality additional bonus in % packet.writeH(_vitalityItemsRemaining); // How much vitality items remaining for use packet.writeH(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java index 3cd9d26602..9a401c2321 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java @@ -35,7 +35,6 @@ public class ExVitalityPointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_POINT_INFO.writeId(packet); - packet.writeD(_vitalityPoints); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java index 71baff96ea..c4c5539ca4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java @@ -45,7 +45,6 @@ public class ExVoteSystemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VOTE_SYSTEM_INFO.writeId(packet); - packet.writeD(_recomLeft); packet.writeD(_recomHave); packet.writeD(_bonusTime); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java index bc41adf7f2..8abcfc022e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java @@ -37,7 +37,6 @@ public class ExWorldChatCnt implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_WORLD_CHAT_CNT.writeId(packet); - packet.writeD(_points); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java index 5f935fe0dc..dc9c2288f8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java @@ -79,19 +79,17 @@ public class FakePlayerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // vehicleId + packet.writeD(0); // vehicleId packet.writeD(_objId); packet.writeS(_npc.getName()); - packet.writeH(_npc.getRace().ordinal()); - packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 0x01 : 0x00); + packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 1 : 0); packet.writeD(_fpcHolder.getClassId()); - - packet.writeD(0x00); // Inventory.PAPERDOLL_UNDER + packet.writeD(0); // Inventory.PAPERDOLL_UNDER packet.writeD(_fpcHolder.getEquipHead()); packet.writeD(_fpcHolder.getEquipRHand()); packet.writeD(_fpcHolder.getEquipLHand()); @@ -103,28 +101,22 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_fpcHolder.getEquipRHand()); // dual hand packet.writeD(_fpcHolder.getEquipHair()); packet.writeD(_fpcHolder.getEquipHair2()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderAugument()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } - packet.writeC(_fpcHolder.getArmorEnchantLevel()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderVisualId()) { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeC(_npc.getScriptValue()); // getPvpFlag() packet.writeD(_npc.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -135,16 +127,12 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_npc.getCollisionRadius()); packet.writeF(_npc.getCollisionHeight()); - packet.writeD(_fpcHolder.getHair()); packet.writeD(_fpcHolder.getHairColor()); packet.writeD(_fpcHolder.getFace()); - packet.writeS(_npc.getTemplate().getTitle()); - if (_clan != null) { packet.writeD(_clan.getId()); @@ -154,71 +142,51 @@ public class FakePlayerInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - - packet.writeC(0x01); // isSitting() ? 0x00 : 0x01 (at some initial tests it worked) - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); - packet.writeC(_npc.isInCombat() ? 0x01 : 0x00); - - packet.writeC(_npc.isAlikeDead() ? 0x01 : 0x00); - - packet.writeC(_npc.isInvisible() ? 0x01 : 0x00); - - packet.writeC(0x00); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount - packet.writeC(0x00); // getPrivateStoreType().getId() - - packet.writeH(0x00); // getCubics().size() + packet.writeC(1); // isSitting() ? 0 : 1 (at some initial tests it worked) + packet.writeC(_npc.isRunning() ? 1 : 0); + packet.writeC(_npc.isInCombat() ? 1 : 0); + packet.writeC(_npc.isAlikeDead() ? 1 : 0); + packet.writeC(_npc.isInvisible() ? 1 : 0); + packet.writeC(0); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount + packet.writeC(0); // getPrivateStoreType().getId() + packet.writeH(0); // getCubics().size() // getCubics().keySet().forEach(packet::writeH); - packet.writeC(0x00); - + packet.writeC(0); packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : 0); packet.writeH(_fpcHolder.getRecommends()); - packet.writeD(0x00); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 - + packet.writeD(0); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 packet.writeD(_fpcHolder.getClassId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(_fpcHolder.getWeaponEnchantLevel()); // isMounted() ? 0 : _enchantLevel - packet.writeC(_npc.getTeam().getId()); - - packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0x00); + packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0); packet.writeC(_fpcHolder.getNobleLevel()); - packet.writeC(_fpcHolder.isHero() ? 0x01 : 0x00); - - packet.writeC(_fpcHolder.isFishing() ? 0x01 : 0x00); - + packet.writeC(_fpcHolder.isHero() ? 1 : 0); + packet.writeC(_fpcHolder.isFishing() ? 1 : 0); packet.writeD(_fpcHolder.getBaitLocationX()); packet.writeD(_fpcHolder.getBaitLocationY()); packet.writeD(_fpcHolder.getBaitLocationZ()); - packet.writeD(_fpcHolder.getNameColor()); - packet.writeD(_heading); - packet.writeC(_fpcHolder.getPledgeStatus()); - packet.writeH(0x00); // getPledgeType() - + packet.writeH(0); // getPledgeType() packet.writeD(_fpcHolder.getTitleColor()); - - packet.writeC(0x00); // isCursedWeaponEquipped - - packet.writeD(0x00); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 - packet.writeD(0x00); // getTransformationDisplayId() + packet.writeC(0); // isCursedWeaponEquipped + packet.writeD(0); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 + packet.writeD(0); // getTransformationDisplayId() packet.writeD(_fpcHolder.getAgathionId()); - - packet.writeC(0x00); - - packet.writeD(0x00); // getCurrentCp() + packet.writeC(0); + packet.writeD(0); // getCurrentCp() packet.writeD(_npc.getMaxHp()); packet.writeD((int) Math.round(_npc.getCurrentHp())); packet.writeD(_npc.getMaxMp()); packet.writeD((int) Math.round(_npc.getCurrentMp())); - - packet.writeC(0x00); + packet.writeC(0); final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) @@ -229,9 +197,9 @@ public class FakePlayerInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(0x00); // cocPlayer.getPosition() - packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 0x01 : 0x00); - packet.writeC(0x00); // Used Ability Points + packet.writeC(0); // cocPlayer.getPosition() + packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 1 : 0); + packet.writeC(0); // Used Ability Points return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java index ae088538da..03223c8a3e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java @@ -62,7 +62,6 @@ public class FlyToLocation implements IClientOutgoingPacket _destY = destY; _destZ = destZ; _type = type; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -82,7 +81,6 @@ public class FlyToLocation implements IClientOutgoingPacket _flySpeed = flySpeed; _flyDelay = flyDelay; _animationSpeed = animationSpeed; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -103,7 +101,6 @@ public class FlyToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FLY_TO_LOCATION.writeId(packet); - packet.writeD(_chaObjId); packet.writeD(_destX); packet.writeD(_destY); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java index 1e52b0ef72..471d70f791 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java @@ -35,8 +35,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x01); + packet.writeC(1); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index ef1d37297e..2ee6ffbcd9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -50,25 +50,24 @@ public class GMHennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GMHENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON packet.writeH(_player.getHennaValue(BaseStat.MEN)); // equip MEN packet.writeH(_player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeH(_player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeH(0x00); // equip LUC - packet.writeH(0x00); // equip CHA + packet.writeH(0); // equip LUC + packet.writeH(0); // equip CHA packet.writeD(3); // Slots packet.writeD(_hennas.size()); // Size for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java index 38ca4c7be0..59bf0d9d93 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java @@ -38,7 +38,6 @@ public class GMHide implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_HIDE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index 5e6fadd313..0c7a4684a5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -50,7 +50,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -69,8 +68,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getINT()); packet.writeD(_player.getWIT()); packet.writeD(_player.getMEN()); - packet.writeD(0x00); // LUC - packet.writeD(0x00); // CHA + packet.writeD(0); // LUC + packet.writeD(0); // CHA packet.writeD(_player.getMaxHp()); packet.writeD((int) _player.getCurrentHp()); packet.writeD(_player.getMaxMp()); @@ -79,28 +78,24 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); packet.writeD(_player.getPkKills()); - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollObjectId(slot)); } - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); } - for (int slot : getPaperdollOrder()) { final VariationInstance augment = _player.getInventory().getPaperdollAugmentation(slot); packet.writeD(augment != null ? augment.getOption1Id() : 0); // Confirmed packet.writeD(augment != null ? augment.getOption2Id() : 0); // Confirmed } - packet.writeC(_player.getInventory().getTalismanSlots()); // CT2.3 packet.writeC(_player.getInventory().canEquipCloak() ? 1 : 0); // CT2.3 - packet.writeD(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeH(0); packet.writeD(_player.getPAtk()); packet.writeD(_player.getPAtkSpd()); packet.writeD(_player.getPDef()); @@ -108,18 +103,14 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAccuracy()); packet.writeD(_player.getCriticalHit()); packet.writeD(_player.getMAtk()); - packet.writeD(_player.getMAtkSpd()); packet.writeD(_player.getPAtkSpd()); - packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicEvasionRate()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name packet.writeD(_player.getReputation()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -135,8 +126,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeD(_player.isGM() ? 0x01 : 0x00); // builder level - + packet.writeD(_player.isGM() ? 1 : 0); // builder level packet.writeS(_player.getTitle()); packet.writeD(_player.getClanId()); // pledge id packet.writeD(_player.getClanCrestId()); // pledge crest id @@ -146,26 +136,19 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeC(_player.hasDwarvenCraft() ? 1 : 0); packet.writeD(_player.getPkKills()); packet.writeD(_player.getPvpKills()); - packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); - - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeC(321); - packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window - - packet.writeC(_player.isNoble() ? 0x01 : 0x00); - packet.writeC(_player.isHero() ? 0x01 : 0x00); - + packet.writeC(_player.isNoble() ? 1 : 0); + packet.writeC(_player.isHero() ? 1 : 0); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); - final AttributeType attackAttribute = _player.getAttackElement(); packet.writeH(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); @@ -175,8 +158,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket } packet.writeD(_player.getFame()); packet.writeD(_player.getVitalityPoints()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index f212539af7..41f151be6f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -55,10 +55,9 @@ public class GMViewItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_ITEM_LIST.writeId(packet); - packet.writeS(_playerName); packet.writeD(_limit); // inventory limit - packet.writeH(0x01); // show window ?? + packet.writeH(1); // show window ?? packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index 1d88596096..552b6e6168 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -37,14 +37,12 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_player.getName()); packet.writeD(_clan.getId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); @@ -52,15 +50,14 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 packet.writeD(_clan.getAllyCrestId()); // c2 packet.writeD(_clan.isAtWar() ? 1 : 0); // c3 - packet.writeD(0x00); // T3 Unknown - + packet.writeD(0); // T3 Unknown packet.writeD(_clan.getMembers().size()); for (ClanMember member : _clan.getMembers()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java index 93af10e254..3c155ff816 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -38,10 +38,8 @@ public class GMViewSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_SKILL_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_skills.size()); - final boolean isDisabled = (_player.getClan() != null) && (_player.getClan().getReputationScore() < 0); for (Skill skill : _skills) { @@ -49,7 +47,7 @@ public class GMViewSkillInfo implements IClientOutgoingPacket packet.writeH(skill.getDisplayLevel()); packet.writeH(skill.getSubLevel()); packet.writeD(skill.getDisplayId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(isDisabled && skill.isClanSkill() ? 1 : 0); packet.writeC(skill.isEnchantable() ? 1 : 0); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java index d8c273f914..449271993b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java @@ -35,7 +35,6 @@ public class GameGuardQuery implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GAME_GUARD_QUERY.writeId(packet); - packet.writeD(0x27533DD9); packet.writeD(0x2E72A51D); packet.writeD(0x2017038B); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index b0c011b696..037b2e6b6b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -35,10 +35,8 @@ public class GetItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ITEM.writeId(packet); - packet.writeD(_playerId); packet.writeD(_item.getObjectId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java index f8c6126c87..5f4d7bf3ca 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java @@ -50,7 +50,6 @@ public class GetOffVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_OFF_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java index ffa8d5f310..77d1e6ba28 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java @@ -45,7 +45,6 @@ public class GetOnVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ON_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java index e5dcb9ded6..b1f5b588f9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java @@ -44,14 +44,13 @@ public class GmViewQuestInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_QUEST_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeH(_questList.size()); // quest count - for (Quest quest : _questList) { final QuestState qs = _player.getQuestState(quest.getName()); packet.writeD(quest.getId()); packet.writeD(qs == null ? 0 : qs.getCond()); } - packet.writeH(0x00); // some size + packet.writeH(0); // some size // for size; ddQQ return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 9ab9f0a836..0b7edbbd7f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -51,7 +51,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeQ(_player.getAdena()); // activeChar current amount of Adena packet.writeD(3); // available equip slot packet.writeD(_hennaEquipList.size()); - for (Henna henna : _hennaEquipList) { // Player must have at least one dye in inventory @@ -62,7 +61,7 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); // item Id of the dye packet.writeQ(henna.getWearCount()); // amount of dyes required packet.writeQ(henna.getWearFee()); // amount of Adena required - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // meet the requirement or not } } return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 0e6e64c7b2..23364ad722 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -50,25 +50,24 @@ public class HennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON packet.writeH(_player.getHennaValue(BaseStat.MEN)); // equip MEN packet.writeH(_player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeH(_player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeH(0x00); // equip LUC - packet.writeH(0x00); // equip CHA + packet.writeH(0); // equip LUC + packet.writeH(0); // equip CHA packet.writeD(3 - _player.getHennaEmptySlots()); // Slots packet.writeD(_hennas.size()); // Size for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); } - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 658087380a..9a22f0a564 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -40,12 +40,11 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_ITEM_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getWearCount()); // total amount of dye require packet.writeQ(_henna.getWearFee()); // total amount of Adena require to draw symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to draw or not 0 is false and 1 is true + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to draw or not 0 is false and 1 is true packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() + _player.getHennaValue(BaseStat.INT)); // equip INT @@ -59,7 +58,7 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket packet.writeH(_player.getDEX() + _player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeD(_player.getWIT()); // current WIT packet.writeH(_player.getWIT() + _player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 3800940bac..162812f30b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -40,12 +40,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getCancelCount()); // total amount of dye require packet.writeQ(_henna.getCancelFee()); // total amount of Adena require to remove symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to remove or not + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to remove or not packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() - _player.getHennaValue(BaseStat.INT)); // equip INT @@ -59,11 +58,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket packet.writeH(_player.getDEX() - _player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeD(_player.getWIT()); // current WIT packet.writeH(_player.getWIT() - _player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeD(0x00); // current LUC - packet.writeH(0x00); // equip LUC - packet.writeD(0x00); // current CHA - packet.writeH(0x00); // equip CHA - packet.writeD(0x00); + packet.writeD(0); // current LUC + packet.writeH(0); // equip LUC + packet.writeD(0); // current CHA + packet.writeH(0); // equip CHA + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index a79c0f59f2..68e7ae6ccd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -37,11 +37,9 @@ public class HennaRemoveList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); - packet.writeD(0x03); // seems to be max size + packet.writeD(3); // seems to be max size packet.writeD(3 - _player.getHennaEmptySlots()); - for (Henna henna : _player.getHennaList()) { if (henna != null) @@ -50,7 +48,7 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); packet.writeQ(henna.getCancelCount()); packet.writeQ(henna.getCancelFee()); - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); } } return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index 650261e010..9399a1626e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -62,14 +62,12 @@ public interface IClientOutgoingPacket extends IOutgoingPacket Inventory.PAPERDOLL_BROOCH_JEWEL5, Inventory.PAPERDOLL_BROOCH_JEWEL6 }; - int[] PAPERDOLL_ORDER_AUGMENT = new int[] { Inventory.PAPERDOLL_RHAND, Inventory.PAPERDOLL_LHAND, Inventory.PAPERDOLL_RHAND }; - int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 0c54e810f0..3378827f34 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -46,7 +46,6 @@ public class InventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index 8735b315b6..7912558f00 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -47,8 +47,7 @@ public class ItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.ITEM_LIST.writeId(packet); - - packet.writeH(_showWindow ? 0x01 : 0x00); + packet.writeH(_showWindow ? 1 : 0); packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java index b32b4df4a3..c3b9918230 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java @@ -32,9 +32,8 @@ public class JoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PARTY.writeId(packet); - packet.writeD(_response); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java index 65e06efeb7..f347f7efcd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java @@ -32,7 +32,6 @@ public class JoinPledge implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PLEDGE.writeId(packet); - packet.writeD(_pledgeId); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index 96f6d7c34d..996622b9e9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -35,17 +35,16 @@ public class KeyPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VERSION_CHECK.writeId(packet); - packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok for (int i = 0; i < 8; i++) { packet.writeC(_key[i]); // key } - packet.writeD(0x01); + packet.writeD(1); packet.writeD(Config.SERVER_ID); // server id - packet.writeC(0x01); - packet.writeD(0x00); // obfuscation key - packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 0x01 : 0x00); // isClassic + packet.writeC(1); + packet.writeD(0); // obfuscation key + packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 1 : 0); // isClassic return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java index 484c10f0c4..62424fd03a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java @@ -40,7 +40,6 @@ public class L2FriendSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_SAY.writeId(packet); - packet.writeD(0); // ?? packet.writeS(_receiver); packet.writeS(_sender); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java index b875edb772..790d599b5b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java @@ -32,11 +32,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ListPartyWaiting implements IClientOutgoingPacket { + private static final int NUM_PER_PAGE = 64; + private final List _rooms = new LinkedList<>(); private final int _size; - private static final int NUM_PER_PAGE = 64; - public ListPartyWaiting(PartyMatchingRoomLevelType type, int location, int page, int requestorLevel) { final List rooms = MatchingRoomManager.getInstance().getPartyMathchingRooms(location, type, requestorLevel); @@ -57,7 +57,6 @@ public class ListPartyWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_PARTY_WATING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java index 4f8f9adc64..bb0ac61dbd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java @@ -54,7 +54,6 @@ public class LoginFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LOGIN_FAIL.writeId(packet); - packet.writeD(_success); packet.writeD(_reason); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java index 18a522c315..6743e3e66f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java @@ -32,7 +32,6 @@ public class MagicSkillCanceld implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_CANCELED.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java index d56de10079..7ab29cc1a8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java @@ -66,7 +66,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // MagicSkillUse castingType packet.writeD(_objectId); packet.writeD(_skillId); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java index 3df8463279..a86626cfa6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java @@ -84,7 +84,6 @@ public class MagicSkillUse implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_USE.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // Casting bar type: 0 - default, 1 - default up, 2 - blue, 3 - green, 4 - red. packet.writeD(_creature.getObjectId()); packet.writeD(_target.getObjectId()); @@ -111,7 +110,7 @@ public class MagicSkillUse implements IClientOutgoingPacket packet.writeD(_target.getX()); packet.writeD(_target.getY()); packet.writeD(_target.getZ()); - packet.writeD(_actionId >= 0 ? 0x01 : 0x00); // 1 when ID from RequestActionUse is used + packet.writeD(_actionId >= 0 ? 1 : 0); // 1 when ID from RequestActionUse is used packet.writeD(_actionId >= 0 ? _actionId : 0); // ID from RequestActionUse. Used to set cooldown on summon skills. return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java index 6b710c692e..12e2488f24 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java @@ -37,11 +37,9 @@ public class ManagePledgePower implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet); - packet.writeD(_rank); packet.writeD(_action); packet.writeD(_clan.getRankPrivs(_rank).getBitmask()); - return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 95f4b6f201..4e2ab3f00b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -42,11 +42,9 @@ public class MonRaceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MON_RACE_INFO.writeId(packet); - packet.writeD(_unknown1); packet.writeD(_unknown2); - packet.writeD(0x08); - + packet.writeD(8); for (int i = 0; i < 8; i++) { packet.writeD(_monsters[i].getObjectId()); // npcObjectID @@ -68,7 +66,7 @@ public class MonRaceInfo implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java index 0093b3edc9..e6386921ff 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java @@ -45,13 +45,10 @@ public class MoveToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_xDst); packet.writeD(_yDst); packet.writeD(_zDst); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java index b1fb3ea003..59103c6c4c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java @@ -48,7 +48,6 @@ public class MoveToLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java index 30ff3c96af..aa261f924f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java @@ -50,11 +50,9 @@ public class MoveToPawn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_PAWN.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetId); packet.writeD(_distance); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index e1da19cc8f..50ff0191b8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -58,18 +58,16 @@ public class MultiSellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.MULTI_SELL_LIST.writeId(packet); - - packet.writeC(0x00); // Helios + packet.writeC(0); // Helios packet.writeD(_list.getId()); // list id - packet.writeC(0x00); // GOD Unknown + packet.writeC(0); // GOD Unknown packet.writeD(1 + (_index / PAGE_SIZE)); // page started from 1 - packet.writeD(_finished ? 0x01 : 0x00); // finished + packet.writeD(_finished ? 1 : 0); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - packet.writeC(0x00); // Grand Crusade - packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window - packet.writeD(0x20); // Helios - Always 32 - + packet.writeC(0); // Grand Crusade + packet.writeC(_list.isChanceMultisell() ? 1 : 0); // new multisell window + packet.writeD(32); // Helios - Always 32 while (_size-- > 0) { ItemInfo itemEnchantment = _list.getItemEnchantment(_index); @@ -86,19 +84,15 @@ public class MultiSellList extends AbstractItemPacket } } } - packet.writeD(_index); // Entry ID. Start from 1. packet.writeC(entry.isStackable() ? 1 : 0); - // Those values will be passed down to MultiSellChoose packet. packet.writeH(itemEnchantment != null ? itemEnchantment.getEnchantLevel() : 0); // enchant level writeItemAugment(packet, itemEnchantment); writeItemElemental(packet, itemEnchantment); writeItemEnsoulOptions(packet, itemEnchantment); - packet.writeH(entry.getProducts().size()); packet.writeH(entry.getIngredients().size()); - for (ItemChanceHolder product : entry.getProducts()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(product.getId()); @@ -122,7 +116,6 @@ public class MultiSellList extends AbstractItemPacket writeItemElemental(packet, displayItemEnchantment); writeItemEnsoulOptions(packet, displayItemEnchantment); } - for (ItemChanceHolder ingredient : entry.getIngredients()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(ingredient.getId()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java index 6e85f5348c..cd46aac3aa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java @@ -45,11 +45,10 @@ public class MyTargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MY_TARGET_SELECTED.writeId(packet); - - packet.writeD(0x01); // Grand Crusade + packet.writeD(1); // Grand Crusade packet.writeD(_objectId); packet.writeH(_color); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java index 1901ad1297..166c5c1e00 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java @@ -36,7 +36,6 @@ public class NewCharacterSuccess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NEW_CHARACTER_SUCCESS.writeId(packet); - packet.writeD(_chars.size()); for (PlayerTemplate chr : _chars) { @@ -44,31 +43,24 @@ public class NewCharacterSuccess implements IClientOutgoingPacket { continue; } - // TODO: Unhardcode these packet.writeD(chr.getRace().ordinal()); packet.writeD(chr.getClassId().getId()); - packet.writeD(99); packet.writeD(chr.getBaseSTR()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseDEX()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseCON()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseINT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseWIT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseMEN()); packet.writeD(1); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java index be1605f679..6061ea26ef 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java @@ -38,7 +38,6 @@ public class NicknameChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NICK_NAME_CHANGED.writeId(packet); - packet.writeD(_objectId); packet.writeS(_title); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index f9cd107e2c..3e4837b4a4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -54,24 +54,20 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public NpcHtmlMessage(int npcObjId, int itemId) { super(npcObjId); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } public NpcHtmlMessage(int npcObjId, int itemId, String html) { super(npcObjId, html); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } @@ -79,11 +75,10 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java index 61f195e35d..05489103cb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java @@ -47,10 +47,8 @@ public class NpcInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -58,7 +56,6 @@ public class NpcInfo extends AbstractMaskPacket private int _clanId = 0; private int _statusMask = 0; private final Set _abnormalVisualEffects; - private String[] _localisation; public void setLang(String lang) @@ -101,112 +98,90 @@ public class NpcInfo extends AbstractMaskPacket { addComponentType(NpcInfoType.HEADING); } - if ((npc.getStat().getPAtkSpd() > 0) || (npc.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (npc.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((npc.getLeftHandItem() > 0) || (npc.getRightHandItem() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (npc.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (npc.getDisplayEffect() > 0) { addComponentType(NpcInfoType.DISPLAY_EFFECT); } - if (npc.isInsideZone(ZoneId.WATER) || npc.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (npc.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (npc.getCloneObjId() > 0) { addComponentType(NpcInfoType.CLONE); } - if (npc.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (npc.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (npc.getCurrentHp() <= npc.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (npc.getCurrentMp() <= npc.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (npc.getTemplate().isUsingServerSideName()) { addComponentType(NpcInfoType.NAME); } - if (npc.getTemplate().isUsingServerSideTitle() || (npc.isMonster() && (Config.SHOW_NPC_LEVEL || Config.SHOW_NPC_AGGRESSION)) || npc.isChampion() || npc.isTrap()) { addComponentType(NpcInfoType.TITLE); } - if (npc.getNameString() != null) { addComponentType(NpcInfoType.NAME_NPCSTRINGID); } - if (npc.getTitleString() != null) { addComponentType(NpcInfoType.TITLE_NPCSTRINGID); } - if (_npc.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (!_abnormalVisualEffects.isEmpty() || npc.isInvisible()) { addComponentType(NpcInfoType.ABNORMALS); } - if (npc.getEnchantEffect() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (npc.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (npc.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (npc.getClanId() > 0) { final Clan clan = ClanTable.getInstance().getClan(npc.getClanId()); @@ -220,14 +195,11 @@ public class NpcInfo extends AbstractMaskPacket addComponentType(NpcInfoType.CLAN); } } - addComponentType(NpcInfoType.COLOR_EFFECT); - if (npc.getPvpFlag() > 0) { addComponentType(NpcInfoType.PVP_FLAG); } - // TODO: Confirm me if (npc.isInCombat()) { @@ -245,8 +217,7 @@ public class NpcInfo extends AbstractMaskPacket { _statusMask |= 0x08; } - - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -296,27 +267,23 @@ public class NpcInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO.writeId(packet); - packet.writeD(_npc.getObjectId()); - packet.writeC(_npc.isShowSummonAnimation() ? 0x02 : 0x00); // // 0=teleported 1=default 2=summoned + packet.writeC(_npc.isShowSummonAnimation() ? 2 : 0); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 0x01 : 0x00); + packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { String title = _npc.getTitle(); - // Localisation related. if ((_localisation != null) && !_localisation[1].equals("")) { @@ -329,10 +296,8 @@ public class NpcInfo extends AbstractMaskPacket title = title.replace(NpcData.getInstance().getTemplate(_npc.getId()).getTitle(), _localisation[1]); } } - packet.writeS(title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -351,7 +316,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -366,20 +331,20 @@ public class NpcInfo extends AbstractMaskPacket if (containsMask(NpcInfoType.EQUIPPED)) { packet.writeD(_npc.getRightHandItem()); - packet.writeD(0x00); // Armor id? + packet.writeD(0); // Armor id? packet.writeD(_npc.getLeftHandItem()); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_npc.isDead() ? 0x00 : 0x01); + packet.writeC(_npc.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); + packet.writeC(_npc.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 0x01 : _npc.isFlying() ? 0x02 : 0x00); + packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -391,7 +356,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_npc.isFlying() ? 0x01 : 0x00); + packet.writeD(_npc.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { @@ -427,12 +392,12 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(0x00); // 2 - do some animation on spawn + packet.writeC(0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -464,12 +429,10 @@ public class NpcInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java index c95a8e5274..923e9cebad 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class NpcInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_npc.getObjectId()); packet.writeD(_npc.getTransformationDisplayId()); - final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size()); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java index a294edc57a..2a0ba41eeb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java @@ -38,7 +38,6 @@ public class NpcQuestHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NPC_QUEST_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_questId); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java index d3328ade97..fc6d0d4a3a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java @@ -106,7 +106,6 @@ public class NpcSay implements IClientOutgoingPacket { _parameters = new ArrayList<>(); } - for (String item : params) { if ((item != null) && (item.length() > 0)) @@ -127,11 +126,9 @@ public class NpcSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_SAY.writeId(packet); - packet.writeD(_objectId); packet.writeD(_textType.getClientId()); packet.writeD(_npcId); - // Localisation related. if (_lang != null) { @@ -147,7 +144,6 @@ public class NpcSay implements IClientOutgoingPacket } } } - packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java index 356e3f48a9..ac61f9d247 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java @@ -33,11 +33,10 @@ public class ObservationMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_START.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me packet.writeD(0xc0); // TODO: Find me return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java index 5c0a0766b3..896ccea02b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java @@ -33,7 +33,6 @@ public class ObservationReturn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_END.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java index c2f7ab404f..173772c870 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java @@ -37,7 +37,6 @@ public class OnEventTrigger implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EVENT_TRIGGER.writeId(packet); - packet.writeD(_emitterId); packet.writeC(_enabled); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index d499719f31..70a51b2b0d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -44,7 +44,6 @@ public class PackageSendableList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet); - packet.writeD(_objectId); packet.writeQ(_adena); packet.writeD(_items.size()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java index a53f589386..e24d63f717 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java @@ -39,7 +39,6 @@ public class PackageToList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_TO_LIST.writeId(packet); - packet.writeD(_players.size()); for (Entry entry : _players.entrySet()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 655c7abcd1..44b23b37f4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -55,7 +55,6 @@ public class PartyMemberPosition implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); - packet.writeD(locations.size()); for (Entry entry : locations.entrySet()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java index 9e275ec246..c9d3595037 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java @@ -36,7 +36,6 @@ public class PartyRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java index b9c7d06769..8c97cac6b5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java @@ -36,12 +36,10 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ADD.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); // c3 packet.writeD(_party.getDistributionType().getId()); // c3 packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); - packet.writeD((int) _member.getCurrentCp()); // c4 packet.writeD(_member.getMaxCp()); // c4 packet.writeD((int) _member.getCurrentHp()); @@ -51,7 +49,7 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket packet.writeD(_member.getVitalityPoints()); packet.writeC(_member.getLevel()); packet.writeH(_member.getClassId().getId()); - packet.writeC(0x00); + packet.writeC(0); packet.writeH(_member.getRace().ordinal()); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java index 65d0c60c2e..5ad91f5463 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java @@ -37,21 +37,17 @@ public class PartySmallWindowAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ALL.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); packet.writeC(_party.getDistributionType().getId()); packet.writeC(_party.getMemberCount() - 1); - for (Player member : _party.getMembers()) { if ((member != null) && (member != _exclude)) { packet.writeD(member.getObjectId()); packet.writeS(member.getName()); - packet.writeD((int) member.getCurrentCp()); // c4 packet.writeD(member.getMaxCp()); // c4 - packet.writeD((int) member.getCurrentHp()); packet.writeD(member.getMaxHp()); packet.writeD((int) member.getCurrentMp()); @@ -59,7 +55,7 @@ public class PartySmallWindowAll implements IClientOutgoingPacket packet.writeD(member.getVitalityPoints()); packet.writeC(member.getLevel()); packet.writeH(member.getClassId().getId()); - packet.writeC(0x01); // Unk + packet.writeC(1); // Unk packet.writeH(member.getRace().ordinal()); final Summon pet = member.getPet(); packet.writeD(member.getServitors().size() + (pet != null ? 1 : 0)); // Summon size, one only atm diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java index 94a8a5a2ce..09ce132af4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java @@ -33,7 +33,6 @@ public class PartySmallWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_DELETE.writeId(packet); - packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java index c53c6c7779..e9ea2efbbe 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java @@ -42,7 +42,6 @@ public class PartySmallWindowUpdate extends AbstractMaskPacket _summon.getStat().getExp()) { packet.writeQ(_summon.getStat().getExp()); // 0% absolute value @@ -160,9 +148,7 @@ public class PetInfo implements IClientOutgoingPacket { packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value } - packet.writeQ(_summon.getExpForNextLevel()); // 100% absoulte value - packet.writeD(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight packet.writeD(_summon.getMaxLoad()); // max weight it can carry packet.writeD(_summon.getPAtk()); // patk @@ -178,25 +164,20 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD((int) _summon.getStat().getMoveSpeed()); // speed packet.writeD(_summon.getPAtkSpd()); // atkspeed packet.writeD(_summon.getMAtkSpd()); // casting speed - packet.writeC(0); // TODO: Check me, might be ride status packet.writeC(_summon.getTeam().getId()); // Confirmed packet.writeC(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed packet.writeC(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed - - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. - + packet.writeD(0); // TODO: Find me + packet.writeD(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. packet.writeC(_summon.getOwner().getSummonPoints()); // Used Summon Points packet.writeC(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points - final Set aves = _summon.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeH(aves.size()); // Confirmed for (AbnormalVisualEffect ave : aves) { packet.writeH(ave.getClientId()); // Confirmed } - packet.writeC(_statusMask); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 5b43daa74b..1f60ec39d1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -46,7 +46,6 @@ public class PetInventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.PET_INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index e4cf35779f..16dc83b7ed 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -35,7 +35,6 @@ public class PetItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java index fdb00ddbb1..913f65d470 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java @@ -38,7 +38,6 @@ public class PetStatusShow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_SHOW.writeId(packet); - packet.writeD(_summonType); packet.writeD(_summonObjectId); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 25c2c74292..823a8c405a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -52,7 +52,6 @@ public class PetStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_UPDATE.writeId(packet); - packet.writeD(_summon.getSummonType()); packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getX()); @@ -69,7 +68,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket packet.writeQ(_summon.getStat().getExp()); packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value packet.writeQ(_summon.getExpForNextLevel()); // 100% absolute value - packet.writeD(0x01); // TODO: Find me! + packet.writeD(1); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java index 4bc3570779..0898b01f67 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java @@ -63,7 +63,6 @@ public class PlaySound implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLAY_SOUND.writeId(packet); - packet.writeD(_unknown1); // unknown 0 for quest and ship; packet.writeS(_soundFile); packet.writeD(_unknown3); // unknown 0 for quest; 1 for ship; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java index fbe57d4aaf..5108fe7e1b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java @@ -44,7 +44,6 @@ public class PledgeCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java index aa11b1213e..6805f64d7c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java @@ -34,7 +34,6 @@ public class PledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_INFO.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getId()); packet.writeS(_clan.getName()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java index 72f2c71838..193ee17589 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java @@ -36,12 +36,10 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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 - // clan or subpledge name if (_member.getPledgeType() != 0) { @@ -51,7 +49,6 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket { packet.writeS(_member.getClan().getName()); } - packet.writeS(_member.getApprenticeOrSponsorName()); // name of this member's apprentice/sponsor return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java index eefd482979..6aa5067c8f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java @@ -36,7 +36,6 @@ public class PledgeReceivePowerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_POWER_INFO.writeId(packet); - packet.writeD(_member.getPowerGrade()); // power grade packet.writeS(_member.getName()); packet.writeD(_member.getClan().getRankPrivs(_member.getPowerGrade()).getBitmask()); // privileges diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 818c38a076..01f71eea17 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -40,8 +40,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_SUB_PLEDGE_CREATED.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); packet.writeD(_subPledge.getId()); packet.writeS(_subPledge.getName()); packet.writeS(getLeaderName()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java index 4d0efeb82a..7649947064 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java @@ -43,7 +43,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(packet); - packet.writeD(_tab); // page packet.writeD(_clanList.size()); for (ClanWar clanWar : _clanList) @@ -53,7 +52,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket { continue; } - packet.writeS(clan.getName()); packet.writeD(clanWar.getState().ordinal()); // type: 0 = Declaration, 1 = Blood Declaration, 2 = In War, 3 = Victory, 4 = Defeat, 5 = Tie, 6 = Error packet.writeD(clanWar.getRemainingTime()); // Time if friends to start remaining diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java index 2cbbdbf046..80d10fcb66 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java @@ -34,26 +34,25 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_INFO_UPDATE.writeId(packet); - // sending empty data so client will ask all the info in response ;) packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getLevel()); // clan level packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); // castle state ? + packet.writeD(0); // castle state ? packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); // clan reputation score - packet.writeD(0x00); // ? - packet.writeD(0x00); // ? + packet.writeD(0); // ? + packet.writeD(0); // ? packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); // c5 packet.writeD(_clan.getAllyCrestId()); // c5 packet.writeD(_clan.isAtWar() ? 1 : 0); // c5 - packet.writeD(0x00); // TODO: Find me! - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java index ae26e50dbb..2fa9f26d4a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java @@ -51,12 +51,11 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ADD.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); - packet.writeD(0x00); - packet.writeD(0x01); + packet.writeD(0); + packet.writeD(1); packet.writeD(_isOnline); // 1 = online 0 = offline packet.writeD(_pledgeType); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index c5ea7b284b..a1be315cf4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -41,7 +41,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket { _clan = clan; _pledge = pledge; - _pledgeId = _pledge == null ? 0x00 : _pledge.getId(); + _pledgeId = _pledge == null ? 0 : _pledge.getId(); _leaderName = pledge == null ? clan.getLeaderName() : CharNameTable.getInstance().getNameById(pledge.getLeaderId()); _name = pledge == null ? clan.getName() : pledge.getName(); _members = _clan.getMembers(); @@ -65,31 +65,28 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(packet); - - packet.writeD(_isSubPledge ? 0x00 : 0x01); + packet.writeD(_isSubPledge ? 0 : 1); packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_pledgeId); packet.writeS(_name); packet.writeS(_leaderName); - packet.writeD(_clan.getCrestId()); // crest id .. is used again packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); // 0 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(0); // 0 packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.isAtWar() ? 1 : 0); // new c3 - packet.writeD(0x00); // Territory castle ID + packet.writeD(0); // Territory castle ID packet.writeD(_clan.getSubPledgeMembersCount(_pledgeId)); - for (ClanMember m : _members) { if (m.getPledgeType() != _pledgeId) @@ -107,8 +104,8 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket } else { - packet.writeD(0x01); // no visible effect - packet.writeD(0x01); // packet.writeD(1); + packet.writeD(1); // no visible effect + packet.writeD(1); // packet.writeD(1); } packet.writeD(m.isOnline() ? m.getObjectId() : 0); // objectId = online 0 = offline packet.writeD(m.getSponsor() != 0 ? 1 : 0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java index 0fd387e419..154bcc610d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java @@ -32,7 +32,6 @@ public class PledgeShowMemberListDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_DELETE.writeId(packet); - packet.writeS(_player); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java index c61f412ed0..7b8c7c516b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java @@ -66,7 +66,6 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index 4e89797e45..09f70ea024 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -62,14 +62,14 @@ public class PledgeSkillList implements IClientOutgoingPacket { packet.writeD(sk.getDisplayId()); packet.writeH(sk.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } for (SubPledgeSkill sk : _subSkills) { packet.writeD(sk._subType); // Clan Sub-unit types packet.writeD(sk._skillId); packet.writeH(sk._skillLevel); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java index f3b8d4c26c..a94601294f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java @@ -37,7 +37,6 @@ public class PledgeSkillListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST_ADD.writeId(packet); - packet.writeD(_id); packet.writeD(_level); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java index 9e1b4843ac..5f32f2bf54 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java @@ -33,15 +33,14 @@ public class PledgeStatusChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_STATUS_CHANGED.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getLeaderId()); packet.writeD(_clan.getId()); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getAllyId()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.getCrestLargeId()); - packet.writeD(0x00); // pledge type ? + packet.writeD(0); // pledge type ? return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java index 5b56d0b28d..41d0f9f7d8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java @@ -44,12 +44,10 @@ public class PrivateStoreListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_LIST.writeId(packet); - packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); // Viewer's item count? + packet.writeD(0); // Viewer's item count? packet.writeD(_items.size()); - int slotNumber = 0; for (TradeItem item : _items) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 67b6ba8d94..d72050283e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -43,11 +43,10 @@ public class PrivateStoreListSell extends AbstractItemPacket else { OutgoingPackets.PRIVATE_STORE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index bb462b6cd2..5e95f8b9b8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -43,17 +43,14 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MANAGE_LIST.writeId(packet); - packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(_itemList.size()); // inventory items for potential buy for (Item item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(_buyList.size()); // count for all items already added for buy for (TradeItem item : _buyList) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index 400307eb79..94ff06a790 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -45,18 +45,15 @@ public class PrivateStoreManageListSell extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MANAGE_LIST.writeId(packet); - packet.writeD(_objId); packet.writeD(_packageSale ? 1 : 0); // Package sell packet.writeQ(_playerAdena); - packet.writeD(_itemList.size()); // for potential sells for (TradeItem item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(_sellList.size()); // count for any items already added for sell for (TradeItem item : _sellList) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java index 8a5b9eef92..0d7bcbea16 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgBuy implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java index b00bd2add2..8fdb5701b8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgSell implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java index c3958367e8..5ddaa46ba0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java @@ -40,7 +40,6 @@ public class RadarControl implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RADAR_CONTROL.writeId(packet); - packet.writeD(_showRadar); packet.writeD(_type); // maybe type packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java index 3918894601..5d67413b6f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java @@ -43,10 +43,8 @@ public class RecipeBookItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_BOOK_ITEM_LIST.writeId(packet); - - packet.writeD(_isDwarvenCraft ? 0x00 : 0x01); // 0 = Dwarven - 1 = Common + packet.writeD(_isDwarvenCraft ? 0 : 1); // 0 = Dwarven - 1 = Common packet.writeD(_maxMp); - if (_recipes == null) { packet.writeD(0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 59ec218c84..9f460fe896 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -55,11 +55,10 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeD((int) _player.getCurrentMp()); packet.writeD(_player.getMaxMp()); packet.writeD(_success ? 1 : 0); // item creation success/failed - packet.writeC(0x00); - packet.writeQ(0x00); + packet.writeC(0); + packet.writeQ(0); return true; } - PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java index 4474a37c03..f4db5be9df 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java @@ -35,15 +35,14 @@ public class RecipeShopItemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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); - packet.writeQ(0x00); - packet.writeC(0x00); // Trigger offering window if 1 - packet.writeQ(0x00); + packet.writeQ(0); + packet.writeC(0); // Trigger offering window if 1 + packet.writeQ(0); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java index 75e45f5877..38b0b8ea4e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java @@ -43,7 +43,6 @@ public class RecipeShopManageList implements IClientOutgoingPacket { _recipes = _seller.getCommonRecipeBook(); } - if (_seller.hasManufactureShop()) { final Iterator it = _seller.getManufactureItems().values().iterator(); @@ -63,11 +62,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MANAGE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD((int) _seller.getAdena()); - packet.writeD(_isDwarven ? 0x00 : 0x01); - + packet.writeD(_isDwarven ? 0 : 1); if (_recipes == null) { packet.writeD(0); @@ -83,10 +80,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket packet.writeD(count); } } - if (!_seller.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -94,7 +90,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket for (ManufactureItem item : _seller.getManufactureItems().values()) { packet.writeD(item.getRecipeId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeQ(item.getCost()); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java index c025b5e4ed..2b9bc5b6e7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java @@ -33,7 +33,6 @@ public class RecipeShopMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MSG.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeS(_player.getStoreName()); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java index be8ae1181e..8b3cb42f47 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java @@ -36,14 +36,13 @@ public class RecipeShopSellList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_SELL_LIST.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD((int) _manufacturer.getCurrentMp()); // Creator's MP packet.writeD(_manufacturer.getMaxMp()); // Creator's MP packet.writeQ(_buyer.getAdena()); // Buyer Adena if (!_manufacturer.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -51,7 +50,7 @@ public class RecipeShopSellList implements IClientOutgoingPacket for (ManufactureItem temp : _manufacturer.getManufactureItems().values()) { packet.writeD(temp.getRecipeId()); - packet.writeD(0x00); // unknown + packet.writeD(0); // unknown packet.writeQ(temp.getCost()); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 74700e29b0..269e14d50b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -88,7 +88,6 @@ public class RelationChanged implements IClientOutgoingPacket { return; } - final Relation r = new Relation(); r._objId = activeChar.getObjectId(); r._relation = relation; @@ -102,7 +101,6 @@ public class RelationChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RELATION_CHANGED.writeId(packet); - packet.writeC(_mask); if (_multi == null) { @@ -122,7 +120,6 @@ public class RelationChanged implements IClientOutgoingPacket private void writeRelation(PacketWriter packet, Relation relation) { packet.writeD(relation._objId); - if ((_mask & SEND_DEFAULT) != SEND_DEFAULT) { packet.writeD(relation._relation); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java index b4e9dc25c5..4477cfb705 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java @@ -35,7 +35,6 @@ public class RequestEnchant implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java index 4ef15fb74c..7a0a6cbe58 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java @@ -33,7 +33,6 @@ public class Revive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.REVIVE.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java index 9c409601e3..b9ddf7733f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java @@ -42,7 +42,6 @@ public class Ride implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RIDE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_mounted); packet.writeD(_rideType); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 813ce03f4d..13ef62f55f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -49,11 +49,9 @@ public class SellListProcure implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SELL_LIST_PROCURE.writeId(packet); - packet.writeQ(_money); // money - packet.writeD(0x00); // lease ? + packet.writeD(0); // lease ? packet.writeH(_sellList.size()); // list size - for (Entry entry : _sellList.entrySet()) { final Item item = entry.getKey(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java index baa37a8507..75b5b07854 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java @@ -39,12 +39,10 @@ public class SendMacroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MACRO_LIST.writeId(packet); - packet.writeC(_updateType.getId()); - packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0x00); // modified, created or deleted macro's id + packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0); // modified, created or deleted macro's id packet.writeC(_count); // count of Macros packet.writeC(_macro != null ? 1 : 0); // unknown - if ((_macro != null) && (_updateType != MacroUpdateType.DELETE)) { packet.writeD(_macro.getId()); // Macro ID @@ -52,9 +50,7 @@ public class SendMacroList implements IClientOutgoingPacket packet.writeS(_macro.getDescr()); // Desc packet.writeS(_macro.getAcronym()); // acronym packet.writeD(_macro.getIcon()); // icon - packet.writeC(_macro.getCommands().size()); // count - int i = 1; for (MacroCmd cmd : _macro.getCommands()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java index 47fada25be..21622b5f19 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java @@ -32,7 +32,6 @@ public class SendTradeRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_REQUEST.writeId(packet); - packet.writeD(_senderId); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java index 69aa749406..1513a0e3d1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java @@ -55,7 +55,6 @@ public class ServerObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SERVER_OBJECT_INFO.writeId(packet); - packet.writeD(_activeChar.getObjectId()); packet.writeD(_displayId + 1000000); packet.writeS(_name); // name @@ -70,8 +69,8 @@ public class ServerObjectInfo implements IClientOutgoingPacket packet.writeF(_collisionHeight); packet.writeD((int) (_isAttackable ? _activeChar.getCurrentHp() : 0)); packet.writeD(_isAttackable ? _activeChar.getMaxHp() : 0); - packet.writeD(0x01); // object type - packet.writeD(0x00); // special effects + packet.writeD(1); // object type + packet.writeD(0); // special effects return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java index 88b370ad8b..0164e5c4a2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java @@ -34,7 +34,6 @@ public class SetSummonRemainTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SET_SUMMON_REMAIN_TIME.writeId(packet); - packet.writeD(_maxTime); packet.writeD(_remainingTime); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java index db28b72acf..016f5a0c9a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java @@ -38,7 +38,6 @@ public class ShopPreviewInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_INFO.writeId(packet); - packet.writeD(Inventory.PAPERDOLL_TOTALSLOTS); // Slots packet.writeD(getFromList(Inventory.PAPERDOLL_UNDER)); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index df50db952f..a55186f551 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -51,11 +51,9 @@ public class ShopPreviewList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_LIST.writeId(packet); - packet.writeD(5056); packet.writeQ(_money); // current money packet.writeD(_listId); - int newlength = 0; for (Product product : _list) { @@ -65,23 +63,20 @@ public class ShopPreviewList implements IClientOutgoingPacket } } packet.writeH(newlength); - for (Product product : _list) { if ((product.getItem().getCrystalType().getLevel() <= _expertise) && product.getItem().isEquipable()) { packet.writeD(product.getItemId()); packet.writeH(product.getItem().getType2()); // item type2 - if (product.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { packet.writeQ(product.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } else { - packet.writeQ(0x00); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand + packet.writeQ(0); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } - packet.writeQ(Config.WEAR_PRICE); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 298301ed0d..b13080ff28 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -40,7 +40,6 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_BUFF_STATUS_UPDATE.writeId(packet); - packet.writeD(_skillId); packet.writeH(_skillLevel); packet.writeH(_skillSubLevel); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index c6a67fb97c..b8624ce4cd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -33,7 +33,6 @@ public class ShortCutInit implements IClientOutgoingPacket { return; } - _shortCuts = player.getAllShortCuts(); } @@ -41,24 +40,22 @@ public class ShortCutInit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); packet.writeD(sc.getSlot() + (sc.getPage() * 12)); - switch (sc.getType()) { case ITEM: { packet.writeD(sc.getId()); - packet.writeD(0x01); // Enabled or not + packet.writeD(1); // Enabled or not packet.writeD(sc.getSharedReuseGroup()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeQ(0x00); // Augment id - packet.writeD(0x00); // Visual id + packet.writeD(0); + packet.writeD(0); + packet.writeQ(0); // Augment id + packet.writeD(0); // Visual id break; } case SKILL: @@ -67,8 +64,8 @@ public class ShortCutInit implements IClientOutgoingPacket packet.writeH(sc.getLevel()); packet.writeH(sc.getSubLevel()); packet.writeD(sc.getSharedReuseGroup()); - packet.writeC(0x00); // C5 - packet.writeD(0x01); // C6 + packet.writeC(0); // C5 + packet.writeD(1); // C6 break; } case ACTION: @@ -77,7 +74,7 @@ public class ShortCutInit implements IClientOutgoingPacket case BOOKMARK: { packet.writeD(sc.getId()); - packet.writeD(0x01); // C6 + packet.writeD(1); // C6 } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java index 43d61af661..f099eab47e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java @@ -37,7 +37,6 @@ public class ShortCutRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_REGISTER.writeId(packet); - packet.writeD(_shortcut.getType().ordinal()); packet.writeD(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client switch (_shortcut.getType()) @@ -47,10 +46,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeD(_shortcut.getId()); packet.writeD(_shortcut.getCharacterType()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeD(0x00); // unknown - packet.writeD(0x00); // unknown - packet.writeD(0x00); // item augment id - packet.writeD(0x00); // TODO: Find me, item visual id ? + packet.writeD(0); // unknown + packet.writeD(0); // unknown + packet.writeD(0); // item augment id + packet.writeD(0); // TODO: Find me, item visual id ? break; } case SKILL: @@ -59,10 +58,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeH(_shortcut.getLevel()); packet.writeH(_shortcut.getSubLevel()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeC(0x00); // C5 + packet.writeC(0); // C5 packet.writeD(_shortcut.getCharacterType()); - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me + packet.writeD(0); // TODO: Find me break; } case ACTION: diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java index d6f71b5f70..cfae3b3fad 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java @@ -54,7 +54,6 @@ public class ShowBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - packet.writeC(_showBoard); // c4 1 to show community 00 to hide packet.writeS("bypass _bbshome"); // top packet.writeS("bypass _bbsgetfav"); // favorite diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java index 4b62a7001b..4d62e99d7a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java @@ -32,7 +32,6 @@ public class ShowCalculator implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_CALC.writeId(packet); - packet.writeD(_calculatorId); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java index 55f58d5375..4574762467 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java @@ -32,9 +32,8 @@ public class ShowMiniMap implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_MINIMAP.writeId(packet); - packet.writeD(_mapId); - packet.writeC(0x00); // Seven Signs state + packet.writeC(0); // Seven Signs state return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java index 303eab4e8a..97100d09d2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java @@ -34,7 +34,6 @@ public class ShowPCCafeCouponShowUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_PCCAFE_COUPON_SHOW_UI.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java index d86958e586..0a0f3ae861 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java @@ -35,7 +35,6 @@ public class ShowXMasSeal implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_XMAS_SEAL.writeId(packet); - packet.writeD(_item); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java index 66eccc7fbf..1baa030c4d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java @@ -28,9 +28,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = ca
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Attackers Clans?
* d = Number of Attackers Clans
* { //repeats
@@ -58,11 +58,10 @@ public class SiegeAttackerList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _castle.getSiege().getAttackerClans().size(); if (size > 0) { @@ -76,12 +75,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -90,8 +88,8 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index 5d5c831f14..8afd1f38ce 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -29,9 +29,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = 0xcb
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Defending Clans?
* d = Number of Defending Clans
* { //repeats
@@ -60,16 +60,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // Unknown - packet.writeD(0x01); // Unknown - packet.writeD(0x00); // Unknown - + packet.writeD(0); // Unknown + packet.writeD(1); // Unknown + packet.writeD(0); // Unknown final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0); packet.writeD(size); packet.writeD(size); - // Add owners final Clan ownerClan = _castle.getOwner(); if (ownerClan != null) @@ -78,14 +75,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket packet.writeS(ownerClan.getName()); packet.writeS(ownerClan.getLeaderName()); packet.writeD(ownerClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.OWNER.ordinal()); packet.writeD(ownerClan.getAllyId()); packet.writeS(ownerClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(ownerClan.getAllyCrestId()); } - // List of confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans()) { @@ -94,19 +90,17 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(defendingClan.getAllyCrestId()); } - // List of not confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans()) { @@ -115,12 +109,11 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER_PENDING.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 0a3fe46cb7..dfeefdaecf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -59,13 +59,11 @@ public class SiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_INFO.writeId(packet); - if (_castle != null) { packet.writeD(_castle.getResidenceId()); - final int ownerId = _castle.getOwnerId(); - packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 0x01 : 0x00); + packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0); packet.writeD(ownerId); if (ownerId > 0) { @@ -89,7 +87,6 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { @@ -97,7 +94,7 @@ public class SiegeInfo implements IClientOutgoingPacket cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis()); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(Config.SIEGE_HOUR_LIST.size()); for (int hour : Config.SIEGE_HOUR_LIST) { @@ -108,7 +105,7 @@ public class SiegeInfo implements IClientOutgoingPacket else { packet.writeD((int) (_castle.getSiegeDate().getTimeInMillis() / 1000)); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index d11b3817c0..3c4c475339 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -51,12 +51,11 @@ public class SkillCoolTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SKILL_COOL_TIME.writeId(packet); - packet.writeD(_skillReuseTimeStamps.size()); for (TimeStamp ts : _skillReuseTimeStamps) { packet.writeD(ts.getSkillId()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD((int) ts.getReuse() / 1000); packet.writeD((int) Math.max(ts.getStamp() - _currentTime, 0) / 1000); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index de54232b51..ed4615c403 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -41,10 +41,9 @@ public class Snoop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SNOOP.writeId(packet); - packet.writeD(_convoId); packet.writeS(_name); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_type.getClientId()); packet.writeS(_speaker); packet.writeS(_msg); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java index 37827bdf6c..52f15519a5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java @@ -37,10 +37,9 @@ public class SocialAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SOCIAL_ACTION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_actionId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index fd7e43a153..19066f5f85 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -33,16 +33,15 @@ public class SpawnItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPAWN_ITEM.writeId(packet); - packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeD(_item.isStackable() ? 0x01 : 0x00); + packet.writeD(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java index ccae75b850..04f3ad716c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java @@ -110,7 +110,6 @@ public class SpecialCamera implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPECIAL_CAMERA.writeId(packet); - packet.writeD(_id); packet.writeD(_force); packet.writeD(_angle1); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java index cdd3821740..281756e793 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java @@ -34,7 +34,6 @@ public class StartPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_PLEDGE_WAR.writeId(packet); - packet.writeS(_playerName); packet.writeS(_pledgeName); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java index 48b4238eea..27fb4f606b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java @@ -38,7 +38,6 @@ public class StartRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_side); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java index b4f421df36..067bdeb082 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java @@ -72,7 +72,6 @@ public class StaticObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATIC_OBJECT.writeId(packet); - packet.writeD(_staticObjectId); packet.writeD(_objectId); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index 928b54aa48..40836e4af8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -46,7 +46,6 @@ public class StatusUpdate implements IClientOutgoingPacket public void addUpdate(StatusUpdateType type, int level) { _updates.put(type, level); - if (_isPlayable) { switch (type) @@ -75,10 +74,9 @@ public class StatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATUS_UPDATE.writeId(packet); - packet.writeD(_objectId); // casterId - packet.writeD(_isVisible ? _casterObjectId : 0x00); - packet.writeC(_isVisible ? 0x01 : 0x00); + packet.writeD(_isVisible ? _casterObjectId : 0); + packet.writeC(_isVisible ? 1 : 0); packet.writeC(_updates.size()); for (Entry entry : _updates.entrySet()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java index 9919307366..cf2b71df5a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java @@ -53,7 +53,6 @@ public class StopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java index 50fdc3fe4c..78fdb5d70c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java @@ -43,7 +43,6 @@ public class StopMoveInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java index 9c828c3962..b254cad8b1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java @@ -34,7 +34,6 @@ public class StopPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java index b0392de226..ca69cd5346 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java @@ -36,7 +36,6 @@ public class StopRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FINISH_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_speed); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index c1feb37b2f..2d92796c75 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -43,10 +43,8 @@ public class SummonInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class SummonInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class SummonInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,11 +154,9 @@ public class SummonInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - // Show red aura? - // if (_statusMask != 0) + // if (_statusMask != 0x00) // { // addComponentType(NpcInfoType.VISUAL_STATE); // } @@ -229,28 +206,24 @@ public class SummonInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.SUMMON_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -269,7 +242,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -285,19 +258,19 @@ public class SummonInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -309,20 +282,20 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -346,12 +319,12 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -381,12 +354,10 @@ public class SummonInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java index 864462f76f..6f88551204 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java @@ -34,7 +34,6 @@ public class SurrenderPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SURRENDER_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 746b2da3f7..b509d599db 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -161,7 +161,6 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } - _params[_paramIndex++] = param; } @@ -267,7 +266,6 @@ public class SystemMessage implements IClientOutgoingPacket { return addString(item.getName()); } - append(new SMParam(TYPE_ITEM_NAME, id)); return this; } @@ -389,7 +387,6 @@ public class SystemMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SYSTEM_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -402,13 +399,12 @@ public class SystemMessage implements IClientOutgoingPacket params[i] = _params[i].getValue(); } packet.writeH(SystemMessageId.S1_2.getId()); - packet.writeC(0x01); + packet.writeC(1); packet.writeC(TYPE_TEXT); packet.writeS(sml.getLocalisation(params)); return true; } } - packet.writeH(getId()); packet.writeC(_params.length); for (SMParam param : _params) @@ -418,9 +414,7 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } - packet.writeC(param.getType()); - switch (param.getType()) { case TYPE_ELEMENT_NAME: diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java index a91da07e77..d357efbb0e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java @@ -47,13 +47,12 @@ public class TargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_SELECTED.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java index 3dadd249f6..3d7208c06f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java @@ -42,12 +42,11 @@ public class TargetUnselected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_UNSELECTED.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index 943b5078b6..13f9b9565a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -41,14 +41,13 @@ public class TeleportToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TELEPORT_TO_LOCATION.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // Fade 0, Instant 1. + packet.writeD(0); // Fade 0, Instant 1. packet.writeD(_heading); - packet.writeD(0x00); // Unknown. + packet.writeD(0); // Unknown. return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java index cb82f2da59..8d09576d9d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java @@ -32,7 +32,6 @@ public class TradeDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_DONE.writeId(packet); - packet.writeD(_num); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index 470ce757db..0635e50548 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -56,7 +56,6 @@ public class TradeStart extends AbstractItemPacket { _mask |= 0x08; } - // Does not shows level if (_partner.isGM()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java index 0b92812a6f..aec0ace924 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java @@ -39,7 +39,6 @@ public class TradeUpdate extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_UPDATE.writeId(packet); - packet.writeH(1); packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2); writeItem(packet, _item); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java index c7102ca385..728020c0b1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java @@ -32,7 +32,6 @@ public class TutorialEnableClientEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_ENABLE_CLIENT_EVENT.writeId(packet); - packet.writeD(_eventId); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java index 92ac75afcf..7cc33a0f80 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java @@ -48,7 +48,6 @@ public class TutorialShowHtml extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_HTML.writeId(packet); - packet.writeD(_type); packet.writeS(getHtml()); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java index 75a57be38b..2ee62835db 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java @@ -37,7 +37,6 @@ public class TutorialShowQuestionMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_QUESTION_MARK.writeId(packet); - packet.writeC(_markType); packet.writeD(_markId); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index c9930f843b..a6a5ab7669 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class UserInfo extends AbstractMaskPacket { private Player _player; - private int _relation; private int _runSpd; private int _walkSpd; @@ -47,14 +46,12 @@ public class UserInfo extends AbstractMaskPacket private int _enchantLevel; private int _armorEnchant; private String _title; - private final byte[] _masks = new byte[] { (byte) 0x00, (byte) 0x00, (byte) 0x00 }; - private int _initSize = 5; public UserInfo(Player player) @@ -78,6 +75,7 @@ public class UserInfo extends AbstractMaskPacket _enchantLevel = player.getInventory().getWeaponEnchant(); _armorEnchant = player.getInventory().getArmorMinEnchant(); _title = player.getTitle(); + if (player.isGM() && player.isInvisible()) { _title = "[Invisible]"; @@ -133,29 +131,25 @@ public class UserInfo extends AbstractMaskPacket } OutgoingPackets.USER_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_initSize); packet.writeH(23); packet.writeB(_masks); - if (containsMask(UserInfoType.RELATION)) { packet.writeD(_relation); } - if (containsMask(UserInfoType.BASIC_INFO)) { packet.writeH(16 + (_player.getAppearance().getVisibleName().length() * 2)); packet.writeString(_player.getName()); - packet.writeC(_player.isGM() ? 0x01 : 0x00); + packet.writeC(_player.isGM() ? 1 : 0); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } - if (containsMask(UserInfoType.BASE_STATS)) { packet.writeH(18); @@ -165,10 +159,9 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getINT()); packet.writeH(_player.getWIT()); packet.writeH(_player.getMEN()); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); } - if (containsMask(UserInfoType.MAX_HPCPMP)) { packet.writeH(14); @@ -176,7 +169,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMaxMp()); packet.writeD(_player.getMaxCp()); } - if (containsMask(UserInfoType.CURRENT_HPMPCP_EXP_SP)) { packet.writeH(38); @@ -187,32 +179,28 @@ public class UserInfo extends AbstractMaskPacket packet.writeQ(_player.getExp()); packet.writeF((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel()))); } - if (containsMask(UserInfoType.ENCHANTLEVEL)) { packet.writeH(4); packet.writeC(_enchantLevel); packet.writeC(_armorEnchant); } - if (containsMask(UserInfoType.APPAREANCE)) { packet.writeH(15); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); } - if (containsMask(UserInfoType.STATUS)) { packet.writeH(6); packet.writeC(_player.getMountType().ordinal()); packet.writeC(_player.getPrivateStoreType().getId()); packet.writeC(_player.hasDwarvenCraft() || (_player.getSkillLevel(248) > 0) ? 1 : 0); - packet.writeC(0x00); + packet.writeC(0); } - if (containsMask(UserInfoType.STATS)) { packet.writeH(56); @@ -231,18 +219,16 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); } - if (containsMask(UserInfoType.ELEMENTALS)) { packet.writeH(14); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); } - if (containsMask(UserInfoType.POSITION)) { packet.writeH(18); @@ -251,7 +237,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getZ()); packet.writeD(_player.isInVehicle() ? _player.getVehicle().getObjectId() : 0); } - if (containsMask(UserInfoType.SPEED)) { packet.writeH(18); @@ -264,28 +249,24 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_flyRunSpd); packet.writeH(_flyWalkSpd); } - if (containsMask(UserInfoType.MULTIPLIER)) { packet.writeH(18); packet.writeF(_moveMultiplier); packet.writeF(_player.getAttackSpeedMultiplier()); } - if (containsMask(UserInfoType.COL_RADIUS_HEIGHT)) { packet.writeH(18); packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); } - if (containsMask(UserInfoType.ATK_ELEMENTAL)) { packet.writeH(5); - packet.writeC(0x00); - packet.writeH(0x00); + packet.writeC(0); + packet.writeH(0); } - if (containsMask(UserInfoType.CLAN)) { packet.writeH(32 + (_title.length() * 2)); @@ -295,12 +276,11 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getClanCrestLargeId()); packet.writeD(_player.getClanCrestId()); packet.writeD(_player.getClanPrivileges().getBitmask()); - packet.writeC(_player.isClanLeader() ? 0x01 : 0x00); + packet.writeC(_player.isClanLeader() ? 1 : 0); packet.writeD(_player.getAllyId()); packet.writeD(_player.getAllyCrestId()); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); } - if (containsMask(UserInfoType.SOCIAL)) { packet.writeH(22); @@ -314,59 +294,52 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); } - if (containsMask(UserInfoType.VITA_FAME)) { packet.writeH(15); packet.writeD(_player.getVitalityPoints()); - packet.writeC(0x00); // Vita Bonus + packet.writeC(0); // Vita Bonus packet.writeD(_player.getFame()); packet.writeD(_player.getRaidbossPoints()); } - if (containsMask(UserInfoType.SLOTS)) { packet.writeH(9); packet.writeC(_player.getInventory().getTalismanSlots()); // Confirmed packet.writeC(_player.getInventory().getBroochJewelSlots()); // Confirmed packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeC(0x00); // (1 = Red, 2 = White, 3 = White Pink) dotted ring on the floor - packet.writeC(0x00); - packet.writeC(0x00); - packet.writeC(0x00); + packet.writeC(0); // (1 = Red, 2 = White, 3 = White Pink) dotted ring on the floor + packet.writeC(0); + packet.writeC(0); + packet.writeC(0); } - if (containsMask(UserInfoType.MOVEMENTS)) { packet.writeH(4); packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); - packet.writeC(_player.isRunning() ? 0x01 : 0x00); + packet.writeC(_player.isRunning() ? 1 : 0); } - if (containsMask(UserInfoType.COLOR)) { packet.writeH(10); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); } - if (containsMask(UserInfoType.INVENTORY_LIMIT)) { packet.writeH(9); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); packet.writeH(_player.getInventoryLimit()); packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); } - if (containsMask(UserInfoType.TRUE_HERO)) { packet.writeH(9); - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeC(_player.isTrueHero() ? 100 : 0x00); + packet.writeD(0); + packet.writeH(0); + packet.writeC(_player.isTrueHero() ? 100 : 0); } - return true; } @@ -383,7 +356,6 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x10; // Party leader } } - if (clan != null) { relation |= 0x20; // Clan member @@ -392,12 +364,10 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x40; // Clan leader } } - if (player.isInSiege()) { relation |= 0x80; // In siege } - return relation; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java index 283bcf1614..90c416726a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java @@ -36,7 +36,6 @@ public class ValidateLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java index 4d8f9683d0..83f72bf981 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java @@ -40,7 +40,6 @@ public class ValidateLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java index b684e70bdc..71367cd26d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java @@ -36,7 +36,6 @@ public class VehicleCheckLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_CHECK_LOCATION.writeId(packet); - packet.writeD(_boat.getObjectId()); packet.writeD(_boat.getX()); packet.writeD(_boat.getY()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java index a4a5780f30..5b565c08b7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java @@ -46,7 +46,6 @@ public class VehicleDeparture implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_DEPARTURE.writeId(packet); - packet.writeD(_objId); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java index ec611028bf..4a995a6352 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java @@ -44,7 +44,6 @@ public class VehicleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java index 207a6fd899..bf629dcbbc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java @@ -42,7 +42,6 @@ public class VehicleStarted implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_START.writeId(packet); - packet.writeD(_objectId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 455305ce79..76b391afc6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -30,6 +30,7 @@ public class WareHouseDepositList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; public static final int FREIGHT = 1; + private final long _playerAdena; private final int _warehouseSize; private final List _items = new ArrayList<>(); @@ -49,7 +50,6 @@ public class WareHouseDepositList extends AbstractItemPacket _whType = type; _playerAdena = player.getAdena(); _warehouseSize = player.getActiveWarehouse() != null ? player.getActiveWarehouse().getSize() : 0; - final boolean isPrivate = _whType == PRIVATE; for (Item temp : player.getInventory().getAvailableItems(true, isPrivate, false)) { @@ -68,19 +68,15 @@ public class WareHouseDepositList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.WAREHOUSE_DEPOSIT_LIST.writeId(packet); - packet.writeH(_whType); packet.writeQ(_playerAdena); packet.writeD(_warehouseSize); packet.writeH(_itemsStackable.size()); - for (int itemId : _itemsStackable) { packet.writeD(itemId); } - packet.writeH(_items.size()); - for (Item item : _items) { writeItem(packet, item); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 6f57005e47..785f0a0849 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -32,6 +32,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private Player _player; private long _playerAdena; private final int _invSize; @@ -58,7 +59,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } - _items = _player.getActiveWarehouse().getItems(); for (Item item : _items) { @@ -73,7 +73,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.WAREHOUSE_WITHDRAW_LIST.writeId(packet); - packet.writeH(_whType); packet.writeQ(_playerAdena); packet.writeH(_items.size()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java index 5f2dd05f3b..aea1476fb2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java @@ -35,8 +35,7 @@ public class ExDivideAdenaCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_CANCEL.writeId(packet); - - packet.writeC(0x00); // TODO: Find me + packet.writeC(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java index 6af912cebf..de4e955aba 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java @@ -46,9 +46,8 @@ public class ExDivideAdenaDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_DONE.writeId(packet); - - packet.writeC(_isPartyLeader ? 0x01 : 0x00); - packet.writeC(_isCCLeader ? 0x01 : 0x00); + packet.writeC(_isPartyLeader ? 1 : 0); + packet.writeC(_isCCLeader ? 1 : 0); packet.writeD(_memberCount); packet.writeQ(_distributedAdenaCount); packet.writeQ(_adenaCount); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index 549def456e..84b5fead76 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -43,7 +43,6 @@ public class ExChooseShapeShiftingItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_SHAPE_SHIFTING_ITEM.writeId(packet); - packet.writeD(_targetType != null ? _targetType.ordinal() : 0); packet.writeD(_type != null ? _type.ordinal() : 0); packet.writeD(_itemId); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java index 33fb439aa5..ba55887a1a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java @@ -45,7 +45,6 @@ public class ExCuriousHouseMemberUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_UPDATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_maxHp); packet.writeD(_maxCp); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java index 8ad3659725..be2d29d864 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPacket { - public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0x00); - public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(0x01); + public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0); + public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(1); private final int _result; @@ -39,7 +39,6 @@ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPa public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_EXTRACTION_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java index ec82cc14f3..e84d7a7255 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; public static final ExPutShapeShiftingTargetItemResult FAILED = new ExPutShapeShiftingTargetItemResult(RESULT_FAILED, 0); @@ -43,7 +43,6 @@ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_resultId); packet.writeQ(_price); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java index f4d3118cc4..038eae0042 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExShapeShiftingResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; - public static final int RESULT_CLOSE = 0x02; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; + public static final int RESULT_CLOSE = 2; public static final ExShapeShiftingResult FAILED = new ExShapeShiftingResult(RESULT_FAILED, 0, 0); public static final ExShapeShiftingResult CLOSE = new ExShapeShiftingResult(RESULT_CLOSE, 0, 0); @@ -47,7 +47,6 @@ public class ExShapeShiftingResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHAPE_SHIFTING_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_targetItemId); packet.writeD(_extractItemId); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java index eaf0d209fd..4b48b09002 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java @@ -38,7 +38,7 @@ public class ExConfirmVipAttendanceCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CONFIRM_VIP_ATTENDANCE_CHECK.writeId(packet); - packet.writeC(_available ? 0x01 : 0x00); // can receive reward today? 1 else 0 + packet.writeC(_available ? 1 : 0); // can receive reward today? 1 else 0 packet.writeC(_index); // active reward index packet.writeD(0); packet.writeD(0); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java index 9d61fe68d6..dd94df023f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java @@ -45,10 +45,10 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket OutgoingPackets.EX_VIP_ATTENDANCE_ITEM_LIST.writeId(packet); packet.writeC(_available ? _index + 1 : _index); // index to receive? packet.writeC(_index); // last received index? - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeC(0x01); - packet.writeC(_available ? 0x01 : 0x00); // player can receive reward today? + packet.writeD(0); + packet.writeD(0); + packet.writeC(1); + packet.writeC(_available ? 1 : 0); // player can receive reward today? packet.writeC(250); packet.writeC(AttendanceRewardData.getInstance().getRewardsCount()); // reward size int rewardCounter = 0; @@ -57,11 +57,11 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket rewardCounter++; packet.writeD(reward.getId()); packet.writeQ(reward.getCount()); - packet.writeC(0x01); // is unknown? - packet.writeC((rewardCounter % 7) == 0 ? 0x01 : 0x00); // is last in row? + packet.writeC(1); // is unknown? + packet.writeC((rewardCounter % 7) == 0 ? 1 : 0); // is last in row? } - packet.writeC(0x00); - packet.writeD(0x00); + packet.writeC(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java index 4c3ae253ea..c79b68becc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java @@ -39,7 +39,6 @@ public class ExResponseCommissionBuyInfo extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_INFO.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java index ddfa8b6db1..c1d29735b8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java @@ -40,7 +40,6 @@ public class ExResponseCommissionBuyItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_ITEM.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java index aa4bbbde24..01e4782408 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java @@ -39,7 +39,6 @@ public class ExResponseCommissionDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_DELETE.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java index e7e3c39816..b915574175 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java @@ -55,7 +55,6 @@ public class ExResponseCommissionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_INFO.writeId(packet); - packet.writeD(_result); packet.writeD(_itemId); packet.writeQ(_presetPricePerUnit); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 876a24c7ad..89000dd57f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -39,7 +39,6 @@ public class ExResponseCommissionItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_ITEM_LIST.writeId(packet); - packet.writeD(_items.size()); for (Item itemInstance : _items) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java index 4963393b42..a012b3ab30 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java @@ -64,7 +64,6 @@ public class ExResponseCommissionList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_LIST.writeId(packet); - packet.writeD(_replyType.getClientId()); switch (_replyType) { @@ -73,13 +72,11 @@ public class ExResponseCommissionList extends AbstractItemPacket { packet.writeD((int) Instant.now().getEpochSecond()); packet.writeD(_chunkId); - int chunkSize = _items.size() - _listIndexStart; if (chunkSize > MAX_CHUNK_SIZE) { chunkSize = MAX_CHUNK_SIZE; } - packet.writeD(chunkSize); for (int i = _listIndexStart; i < (_listIndexStart + chunkSize); i++) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java index b1b0a97d7a..183547af06 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java @@ -39,7 +39,6 @@ public class ExResponseCommissionRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_REGISTER.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java index 74d8a95587..b68386e4ed 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java @@ -35,8 +35,7 @@ public class ExShowCommission implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_COMMISSION.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java index 0c267ecf34..11b1ff1e0a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExEnchantFail implements IClientOutgoingPacket { public static final ExEnchantFail STATIC_PACKET = new ExEnchantFail(0, 0); + private final int _itemOne; private final int _itemTwo; @@ -39,7 +40,6 @@ public class ExEnchantFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_FAIL.writeId(packet); - packet.writeD(_itemOne); packet.writeD(_itemTwo); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java index 71ba811ed5..87d29a8e7c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java @@ -36,7 +36,6 @@ public class ExEnchantSucess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SUCESS.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java index eb4eb8b26c..ec67d50fb6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java @@ -39,7 +39,6 @@ public class ExGetCrystalizingEstimation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - packet.writeD(_items.size()); for (ItemChanceHolder holder : _items) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java index ac16c14f5b..ebf5b64751 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java @@ -43,18 +43,18 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket } OutgoingPackets.EX_CONNECTED_TIME_AND_GETTABLE_REWARD.writeId(packet); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_oneDayRewardAvailableCount); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index a8f3304739..f11ae5f478 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -62,7 +62,6 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket } OutgoingPackets.EX_ONE_DAY_RECEIVE_REWARD_LIST.writeId(packet); - packet.writeD(_dayRemainTime); packet.writeD(_weekRemainTime); packet.writeD(_monthRemainTime); @@ -74,7 +73,7 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket { packet.writeH(reward.getId()); packet.writeC(reward.getStatus(_player)); - packet.writeC(reward.getRequiredCompletions() > 1 ? 0x01 : 0x00); + packet.writeC(reward.getRequiredCompletions() > 1 ? 1 : 0); packet.writeD(Math.min(reward.getProgress(_player), _player.getLevel())); packet.writeD(reward.getRequiredCompletions()); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java index fa605b548a..a99ad7f4e3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java @@ -52,7 +52,7 @@ public class ExFishingStart implements IClientOutgoingPacket packet.writeD(_baitLocation.getX()); packet.writeD(_baitLocation.getY()); packet.writeD(_baitLocation.getZ()); - packet.writeC(0x01); // 0 = newbie, 1 = normal, 2 = night + packet.writeC(1); // 0 = newbie, 1 = normal, 2 = night return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java index 046ad04cb6..74501fe7ff 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java @@ -49,7 +49,6 @@ public class ExUserInfoFishing implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_FISHING.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_isFishing ? 1 : 0); if (_baitLocation == null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index dc0e3e05bc..336a384bcc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -47,9 +47,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FRIEND_DETAIL_INFO.writeId(packet); - packet.writeD(_objectId); - if (_friend == null) { packet.writeS(_name); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java index 0d4bb47ff0..a90b7b6083 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java @@ -33,8 +33,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x00); + packet.writeC(0); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java index 9add9c9caa..d24139644c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java @@ -49,7 +49,6 @@ public class FriendAddRequestResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_charId); packet.writeS(_charName); @@ -57,7 +56,7 @@ public class FriendAddRequestResult implements IClientOutgoingPacket packet.writeD(_charObjectId); packet.writeD(_charLevel); packet.writeD(_charClassId); - packet.writeH(0x00); // Always 0 on retail + packet.writeH(0); // Always 0 on retail return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java index a135944662..13a7d01967 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java @@ -86,12 +86,10 @@ public class FriendList implements IClientOutgoingPacket } continue; } - if (player1.isOnline()) { online = true; } - classid = player1.getClassId().getId(); level = player1.getLevel(); _info.add(new FriendInfo(objId, name, online, classid, level)); @@ -102,14 +100,13 @@ public class FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._classid); packet.writeD(info._level); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java index 07c23f9fd2..1bb4142e34 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java @@ -38,7 +38,6 @@ public class FriendRemove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_REMOVE.writeId(packet); - packet.writeD(_responce); packet.writeS(_charName); return true; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java index e8dbddcd63..a3990c0879 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java @@ -52,7 +52,6 @@ public class FriendStatus implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_STATUS.writeId(packet); - packet.writeD(_type); packet.writeS(_name); switch (_type) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java index 8752104e06..78da5850b8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java @@ -50,7 +50,6 @@ public class L2Friend implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND.writeId(packet); - packet.writeD(_action ? 1 : 3); // 1-add 3-remove packet.writeD(_objid); packet.writeS(_name); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java index b69a253635..e50693cb11 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java @@ -81,17 +81,16 @@ public class L2FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._level); packet.writeD(info._classId); - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java index 677c09091f..706c179a9c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java @@ -37,7 +37,6 @@ public class ExMentorAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_ADD.writeId(packet); - packet.writeS(_mentor.getName()); packet.writeD(_mentor.getActiveClass()); packet.writeD(_mentor.getLevel()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java index 4722a9cab3..18c1cdeedf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java @@ -64,9 +64,8 @@ public class ExMentorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_LIST.writeId(packet); - packet.writeD(_type); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mentees.size()); for (Mentee mentee : _mentees) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java index d739dd94b7..2283920b98 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ListMenteeWaiting implements IClientOutgoingPacket { private static final int PLAYERS_PER_PAGE = 64; + private final List _possibleCandiates = new ArrayList<>(); private final int _page; @@ -51,18 +52,15 @@ public class ListMenteeWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_MENTEE_WAITING.writeId(packet); - - packet.writeD(0x01); // always 1 in retail + packet.writeD(1); // always 1 in retail if (_possibleCandiates.isEmpty()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } - packet.writeD(_possibleCandiates.size()); packet.writeD(_possibleCandiates.size() % PLAYERS_PER_PAGE); - for (Player player : _possibleCandiates) { if ((1 <= (PLAYERS_PER_PAGE * _page)) && (1 > (PLAYERS_PER_PAGE * (_page - 1)))) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java index ead46c2174..eaf44d3181 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java @@ -51,7 +51,6 @@ public class ExPledgeBonusList implements IClientOutgoingPacket packet.writeD(0); return; } - packet.writeD(bonus.getSkillReward().getSkillId()); break; } @@ -63,7 +62,6 @@ public class ExPledgeBonusList implements IClientOutgoingPacket packet.writeD(0); return; } - packet.writeD(bonus.getItemReward().getId()); break; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java index af3c790bc6..cfedfaa438 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java @@ -50,7 +50,6 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Player: " + _player + " attempting to write to a null clan!"); return false; } - final ClanRewardBonus highestMembersOnlineBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.MEMBERS_ONLINE); final ClanRewardBonus highestHuntingBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.HUNTING_MONSTERS); final ClanRewardBonus membersOnlineBonus = ClanRewardType.MEMBERS_ONLINE.getAvailableBonus(clan); @@ -75,23 +74,20 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Couldn't find item reward for highest available hunting bonus!!"); return false; } - // General OP Code OutgoingPackets.EX_PLEDGE_BONUS_OPEN.writeId(packet); - // Members online bonus packet.writeD(highestMembersOnlineBonus.getRequiredAmount()); packet.writeD(clan.getMaxOnlineMembers()); - packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0x00); - packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 0x01 : 0x00); - + packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0); + packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 1 : 0); // Hunting bonus packet.writeD(highestHuntingBonus.getRequiredAmount()); packet.writeD(clan.getHuntingPoints()); - packet.writeD(huntingBonus != null ? highestHuntingBonus.getItemReward().getId() : 0x00); - packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 0x01 : 0x00); + packet.writeD(huntingBonus != null ? highestHuntingBonus.getItemReward().getId() : 0); + packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index fb735b8925..e75426e598 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -69,7 +69,6 @@ public class ExBRBuyProduct implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUY_PRODUCT.writeId(packet); - packet.writeD(_reply); return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java index 742b3eba9d..91a186b81d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java @@ -39,10 +39,9 @@ public class ExBRGamePoint implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_GAME_POINT.writeId(packet); - packet.writeD(_charId); packet.writeQ(_charPoints); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java index 50f21df46a..e36f2ff502 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java @@ -45,7 +45,6 @@ public class ExBRProductInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_INFO.writeId(packet); - packet.writeD(_item.getBrId()); packet.writeD(_item.getPrice()); packet.writeD(_item.getItems().size()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java index dc851ffd43..0f042ba043 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java @@ -45,9 +45,8 @@ public class ExBRProductList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); // Adena - packet.writeQ(0x00); // Hero coins + packet.writeQ(0); // Hero coins packet.writeC(_type); // Type 0 - Home, 1 - History, 2 - Favorites packet.writeD(_primeList.size()); for (PrimeShopGroup brItem : _primeList) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java index b23e9fa8a9..f4406c1407 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java @@ -38,7 +38,6 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RAID_BOSS_SPAWN_INFO.writeId(packet); - packet.writeD(_bossIds.size()); // alive count for (int id : _bossIds) // alive ids { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java index 2463589c81..c09b3e899d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java @@ -47,18 +47,15 @@ public class ExFlyMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_mapId); - packet.writeD(_locations.size()); for (SayuneEntry loc : _locations) { packet.writeD(loc.getId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(loc.getX()); packet.writeD(loc.getY()); packet.writeD(loc.getZ()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java index 03fc6b580d..70b3fb25d2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java @@ -47,16 +47,13 @@ public class ExFlyMoveBroadcast implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE_BROADCAST.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); packet.writeD(_mapId); - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD(_currentLoc.getX()); packet.writeD(_currentLoc.getY()); packet.writeD(_currentLoc.getZ()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java index cfe11a27e0..49e5d86910 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java @@ -35,7 +35,6 @@ public class ExNotifyFlyMoveStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_FLY_MOVE_START.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java index d5640a47ef..0efa37ae8c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java @@ -51,7 +51,6 @@ public class ExMoveToLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_SUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_targetX); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java index 0cbe2c3e02..a0314c39aa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java @@ -46,7 +46,6 @@ public class ExShuttleGetOff implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_OFF.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java index 5211bef5ba..061bcafed9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java @@ -43,7 +43,6 @@ public class ExShuttleGetOn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_ON.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java index 97d54a9019..c8aee1fde7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java @@ -43,7 +43,6 @@ public class ExShuttleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHUTTLE_INFO.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD(_shuttle.getX()); packet.writeD(_shuttle.getY()); @@ -60,8 +59,8 @@ public class ExShuttleInfo implements IClientOutgoingPacket packet.writeD(loc.getY()); packet.writeD(loc.getZ()); } - packet.writeD(stop.isDoorOpen() ? 0x01 : 0x00); - packet.writeD(stop.hasDoorChanged() ? 0x01 : 0x00); + packet.writeD(stop.isDoorOpen() ? 1 : 0); + packet.writeD(stop.hasDoorChanged() ? 1 : 0); } return true; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java index 6ba38f29a1..28b33b998e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java @@ -43,7 +43,6 @@ public class ExShuttleMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_MOVE.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD((int) _shuttle.getStat().getMoveSpeed()); packet.writeD((int) _shuttle.getStat().getRotationSpeed()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java index bf2b6ea6eb..6c31189d6a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java @@ -44,7 +44,6 @@ public class ExStopMoveInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_SHUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java index f7f6849732..8492f42a6e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java @@ -44,7 +44,6 @@ public class ExValidateLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_SHUTTLE.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipProductList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipProductList.java index e2ced450b3..562f88d22b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipProductList.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipProductList.java @@ -45,13 +45,11 @@ public class ReceiveVipProductList implements IClientOutgoingPacket } final Collection products = PrimeShopData.getInstance().getPrimeItems().values(); final PrimeShopGroup gift = PrimeShopData.getInstance().getVipGiftOfTier(_player.getVipTier()); - OutgoingPackets.RECIVE_VIP_PRODUCT_LIST.writeId(packet); packet.writeQ(_player.getAdena()); packet.writeQ(_player.getGoldCoin()); // Gold Coin Amount packet.writeQ(_player.getSilverCoin()); // Silver Coin Amount packet.writeC(1); // Show Reward tab - if (gift != null) { packet.writeD(products.size() + 1); @@ -61,7 +59,6 @@ public class ReceiveVipProductList implements IClientOutgoingPacket { packet.writeD(products.size()); } - for (PrimeShopGroup product : products) { writeProduct(product, packet); @@ -79,7 +76,6 @@ public class ReceiveVipProductList implements IClientOutgoingPacket buffer.writeC(product.getPanelType()); // NEW - 6; HOT - 5 ... Unk buffer.writeC(product.getVipTier()); buffer.writeC(10); - buffer.writeC(product.getItems().size()); for (PrimeShopItem item : product.getItems()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java index 1d59c6d002..e7654ed911 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java @@ -60,7 +60,7 @@ public class AccountKicked implements IOutgoingPacket { OutgoingPackets.ACCOUNT_KICKED.writeId(packet); packet.writeD(_reason.getCode()); - return true; } } + diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 2e3a1f6163..1fe813e393 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: response + * Format: d d: response */ public class GGAuth implements IOutgoingPacket { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/network/serverpackets/Init.java index 4b3f71f30e..d725f45ca2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/network/serverpackets/Init.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/network/serverpackets/Init.java @@ -52,7 +52,6 @@ public class Init implements IOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.INIT.writeId(packet); - packet.writeD(_sessionId); // session id packet.writeD(0x0000c621); // protocol revision diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index 8c534554a8..f4dcd22b00 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: the failure reason + * Format: d d: the failure reason */ public class LoginFail implements IOutgoingPacket { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/network/BaseRecievePacket.java index c682cb741d..a6ed15ce32 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/network/BaseRecievePacket.java @@ -73,7 +73,7 @@ public abstract class BaseRecievePacket try { result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE); - result = result.substring(0, result.indexOf(0x00)); + result = result.substring(0, result.indexOf(0)); _off += (result.length() * 2) + 2; } catch (Exception e) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/network/BaseSendablePacket.java index a9d918de4c..8fa8491cbf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/network/BaseSendablePacket.java @@ -117,16 +117,16 @@ public abstract class BaseSendablePacket public byte[] getBytes() { // if (this instanceof Init) - // writeD(0x00); // reserve for XOR initial key + // writeD(0); // reserve for XOR initial key - writeD(0x00); // reserve for checksum + writeD(0); // reserve for checksum final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++) { - writeC(0x00); + writeC(0); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/AttackType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/AttackType.java index 6064b10ed7..e9983f15e3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/AttackType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/AttackType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum AttackType { - MISSED(0x01), - BLOCKED(0x02), - CRITICAL(0x04), - SHOT_USED(0x08); + MISSED(1), + BLOCKED(2), + CRITICAL(4), + SHOT_USED(8); private final int _mask; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/GroupType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/GroupType.java index 954aaace8b..916a14fd05 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/GroupType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/GroupType.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum GroupType implements IUpdateTypeComponent { - NONE(0x01), - PARTY(0x02), - COMMAND_CHANNEL(0x04); + NONE(1), + PARTY(2), + COMMAND_CHANNEL(4); private int _mask; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/ItemListType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/ItemListType.java index 2d38c8f5b1..c80234439f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/ItemListType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/ItemListType.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum ItemListType implements IUpdateTypeComponent { - AUGMENT_BONUS(0x01), - ELEMENTAL_ATTRIBUTE(0x02), - ENCHANT_EFFECT(0x04), - VISUAL_ID(0x08), - SOUL_CRYSTAL(0x10); + AUGMENT_BONUS(1), + ELEMENTAL_ATTRIBUTE(2), + ENCHANT_EFFECT(4), + VISUAL_ID(8), + SOUL_CRYSTAL(16); private final int _mask; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java index b3d08596c6..29403b783d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum MacroUpdateType { - ADD(0x01), - LIST(0x01), - MODIFY(0x02), - DELETE(0x00); + ADD(1), + LIST(1), + MODIFY(2), + DELETE(0); private final int _id; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java index 86c6159869..7776721c0f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java @@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum PartySmallWindowUpdateType implements IUpdateTypeComponent { - CURRENT_CP(0x01), - MAX_CP(0x02), - CURRENT_HP(0x04), - MAX_HP(0x08), - CURRENT_MP(0x10), - MAX_MP(0x20), - LEVEL(0x40), - CLASS_ID(0x80), - PARTY_SUBSTITUTE(0x100), - VITALITY_POINTS(0x200); + CURRENT_CP(1), + MAX_CP(2), + CURRENT_HP(4), + MAX_HP(8), + CURRENT_MP(16), + MAX_MP(32), + LEVEL(64), + CLASS_ID(128), + PARTY_SUBSTITUTE(256), + VITALITY_POINTS(512); private final int _mask; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 00bb331778..667ce7f17c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.Broadcast; import org.l2jmobius.gameserver.util.Util; /** - * Fromat:(ch) dddddc + * Format:(ch) dddddc * @author -Wooden- */ public class RequestExMagicSkillUseGround implements IClientIncomingPacket diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java index 8744393432..033095e74d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java @@ -39,7 +39,6 @@ public class AbnormalStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ABNORMAL_STATUS_UPDATE.writeId(packet); - packet.writeH(_effects.size()); for (BuffInfo info : _effects) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 1b8ddb2042..bec794bef3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -44,7 +44,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; } @@ -60,7 +59,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; setHtml(html); } @@ -77,13 +75,11 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } - if (!html.contains(""; return; } - _html = html; } @@ -96,7 +92,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } - setHtml(content); return true; } @@ -138,12 +133,10 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { player.clearHtmlActions(getScope()); } - if (_disabledValidation) { return; } - if (player != null) { Util.buildHtmlActionCache(player, getScope(), _npcObjId, _html); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index e9cd6a88b8..b99d4d3348 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -86,8 +86,8 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket= 0) || (item.getAttributeDefence(AttributeType.FIRE) > 0) || (item.getAttributeDefence(AttributeType.WATER) > 0) || (item.getAttributeDefence(AttributeType.WIND) > 0) || (item.getAttributeDefence(AttributeType.EARTH) > 0) || (item.getAttributeDefence(AttributeType.HOLY) > 0) || (item.getAttributeDefence(AttributeType.DARK) > 0)) { mask |= ItemListType.ELEMENTAL_ATTRIBUTE.getMask(); } - if (item.getEnchantOptions() != null) { for (int id : item.getEnchantOptions()) @@ -184,17 +182,14 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket 0) { mask |= ItemListType.VISUAL_ID.getMask(); } - if (((item.getSoulCrystalOptions() != null) && !item.getSoulCrystalOptions().isEmpty()) || ((item.getSoulCrystalSpecialOptions() != null) && !item.getSoulCrystalSpecialOptions().isEmpty())) { mask |= ItemListType.SOUL_CRYSTAL.getMask(); } - return mask; } @@ -262,7 +257,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); packet.writeC(removeSkills.size()); for (Skill removed : removeSkills) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java index 8fa6259f64..6451dffd02 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ActionFailed implements IClientOutgoingPacket { public static final ActionFailed STATIC_PACKET = new ActionFailed(); - private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); + private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); static { for (SkillCastingType castingType : SkillCastingType.values()) @@ -57,7 +57,6 @@ public class ActionFailed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ACTION_FAIL.writeId(packet); - packet.writeD(_castingType); // MagicSkillUse castingType return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java index 6e868368c9..30ce58da60 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java @@ -44,9 +44,8 @@ public class AgitDecoInfo implements IClientOutgoingPacket { continue; } - packet.writeC(_residense.hasFunction(type) ? 0x01 : 0x00); + packet.writeC(_residense.hasFunction(type) ? 1 : 0); } - // Unknown packet.writeD(0); // TODO: Find me! packet.writeD(0); // TODO: Find me! diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java index 6cb71fc985..4683fb30f0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java @@ -44,7 +44,6 @@ public class AllianceInfo implements IClientOutgoingPacket _name = leader.getAllyName(); _leaderC = leader.getName(); _leaderP = leader.getLeaderName(); - final Collection allies = ClanTable.getInstance().getClanAllies(allianceId); _allies = new ClanInfo[allies.size()]; int idx = 0; @@ -57,7 +56,6 @@ public class AllianceInfo implements IClientOutgoingPacket total += ci.getTotal(); online += ci.getOnline(); } - _total = total; _online = online; } @@ -66,18 +64,16 @@ public class AllianceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_INFO.writeId(packet); - packet.writeS(_name); packet.writeD(_total); packet.writeD(_online); packet.writeS(_leaderC); packet.writeS(_leaderP); - packet.writeD(_allies.length); for (ClanInfo aci : _allies) { packet.writeS(aci.getClan().getName()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(aci.getClan().getLevel()); packet.writeS(aci.getClan().getLeaderName()); packet.writeD(aci.getTotal()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java index f9d08f6600..186fd12e81 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java @@ -44,7 +44,6 @@ public class AllyCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java index 6218f1717f..1ae4653f91 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java @@ -38,7 +38,6 @@ public class AskJoinAlly implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_ALLIANCE.writeId(packet); - packet.writeD(_requestorObjId); packet.writeS(null); // Ally Name ? packet.writeS(null); // TODO: Find me! diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java index a66bb3cd33..b9cfbe81b9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java @@ -39,7 +39,6 @@ public class AskJoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_PARTY.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 05c420ff59..227ab571be 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -45,7 +45,6 @@ public class Attack implements IClientOutgoingPacket _attackerObjId = attacker.getObjectId(); _attackerLoc = new Location(attacker); _targetLoc = new Location(target); - final Player player = attacker.getActingPlayer(); if (player == null) { @@ -111,7 +110,6 @@ public class Attack implements IClientOutgoingPacket final Iterator it = _hits.iterator(); final Hit firstHit = it.next(); OutgoingPackets.ATTACK.writeId(packet); - packet.writeD(_attackerObjId); packet.writeD(firstHit.getTargetId()); packet.writeD(_soulshotVisualSubstitute); // Ertheia @@ -121,13 +119,11 @@ public class Attack implements IClientOutgoingPacket packet.writeD(_attackerLoc.getX()); packet.writeD(_attackerLoc.getY()); packet.writeD(_attackerLoc.getZ()); - packet.writeH(_hits.size() - 1); while (it.hasNext()) { writeHit(packet, it.next()); } - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java index bd6878eb42..8b85fe85e3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java @@ -35,7 +35,6 @@ public class AutoAttackStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_START.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java index e767d1877a..a294b1e212 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java @@ -35,7 +35,6 @@ public class AutoAttackStop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_STOP.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java index 3f329415df..0c79677eae 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java @@ -38,7 +38,6 @@ public class BlockListPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BLOCK_LIST.writeId(packet); - packet.writeD(_playersId.size()); for (int playerId : _playersId) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index f610cdc6aa..d95f0543b9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -45,8 +45,7 @@ public class BuyList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x00); // Type BUY + packet.writeD(0); // Type BUY packet.writeQ(_money); // current money packet.writeD(_listId); packet.writeD(_inventorySlots); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index cd25af908d..7cb2bf4425 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -50,36 +50,34 @@ public class BuyListSeed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BUY_LIST_SEED.writeId(packet); - packet.writeQ(_money); // current money - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeD(_manorId); // manor id - if (!_list.isEmpty()) { packet.writeH(_list.size()); // list length for (SeedProduction s : _list) { - packet.writeC(0x00); // mask item 0 to print minimal item information + packet.writeC(0); // mask item 0 to print minimal item information packet.writeD(s.getId()); // ObjectId packet.writeD(s.getId()); // ItemId packet.writeC(0xFF); // T1 packet.writeQ(s.getAmount()); // Quantity - packet.writeC(0x05); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item - packet.writeC(0x00); // Filler (always 0) - packet.writeH(0x00); // Equipped : 00-No, 01-yes - packet.writeQ(0x00); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand - packet.writeH(0x00); // Enchant level (pet level shown in control item) + packet.writeC(5); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item + packet.writeC(0); // Filler (always 0) + packet.writeH(0); // Equipped : 00-No, 01-yes + packet.writeQ(0); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand + packet.writeH(0); // Enchant level (pet level shown in control item) packet.writeD(-1); packet.writeD(-9999); - packet.writeC(0x01); // GOD Item enabled = 1 disabled (red) = 0 + packet.writeC(1); // GOD Item enabled = 1 disabled (red) = 0 packet.writeQ(s.getPrice()); // price } _list.clear(); } else { - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java index 3a7b67af23..f3dc872dca 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java @@ -32,8 +32,7 @@ public class CSShowComBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - - packet.writeC(0x01); // c4 1 to show community 00 to hide + packet.writeC(1); // c4 1 to show community 00 to hide packet.writeB(_html); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java index eacc27aa07..b18dac4cc3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java @@ -36,7 +36,6 @@ public class CameraMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CAMERA_MODE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java index 1682f5bc62..adea754676 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java @@ -39,7 +39,6 @@ public class ChairSit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAIR_SIT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_staticObjectId); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java index 2bc31a285a..de141fa067 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java @@ -38,7 +38,6 @@ public class ChangeMoveType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_MOVE_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_running ? RUN : WALK); packet.writeD(0); // c2 diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index 73277d923d..fbe5e39e2e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -22,17 +22,17 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ChangeWaitType implements IClientOutgoingPacket { + public static final int WT_SITTING = 0; + public static final int WT_STANDING = 1; + public static final int WT_START_FAKEDEATH = 2; + public static final int WT_STOP_FAKEDEATH = 3; + private final int _objectId; private final int _moveType; private final int _x; private final int _y; private final int _z; - public static final int WT_SITTING = 0; - public static final int WT_STANDING = 1; - public static final int WT_START_FAKEDEATH = 2; - public static final int WT_STOP_FAKEDEATH = 3; - public ChangeWaitType(Creature creature, int newMoveType) { _objectId = creature.getObjectId(); @@ -46,7 +46,6 @@ public class ChangeWaitType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_WAIT_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_moveType); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index 41180bac50..aa2e7b2eaa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -30,7 +30,6 @@ public class CharCreateFail implements IClientOutgoingPacket public static final int REASON_CREATE_NOT_ALLOWED = 0x05; // "Characters cannot be created from this server." public static final int REASON_CHOOSE_ANOTHER_SVR = 0x06; // "Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please // choose another server." - private final int _error; public CharCreateFail(int errorCode) @@ -42,7 +41,6 @@ public class CharCreateFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index f0e99885ad..768617e558 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -31,8 +31,7 @@ public class CharCreateOk implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_SUCCESS.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index bed289ca0a..1674eef343 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -33,7 +33,6 @@ public class CharDeleteFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_DELETE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 607352f62b..d11d416867 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -33,6 +33,22 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { + private static final int[] PAPERDOLL_ORDER = new int[] + { + Inventory.PAPERDOLL_UNDER, + Inventory.PAPERDOLL_HEAD, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_LHAND, + Inventory.PAPERDOLL_GLOVES, + Inventory.PAPERDOLL_CHEST, + Inventory.PAPERDOLL_LEGS, + Inventory.PAPERDOLL_FEET, + Inventory.PAPERDOLL_CLOAK, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_HAIR, + Inventory.PAPERDOLL_HAIR2 + }; + private final Player _player; private final Clan _clan; private int _objId; @@ -55,22 +71,6 @@ public class CharInfo implements IClientOutgoingPacket private int _vehicleId = 0; private final boolean _gmSeeInvis; - private static final int[] PAPERDOLL_ORDER = new int[] - { - Inventory.PAPERDOLL_UNDER, - Inventory.PAPERDOLL_HEAD, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_LHAND, - Inventory.PAPERDOLL_GLOVES, - Inventory.PAPERDOLL_CHEST, - Inventory.PAPERDOLL_LEGS, - Inventory.PAPERDOLL_FEET, - Inventory.PAPERDOLL_CLOAK, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_HAIR, - Inventory.PAPERDOLL_HAIR2 - }; - public CharInfo(Player player, boolean gmSeeInvis) { _player = player; @@ -119,16 +119,15 @@ public class CharInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); // Confirmed packet.writeD(_y); // Confirmed packet.writeD(_z); // Confirmed packet.writeD(_vehicleId); // Confirmed packet.writeD(_objId); // Confirmed packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed - packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) @@ -152,10 +151,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.getPvpFlag()); packet.writeD(_player.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -166,53 +163,40 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); - packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeS(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle()); - packet.writeD(_player.getAppearance().getVisibleClanId()); packet.writeD(_player.getAppearance().getVisibleClanCrestId()); packet.writeD(_player.getAppearance().getVisibleAllyId()); packet.writeD(_player.getAppearance().getVisibleAllyCrestId()); - - packet.writeC(_player.isSitting() ? 0x00 : 0x01); // Confirmed - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // Confirmed - packet.writeC(_player.isInCombat() ? 0x01 : 0x00); // Confirmed - - packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 0x01 : 0x00); // Confirmed - - packet.writeC(_player.isInvisible() ? 0x01 : 0x00); - + packet.writeC(_player.isSitting() ? 0 : 1); // Confirmed + packet.writeC(_player.isRunning() ? 1 : 0); // Confirmed + packet.writeC(_player.isInCombat() ? 1 : 0); // Confirmed + packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 1 : 0); // Confirmed + packet.writeC(_player.isInvisible() ? 1 : 0); packet.writeC(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount packet.writeC(_player.getPrivateStoreType().getId()); // Confirmed packet.writeH(_player.getCubics().size()); // Confirmed _player.getCubics().keySet().forEach(packet::writeH); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); // Confirmed packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); packet.writeH(_player.getRecomHave()); // Confirmed packet.writeD(_player.getMountNpcId() == 0 ? 0 : _player.getMountNpcId() + 1000000); - packet.writeD(_player.getClassId().getId()); // Confirmed - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeC(_player.isMounted() ? 0 : _enchantLevel); // Confirmed - packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeD(_player.getClanCrestLargeId()); packet.writeC(_player.isNoble() ? 1 : 0); // Confirmed packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed - final ILocational baitLocation = _player.getFishing().getBaitLocation(); if (baitLocation != null) { @@ -228,29 +212,21 @@ public class CharInfo implements IClientOutgoingPacket } packet.writeD(_player.getAppearance().getNameColor()); // Confirmed - packet.writeD(_heading); // Confirmed - packet.writeC(_player.getPledgeClass()); packet.writeH(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); // Confirmed - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - - packet.writeC(0x00); // nPvPRestrainStatus - + packet.writeC(0); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentHp())); // Confirmed packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - - packet.writeC(0x00); // cBRLectureMark + packet.writeC(0); // cBRLectureMark final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed @@ -262,8 +238,9 @@ public class CharInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } + packet.writeC(_player.isTrueHero() ? 100 : 0); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); // Hair accessory + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); // Hair accessory packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 7187b73184..11f5f4df52 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -40,17 +40,16 @@ public class CharSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTED.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getTitle()); packet.writeD(_sessionId); packet.writeD(_player.getClanId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x01); // active ?? + packet.writeD(1); // active ?? packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -62,25 +61,20 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_player.getReputation()); packet.writeD(_player.getPkKills()); packet.writeD(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_player.getClassId().getId()); - packet.writeB(new byte[16]); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeB(new byte[28]); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index a949a365d9..19b5083644 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -44,10 +44,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { private static final Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); - private final String _loginName; - private final int _sessionId; - private int _activeId; - private final List _characterPackages; private static final int[] PAPERDOLL_ORDER = new int[] { @@ -85,7 +81,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_BROOCH_JEWEL5, Inventory.PAPERDOLL_BROOCH_JEWEL6 }; - private static final int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, @@ -99,6 +94,11 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_HAIR2, }; + private final String _loginName; + private final int _sessionId; + private int _activeId; + private final List _characterPackages; + /** * Constructor for CharSelectionInfo. * @param loginName @@ -129,16 +129,13 @@ public class CharSelectionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.size(); packet.writeD(size); // Created character count - packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) - packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 0x01 : 0x00); // if 1 can't create new char - packet.writeC(0x01); // 0=can't play, 1=can play free until level 85, 2=100% free play - packet.writeD(0x02); // if 1, Korean client - packet.writeH(0x00); // Balthus Knights, if 1 suggests premium account - + packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 1 : 0); // if 1 can't create new char + packet.writeC(1); // 0=can't play, 1=can play free until level 85, 2=100% free play + packet.writeD(2); // if 1, Korean client + packet.writeH(0); // Balthus Knights, if 1 suggests premium account long lastAccess = 0; if (_activeId == -1) { @@ -151,7 +148,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - for (int i = 0; i < size; i++) { final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); @@ -159,96 +155,78 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name packet.writeD(_sessionId); // Account ID - packet.writeD(0x00); // Clan ID - packet.writeD(0x00); // Builder level - + packet.writeD(0); // Clan ID + packet.writeD(0); // Builder level packet.writeD(charInfoPackage.getSex()); // Sex packet.writeD(charInfoPackage.getRace()); // Race packet.writeD(charInfoPackage.getBaseClassId()); - - packet.writeD(0x01); // GameServerName - + packet.writeD(1); // GameServerName packet.writeD(charInfoPackage.getX()); packet.writeD(charInfoPackage.getY()); packet.writeD(charInfoPackage.getZ()); packet.writeF(charInfoPackage.getCurrentHp()); packet.writeF(charInfoPackage.getCurrentMp()); - packet.writeQ(charInfoPackage.getSp()); packet.writeQ(charInfoPackage.getExp()); packet.writeF((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel()))); // High // Five packet.writeD(charInfoPackage.getLevel()); - packet.writeD(charInfoPackage.getReputation()); packet.writeD(charInfoPackage.getPkKills()); packet.writeD(charInfoPackage.getPvPKills()); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); // Ertheia - packet.writeD(0x00); // Ertheia - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); // Ertheia + packet.writeD(0); // Ertheia for (int slot : getPaperdollOrder()) { packet.writeD(charInfoPackage.getPaperdollItemId(slot)); } - - packet.writeD(0x00); // Salvation - packet.writeD(0x00); // Salvation - packet.writeD(0x00); // Salvation - packet.writeD(0x00); // Salvation - packet.writeD(0x00); // Salvation - + packet.writeD(0); // Salvation + packet.writeD(0); // Salvation + packet.writeD(0); // Salvation + packet.writeD(0); // Salvation + packet.writeD(0); // Salvation for (int slot : getPaperdollOrderVisualId()) { packet.writeD(charInfoPackage.getPaperdollItemVisualId(slot)); } - packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_CHEST)); // Upper Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_LEGS)); // Lower Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_HEAD)); // Headgear enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_GLOVES)); // Gloves enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_FEET)); // Boots enchant level - packet.writeD(charInfoPackage.getHairStyle()); packet.writeD(charInfoPackage.getHairColor()); packet.writeD(charInfoPackage.getFace()); - packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); - packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption1Id() : 0); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption2Id() : 0); - // packet.writeD(charInfoPackage.getTransformId()); // Used to display Transformations - packet.writeD(0x00); // Currently on retail when you are on character select you don't see your transformation. - - packet.writeD(0x00); // Pet NpcId - packet.writeD(0x00); // Pet level - packet.writeD(0x00); // Pet Food - packet.writeD(0x00); // Pet Food Level - packet.writeF(0x00); // Current pet HP - packet.writeF(0x00); // Current pet MP - + packet.writeD(0); // Currently on retail when you are on character select you don't see your transformation. + packet.writeD(0); // Pet NpcId + packet.writeD(0); // Pet level + packet.writeD(0); // Pet Food + packet.writeD(0); // Pet Food Level + packet.writeF(0); // Current pet HP + packet.writeF(0); // Current pet MP packet.writeD(charInfoPackage.getVitalityPoints()); // Vitality packet.writeD((int) Config.RATE_VITALITY_EXP_MULTIPLIER * 100); // Vitality Percent packet.writeD(charInfoPackage.getVitalityItemsUsed()); // Remaining vitality item uses - packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0x00 : 0x01); // Char is active or not - packet.writeC(charInfoPackage.isNoble() ? 0x01 : 0x00); - packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 0x01 : 0x00); // Hero glow - packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 0x01 : 0x00); // Show hair accessory if enabled + packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0 : 1); // Char is active or not + packet.writeC(charInfoPackage.isNoble() ? 1 : 0); + packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 1 : 0); // Hero glow + packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 1 : 0); // Show hair accessory if enabled } return true; } @@ -257,7 +235,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); - try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate")) { @@ -270,7 +247,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (charInfopackage != null) { characterList.add(charInfopackage); - final Player player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { @@ -284,7 +260,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return characterList; } @@ -326,7 +301,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { clan.removeClanMember(objectId, 0); } - GameClient.deleteCharByObjId(objectId); return null; } @@ -345,20 +319,16 @@ public class CharSelectionInfo implements IClientOutgoingPacket charInfopackage.setHairStyle(chardata.getInt("hairstyle")); charInfopackage.setHairColor(chardata.getInt("haircolor")); charInfopackage.setSex(chardata.getInt("sex")); - charInfopackage.setExp(chardata.getLong("exp")); charInfopackage.setSp(chardata.getLong("sp")); charInfopackage.setVitalityPoints(chardata.getInt("vitality_points")); charInfopackage.setClanId(chardata.getInt("clanid")); - charInfopackage.setRace(chardata.getInt("race")); - final int baseClassId = chardata.getInt("base_class"); final int activeClassId = chardata.getInt("classid"); charInfopackage.setX(chardata.getInt("x")); charInfopackage.setY(chardata.getInt("y")); charInfopackage.setZ(chardata.getInt("z")); - final int faction = chardata.getInt("faction"); if (faction == 1) { @@ -368,7 +338,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setEvil(); } - if (Config.MULTILANG_ENABLE) { String lang = chardata.getString("language"); @@ -378,22 +347,18 @@ public class CharSelectionInfo implements IClientOutgoingPacket } charInfopackage.setHtmlPrefix("data/lang/" + lang + "/"); } - // if is in subclass, load subclass exp, sp, level info if (baseClassId != activeClassId) { loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId); } - charInfopackage.setClassId(activeClassId); - // Get the augmentation id for equipped weapon int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); if (weaponObjId < 1) { weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); } - if (weaponObjId > 0) { try (Connection con = DatabaseFactory.getConnection(); @@ -419,7 +384,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } - // Check if the base class is set to zero and also doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly. if ((baseClassId == 0) && (activeClassId > 0)) { @@ -429,7 +393,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setBaseClassId(baseClassId); } - charInfopackage.setDeleteTimer(deletetime); charInfopackage.setLastAccess(chardata.getLong("lastAccess")); charInfopackage.setNoble(chardata.getInt("nobless") == 1); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java index 847e24db87..d59df7911a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java @@ -32,7 +32,6 @@ public class ChooseInventoryItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHOOSE_INVENTORY_ITEM.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java index 12a3940521..ac66c2fa0f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java @@ -32,7 +32,6 @@ public class ClientSetTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CLIENT_SET_TIME.writeId(packet); - packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // time in client minutes packet.writeD(6); // constant to match the server time( this determines the speed of the client clock) return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java index 195824578b..5fdb62f544 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java @@ -68,7 +68,6 @@ public class ConfirmDlg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CONFIRM_DLG.writeId(packet); - final SMParam[] params = _systemMessage.getParams(); packet.writeD(_systemMessage.getId()); packet.writeD(params.length); @@ -130,7 +129,6 @@ public class ConfirmDlg implements IClientOutgoingPacket } } } - packet.writeD(_time); packet.writeD(_requesterId); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 2a98428740..85d5630327 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -71,7 +71,6 @@ public class CreatureSay implements IClientOutgoingPacket _mask |= 0x08; } } - // Does not shows level if (sender.isGM()) { @@ -123,7 +122,6 @@ public class CreatureSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_sender == null ? 0 : _sender.getObjectId()); packet.writeD(_chatType.getClientId()); if (_senderName != null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index dfc40d995f..a307b06e4b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -38,9 +38,8 @@ public class DeleteObject implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DELETE_OBJECT.writeId(packet); - packet.writeD(_objectId); - packet.writeC(0x00); // c2 + packet.writeC(0); // c2 return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java index 982c8f3311..3b5917e55b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java @@ -50,7 +50,6 @@ public class Dice implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DICE.writeId(packet); - packet.writeD(_objectId); // object id of player packet.writeD(_itemId); // item id of dice (spade) 4625,4626,4627,4628 packet.writeD(_number); // number rolled diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 3d741a86a6..ebc93d0fc4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -68,7 +68,6 @@ public class Die implements IClientOutgoingPacket siegeClan = fort.getSiege().getAttackerClan(clan); isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan); } - _toVillage = creature.canRevive() && !creature.isPendingRevive(); _toClanHall = (clan != null) && (clan.getHideoutId() > 0); _toCastle = ((clan != null) && (clan.getCastleId() > 0)) || isInCastleDefense; @@ -76,7 +75,6 @@ public class Die implements IClientOutgoingPacket _useFeather = creature.getAccessLevel().allowFixedRes() || creature.getInventory().haveItemForSelfResurrection(); _toFortress = ((clan != null) && (clan.getFortId() > 0)) || isInFortDefense; } - _isSweepable = creature.isAttackable() && creature.isSweepActive(); } @@ -91,7 +89,6 @@ public class Die implements IClientOutgoingPacket { _items = new ArrayList<>(8); } - if (_items.size() < 8) { _items.add(itemId); @@ -116,20 +113,18 @@ public class Die implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DIE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_toVillage ? 0x01 : 0x00); - packet.writeD(_toClanHall ? 0x01 : 0x00); - packet.writeD(_toCastle ? 0x01 : 0x00); - packet.writeD(_toOutpost ? 0x01 : 0x00); - packet.writeD(_isSweepable ? 0x01 : 0x00); - packet.writeD(_useFeather ? 0x01 : 0x00); - packet.writeD(_toFortress ? 0x01 : 0x00); - packet.writeD(0x00); // Disables use Feather button for X seconds - packet.writeD(0x00); // Adventure's Song - packet.writeC(_hideAnimation ? 0x01 : 0x00); - - packet.writeD(_itemsEnabled ? 0x01 : 0x00); + packet.writeD(_toVillage ? 1 : 0); + packet.writeD(_toClanHall ? 1 : 0); + packet.writeD(_toCastle ? 1 : 0); + packet.writeD(_toOutpost ? 1 : 0); + packet.writeD(_isSweepable ? 1 : 0); + packet.writeD(_useFeather ? 1 : 0); + packet.writeD(_toFortress ? 1 : 0); + packet.writeD(0); // Disables use Feather button for X seconds + packet.writeD(0); // Adventure's Song + packet.writeC(_hideAnimation ? 1 : 0); + packet.writeD(_itemsEnabled ? 1 : 0); packet.writeD(getItems().size()); getItems().forEach(packet::writeD); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java index 15404f9dee..5837faec19 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java @@ -33,7 +33,6 @@ public class DoorInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_INFO.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.getId()); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java index 54f8742a73..14d41afee7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java @@ -33,7 +33,6 @@ public class DoorStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_STATUS_UPDATE.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.isOpen() ? 0 : 1); packet.writeD(_door.getDamage()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index b12458e719..3035890956 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -40,20 +40,17 @@ public class DropItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DROP_ITEM.writeId(packet); - packet.writeD(_objectId); packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeC(_item.isStackable() ? 0x01 : 0x00); + packet.writeC(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - - packet.writeC(0x00); - // packet.writeD(0x01); if above C == true (1) then packet.readD() + packet.writeC(0); + // packet.writeD(1); if above C == true (1) then packet.readD() packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java index 631c43ba0c..99bd80d97e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java @@ -62,13 +62,12 @@ public class Earthquake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EARTHQUAKE.writeId(packet); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_intensity); packet.writeD(_duration); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index db168592f1..335ea9dced 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -58,7 +58,6 @@ public class EnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_crystal); packet.writeQ(_count); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java index 837be1f5e3..169410245b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java @@ -41,7 +41,6 @@ public class EtcStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ETC_STATUS_UPDATE.writeId(packet); - packet.writeC(_player.getCharges()); // 1-7 increase force, level packet.writeD(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%) packet.writeC(_player.getExpertiseWeaponPenalty()); // Weapon Grade Penalty [1-4] diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java index 5dca90f960..9f8d576148 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java @@ -24,13 +24,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class Ex2ndPasswordAck implements IClientOutgoingPacket { + // TODO: Enum + public static final int SUCCESS = 0; + public static final int WRONG_PATTERN = 1; + private final int _status; private final int _response; - // TODO: Enum - public static final int SUCCESS = 0x00; - public static final int WRONG_PATTERN = 0x01; - public Ex2ndPasswordAck(int status, int response) { _status = status; @@ -41,10 +41,9 @@ public class Ex2ndPasswordAck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_ACK.writeId(packet); - packet.writeC(_status); - packet.writeD(_response == WRONG_PATTERN ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(_response == WRONG_PATTERN ? 1 : 0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java index 48bde5161d..c86b5185d0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordCheck implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_NEW = 0x00; - public static final int PASSWORD_PROMPT = 0x01; - public static final int PASSWORD_OK = 0x02; + public static final int PASSWORD_NEW = 0; + public static final int PASSWORD_PROMPT = 1; + public static final int PASSWORD_OK = 2; private final int _windowType; @@ -40,9 +40,8 @@ public class Ex2ndPasswordCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_CHECK.writeId(packet); - packet.writeD(_windowType); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java index 1abf50ab01..f6731bf18f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordVerify implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_OK = 0x00; - public static final int PASSWORD_WRONG = 0x01; - public static final int PASSWORD_BAN = 0x02; + public static final int PASSWORD_OK = 0; + public static final int PASSWORD_WRONG = 1; + public static final int PASSWORD_BAN = 2; private final int _wrongTentatives; private final int _mode; @@ -42,7 +42,6 @@ public class Ex2ndPasswordVerify implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_VERIFY.writeId(packet); - packet.writeD(_mode); packet.writeD(_wrongTentatives); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java index 55abf718c5..db551344ef 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java @@ -45,10 +45,8 @@ public class ExAbnormalStatusUpdateFromTarget implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ABNORMAL_STATUS_UPDATE_FROM_TARGET.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeH(_effects.size()); - for (BuffInfo info : _effects) { packet.writeD(info.getSkill().getDisplayId()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java index c4b9cd8356..f3abd6ec5c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java @@ -41,7 +41,6 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRABLE_SKILL_LIST_BY_CLASS.writeId(packet); - packet.writeH(_type.getId()); packet.writeH(_learnable.size()); for (SkillLearn skill : _learnable) @@ -54,7 +53,7 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket packet.writeC(skill.getRequiredItems().size()); if (_type == AcquireSkillType.SUBPLEDGE) { - packet.writeH(0x00); + packet.writeH(0); } } return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java index fd0e2fc97c..8555bb6e86 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java @@ -61,7 +61,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_SKILL_INFO.writeId(packet); - packet.writeD(_id); packet.writeD(_level); packet.writeQ(_spCost); @@ -73,7 +72,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket packet.writeD(holder.getId()); packet.writeQ(holder.getCount()); } - packet.writeD(_skillRem.size()); for (Skill skill : _skillRem) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java index 29793f4d6c..ff8c526ec4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java @@ -36,7 +36,6 @@ public class ExAdenaInvenCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ADENA_INVEN_COUNT.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeH(_player.getInventory().getSize()); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java index 2aa2d85bc5..5ef11e0f1e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java @@ -50,13 +50,11 @@ public class ExAirShipInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_INFO.writeId(packet); - packet.writeD(_ship.getObjectId()); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(_captain); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); @@ -73,14 +71,13 @@ public class ExAirShipInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - packet.writeD(_ship.getFuel()); packet.writeD(_ship.getMaxFuel()); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java index 4cfc76bfba..8b37f4fc0a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java @@ -42,7 +42,6 @@ public class ExAirShipStopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_airShipId); packet.writeD(_playerId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java index 33c57712da..52958f931b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java @@ -37,12 +37,10 @@ public class ExAirShipTeleportList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_TELEPORT_LIST.writeId(packet); - packet.writeD(_dockId); if (_teleports != null) { packet.writeD(_teleports.length); - for (int i = 0; i < _teleports.length; i++) { packet.writeD(i - 1); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java index 392b228f0d..7918022c72 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java @@ -50,13 +50,12 @@ public class ExAlchemySkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_SKILL_LIST.writeId(packet); - packet.writeD(_skills.size()); for (Skill skill : _skills) { packet.writeD(skill.getId()); packet.writeD(skill.getLevel()); - packet.writeQ(0x00); // Always 0 on Naia, SP i guess? + packet.writeQ(0); // Always 0 on Naia, SP i guess? packet.writeC(skill.getId() == CommonSkill.ALCHEMY_CUBE.getId() ? 0 : 1); // This is type in flash, visible or not } return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java index 3d7ee12a81..1990e1e701 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java @@ -37,7 +37,6 @@ public class ExAskCoupleAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_COUPLE_ACTION.writeId(packet); - packet.writeD(_actionId); packet.writeD(_objectId); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java index 61cabedd98..45615daf5a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java @@ -39,9 +39,8 @@ public class ExAskJoinMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_MPCC.writeId(packet); - packet.writeS(_requestorName); // name of CCLeader - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java index 17fa9d028f..908022ff7e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java @@ -38,7 +38,6 @@ public class ExAskJoinPartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_PARTY_ROOM.writeId(packet); - packet.writeS(_charName); packet.writeS(_roomName); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java index 2a6b958dc9..1551840013 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java @@ -38,7 +38,6 @@ public class ExAskModifyPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_MODIFY_PARTY_LOOTING.writeId(packet); - packet.writeS(_requestor); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java index 958e7c3d06..fa62c8a207 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java @@ -45,7 +45,6 @@ public class ExAttributeEnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ATTRIBUTE_ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeC(_isWeapon); packet.writeH(_type); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java index 1a3a1ef3fe..3d65055b3c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java @@ -41,9 +41,8 @@ public class ExAutoSoulShot implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AUTO_SOUL_SHOT.writeId(packet); - packet.writeD(_itemId); - packet.writeD(_enable ? 0x01 : 0x00); + packet.writeD(_enable ? 1 : 0); packet.writeD(_type); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java index 8680c6bd7a..a8137347ec 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java @@ -37,8 +37,7 @@ public class ExBaseAttributeCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASE_ATTRIBUTE_CANCEL_RESULT.writeId(packet); - - packet.writeD(0x01); // result + packet.writeD(1); // result packet.writeD(_objId); packet.writeD(_attribute); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java index acbad69599..27f7fb5a63 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java @@ -75,7 +75,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 1149, 1150, 1151, 1152, 1153, 1154, 1155 }; - public static final int[] DEFAULT_ACTION_LIST = { 0, 1, 2, 3, @@ -145,7 +144,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 5012, 5013, 5014, 5015 }; //@formatter:on - public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST); private final int[] _actionIds; @@ -159,7 +157,6 @@ public class ExBasicActionList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASIC_ACTION_LIST.writeId(packet); - packet.writeD(_actionIds.length); for (int _actionId : _actionIds) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java index 4c4fac8c91..d32dca4d21 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java @@ -34,13 +34,14 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBeautyItemList implements IClientOutgoingPacket { - private int _colorCount; - private final BeautyData _beautyData; - private final Map> _colorData = new HashMap<>(); private static final int HAIR_TYPE = 0; private static final int FACE_TYPE = 1; private static final int COLOR_TYPE = 2; + private int _colorCount; + private final BeautyData _beautyData; + private final Map> _colorData = new HashMap<>(); + public ExBeautyItemList(Player player) { _beautyData = BeautyShopData.getInstance().getBeautyData(player.getRace(), player.getAppearance().getSexType()); @@ -60,7 +61,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BEAUTY_ITEM_LIST.writeId(packet); - packet.writeD(HAIR_TYPE); packet.writeD(_beautyData.getHairList().size()); for (BeautyItem hair : _beautyData.getHairList().values()) @@ -72,7 +72,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(hair.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(FACE_TYPE); packet.writeD(_beautyData.getFaceList().size()); for (BeautyItem face : _beautyData.getFaceList().values()) @@ -84,7 +83,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(face.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(COLOR_TYPE); packet.writeD(_colorCount); for (Entry> entry : _colorData.entrySet()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java index 1825236886..6d4c45cb2b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java @@ -34,7 +34,6 @@ public class ExBirthdayPopup implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_BIRTH_DAY.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java index 7d2f17e697..43e525f05f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java @@ -26,6 +26,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBrBroadcastEventState implements IClientOutgoingPacket { + public static final int APRIL_FOOLS = 20090401; + public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) + public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) + public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) + public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) + private final int _eventId; private final int _eventState; private int _param0; @@ -36,12 +42,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket private String _param5; private String _param6; - public static final int APRIL_FOOLS = 20090401; - public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) - public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) - public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) - public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) - public ExBrBroadcastEventState(int eventId, int eventState) { _eventId = eventId; @@ -65,7 +65,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BROADCAST_EVENT_STATE.writeId(packet); - packet.writeD(_eventId); packet.writeD(_eventState); packet.writeD(_param0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java index 1fd7ec663a..c0683c8797 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java @@ -44,7 +44,6 @@ public class ExBrBuffEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUFF_EVENT_STATE.writeId(packet); - packet.writeD(_type); packet.writeD(_value); packet.writeD(_state); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java index 943aae8a62..8e009d7b09 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java @@ -43,7 +43,6 @@ public class ExBrLoadEventTopRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_LOAD_EVENT_TOP_RANKERS.writeId(packet); - packet.writeD(_eventId); packet.writeD(_day); packet.writeD(_count); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java index 0a0ddf31b8..291f7a6b55 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java @@ -36,9 +36,8 @@ public class ExBrPremiumState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PREMIUM_STATE.writeId(packet); - packet.writeD(_player.getObjectId()); - packet.writeC(_player.hasPremiumStatus() || (_player.getVipTier() > 0) ? 0x01 : 0x00); + packet.writeC(_player.hasPremiumStatus() || (_player.getVipTier() > 0) ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 381dd859ad..567cfc70f9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -59,10 +59,8 @@ public class ExBuySellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x01); // Type SELL + packet.writeD(1); // Type SELL packet.writeD(_inventorySlots); - if ((_sellList != null)) { packet.writeH(_sellList.size()); @@ -74,9 +72,8 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - if ((_refundList != null) && !_refundList.isEmpty()) { packet.writeH(_refundList.size()); @@ -90,10 +87,9 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - - packet.writeC(_done ? 0x01 : 0x00); + packet.writeC(_done ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java index 2b43c0ce4b..e0ec81e0e7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java @@ -39,7 +39,6 @@ public class ExCastleState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CASTLE_STATE.writeId(packet); - packet.writeD(_castleId); packet.writeD(_castleSide.ordinal()); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java index b7f90d261b..a8196c7a83 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java @@ -52,7 +52,6 @@ public class ExChangeClientEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_CLIENT_EFFECT_INFO.writeId(packet); - packet.writeD(_type); packet.writeD(_key); packet.writeD(_value); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java index 472abc88df..eea59162ee 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java @@ -37,7 +37,6 @@ public class ExChangeNpcState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NPC_STATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java index 8cdcb4460d..45f2805517 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java @@ -49,7 +49,6 @@ public class ExChangePostState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_POST_STATE.writeId(packet); - packet.writeD(_receivedBoard ? 1 : 0); packet.writeD(_changedMsgIds.length); for (int postId : _changedMsgIds) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java index fc58ec9a2e..d765ab54e0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java @@ -35,7 +35,6 @@ public class ExChangeToAwakenedClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_TO_AWAKENED_CLASS.writeId(packet); - packet.writeD(_classId); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index f51a3eb3ae..1e9b8e9dc8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -47,7 +47,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket throw new IllegalArgumentException("Undefined Atribute item: " + stone); } _level = ElementalAttributeData.getInstance().getMaxElementLevel(_itemId); - // Register only items that can be put an attribute stone/crystal for (Item item : player.getInventory().getItems()) { @@ -62,7 +61,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_INVENTORY_ATTRIBUTE_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeQ(_count); packet.writeD(_atribute == AttributeType.FIRE ? 1 : 0); // Fire diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java index a272d85469..238882cd11 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java @@ -35,7 +35,6 @@ public class ExCloseMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java index d2ecd70952..877bca760a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java @@ -34,7 +34,6 @@ public class ExClosePartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_PARTY_ROOM.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java index 27c112776b..1d02c972b5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java @@ -54,7 +54,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLOSSEUM_FENCE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_clientState); packet.writeD(_x); @@ -62,7 +61,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_width); packet.writeD(_length); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java index 766d3619ad..b72bef93e8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java @@ -37,9 +37,8 @@ public class ExConfirmAddingContact implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AGIT_AUCTION_CMD.writeId(packet); - packet.writeS(_charName); - packet.writeD(_added ? 0x01 : 0x00); + packet.writeD(_added ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java index beded32254..c832d507ed 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameAddPlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x01); - + packet.writeD(1); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java index 5f36f730d0..847ea93e6a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java @@ -45,9 +45,7 @@ public class ExCubeGameChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java index 66abbf4b75..a2f2e61ded 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java @@ -43,12 +43,10 @@ public class ExCubeGameChangeTeam implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x05); - + packet.writeD(5); packet.writeD(_player.getObjectId()); - packet.writeD(_fromRedTeam ? 0x01 : 0x00); - packet.writeD(_fromRedTeam ? 0x00 : 0x01); + packet.writeD(_fromRedTeam ? 1 : 0); + packet.writeD(_fromRedTeam ? 0 : 1); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java index 5273b2099a..136b439283 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java @@ -39,9 +39,7 @@ public class ExCubeGameChangeTimeToStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x03); - + packet.writeD(3); packet.writeD(_seconds); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java index f81a302941..9bdba49029 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java @@ -35,7 +35,6 @@ public class ExCubeGameCloseUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0xffffffff); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java index 259a0e9407..3177e7a488 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java @@ -40,11 +40,9 @@ public class ExCubeGameEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x01); - - packet.writeD(_isRedTeamWin ? 0x01 : 0x00); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(1); + packet.writeD(_isRedTeamWin ? 1 : 0); + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java index 4d89e621ce..8b96bb545f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java @@ -55,14 +55,11 @@ public class ExCubeGameExtendedChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeD(_playerPoints); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java index e5a00f1ab7..c084789f13 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameRemovePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java index 00be884d2f..35a3f289d1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java @@ -35,8 +35,7 @@ public class ExCubeGameRequestReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x04); + packet.writeD(4); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java index 1bc89e0c32..8b755dd3cc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java @@ -30,7 +30,6 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket // Players Lists private final List _bluePlayers; private final List _redPlayers; - // Common Values private final int _roomNumber; @@ -51,12 +50,9 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_roomNumber); packet.writeD(0xffffffff); - packet.writeD(_bluePlayers.size()); for (Player player : _bluePlayers) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java index 2f2c092c08..d000112787 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java @@ -31,7 +31,6 @@ public class ExCursedWeaponList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet); - final Set ids = CursedWeaponsManager.getInstance().getCursedWeaponsIds(); packet.writeD(ids.size()); ids.forEach(packet::writeD); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java index 2f60a1b80c..5bc7ff3238 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java @@ -39,7 +39,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet); - if (!_cursedWeaponInfo.isEmpty()) { packet.writeD(_cursedWeaponInfo.size()); @@ -47,7 +46,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { packet.writeD(w.id); packet.writeD(w.activated); - packet.writeD(w.pos.getX()); packet.writeD(w.pos.getY()); packet.writeD(w.pos.getZ()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java index f475a02b28..0456fb9dae 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java @@ -34,7 +34,6 @@ public class ExDissmissMPCCRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DISSMISS_MPCC_ROOM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java index 258010f717..c731b7c7a9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java @@ -37,7 +37,6 @@ public class ExDuelAskStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_ASK_START.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDuel); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java index 043c82c0db..e9a31bee57 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java @@ -38,7 +38,6 @@ public class ExDuelEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_END.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java index 264409b3d6..e1fa1cea88 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java @@ -38,7 +38,6 @@ public class ExDuelReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_READY.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java index 488aafcb7d..ecdd528a16 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java @@ -38,7 +38,6 @@ public class ExDuelStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_START.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java index 7df040c5e7..5ed0c09675 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java @@ -36,7 +36,6 @@ public class ExDuelUpdateUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_UPDATE_USER_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeD(_player.getClassId().getId()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 7ab055a3d8..f58c0573a8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExEnchantSkillInfo implements IClientOutgoingPacket { private final Set _routes; - private final int _skillId; private final int _skillLevel; private final int _skillSubLevel; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 41368a8efb..e4ee350e64 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -50,7 +50,6 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_INFO_DETAIL.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java index 5cedcd6284..1d32f0d725 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java @@ -43,7 +43,6 @@ public class ExEnchantSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_LIST.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skills.size()); for (Skill skill : _skills) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java index 6ab5e869f2..853d74039f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java @@ -38,7 +38,6 @@ public class ExEnchantSkillResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_RESULT.writeId(packet); - packet.writeD(_enchanted ? 1 : 0); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java index 7b7d2d008d..410bf16510 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java @@ -42,7 +42,6 @@ public class ExEventMatchMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_EVENT_MATCH_MESSAGE.writeId(packet); - packet.writeC(_type); packet.writeS(_message); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java index 7264e90233..1946758bf5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java @@ -37,11 +37,9 @@ public class ExGetBookMarkInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOOK_MARK_INFO.writeId(packet); - - packet.writeD(0x00); // Dummy + packet.writeD(0); // Dummy packet.writeD(_player.getBookMarkSlot()); packet.writeD(_player.getTeleportBookmarks().size()); - for (TeleportBookmark tpbm : _player.getTeleportBookmarks()) { packet.writeD(tpbm.getId()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java index 36e7bb81af..201e8eb49b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java @@ -42,15 +42,14 @@ public class ExGetBossRecord implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOSS_RECORD.writeId(packet); - packet.writeD(_ranking); packet.writeD(_totalPoints); if (_bossRecordInfo == null) { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } else { @@ -59,7 +58,7 @@ public class ExGetBossRecord implements IClientOutgoingPacket { packet.writeD(entry.getKey()); packet.writeD(entry.getValue()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? } } return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java index ea0a5f8b18..85ccad0758 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java @@ -41,7 +41,6 @@ public class ExGetOffAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_OFF_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java index f8e16a4191..9a02e49223 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java @@ -39,7 +39,6 @@ public class ExGetOnAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_ON_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java index 51197344a5..704b3212a1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExGetPremiumItemList implements IClientOutgoingPacket { private final Player _player; - private final Map _map; public ExGetPremiumItemList(Player player) @@ -43,7 +42,6 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_PREMIUM_ITEM_LIST.writeId(packet); - packet.writeD(_map.size()); for (Entry entry : _map.entrySet()) { @@ -51,7 +49,7 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket packet.writeQ(entry.getKey()); packet.writeD(item.getItemId()); packet.writeQ(item.getCount()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeS(item.getSender()); } return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index a005fa8ad8..0200bdee08 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -40,7 +40,6 @@ public class ExHeroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HERO_LIST.writeId(packet); - packet.writeD(_heroList.size()); for (StatSet hero : _heroList.values()) { @@ -51,7 +50,7 @@ public class ExHeroList implements IClientOutgoingPacket packet.writeS(hero.getString(Hero.ALLY_NAME, "")); packet.writeD(hero.getInt(Hero.ALLY_CREST, 0)); packet.writeD(hero.getInt(Hero.COUNT)); - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index d5b5430142..0baca7cd86 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -48,8 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); - - packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade + packet.writeC(_hide ? 0 : 1); // Grand Crusade packet.writeD(_currentTemplateId); packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java index 81db66b88f..323c0cdf1e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java @@ -35,7 +35,6 @@ public class ExIsCharNameCreatable implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_IS_CHAR_NAME_CREATABLE.writeId(packet); - packet.writeD(_allowed); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java index ecc751eab3..45def9e0be 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java @@ -38,7 +38,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { throw new NullPointerException(); } - if (currentAuction.getAuctionState() != ItemAuctionState.STARTED) { _timeRemaining = 0; @@ -47,7 +46,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { _timeRemaining = (int) (currentAuction.getFinishingTimeRemaining() / 1000); // in seconds } - _refresh = refresh; _currentAuction = currentAuction; _nextAuction = nextAuction; @@ -57,16 +55,12 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_AUCTION_INFO.writeId(packet); - - packet.writeC(_refresh ? 0x00 : 0x01); + packet.writeC(_refresh ? 0 : 1); packet.writeD(_currentAuction.getInstanceId()); - final ItemAuctionBid highestBid = _currentAuction.getHighestBid(); packet.writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid()); - packet.writeD(_timeRemaining); writeItem(packet, _currentAuction.getItemInfo()); - if (_nextAuction != null) { packet.writeQ(_nextAuction.getAuctionInitBid()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java index 53ad8abd58..1c5e38cbab 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListMpccWaiting implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _rooms = new LinkedList<>(); @@ -53,7 +54,6 @@ public class ExListMpccWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_MPCC_WAITING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 78f2fec636..eafea24fa6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _players = new LinkedList<>(); @@ -60,7 +61,6 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(packet); - packet.writeD(_size); packet.writeD(_players.size()); for (Player player : _players) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java index 786c616875..c8723a9fc0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java @@ -46,7 +46,6 @@ public class ExMPCCPartyInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCPARTY_INFO_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_LeaderOID); packet.writeD(_memberCount); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java index 4bf07f0133..08259e4e6c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java @@ -37,7 +37,6 @@ public class ExMPCCPartymasterList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_PARTYMASTER_LIST.writeId(packet); - packet.writeD(_leadersName.size()); _leadersName.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java index abbdc8fe76..f021ef5f1f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java @@ -36,7 +36,6 @@ public class ExMPCCRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java index 154e156270..2eec590cb4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java @@ -41,7 +41,6 @@ public class ExMPCCRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java index 06e3027bfc..a0e9d0a4b0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java @@ -37,7 +37,6 @@ public class ExMPCCShowPartyMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCSHOW_PARTY_MEMBER_INFO.writeId(packet); - packet.writeD(_party.getMemberCount()); for (Player pc : _party.getMembers()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java index e454a746f3..771b2f22cb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java @@ -49,7 +49,6 @@ public class ExMagicAttackInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAGIC_ATTACK_INFO.writeId(packet); - packet.writeD(_caster); packet.writeD(_target); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java index 9cfbeb5aee..1aaa5b6520 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java @@ -35,7 +35,6 @@ public class ExMailArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAIL_ARRIVED.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java index 983ff22b92..48156c0600 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java @@ -44,7 +44,6 @@ public class ExManageMpccRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MANAGE_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java index f710c006e8..9d7d14211e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java @@ -45,7 +45,6 @@ public class ExMoveToLocationAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_objId); packet.writeD(_tx); packet.writeD(_ty); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java index 3e3bdc9fed..87e44b51cd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java @@ -43,7 +43,6 @@ public class ExMoveToLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java index 7ab0d1c7da..3c1902892a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java @@ -40,11 +40,9 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet); - packet.writeS(_channel.getLeader().getName()); - packet.writeD(0x00); // Channel loot 0 or 1 + packet.writeD(0); // Channel loot 0 or 1 packet.writeD(_channel.getMemberCount()); - packet.writeD(_channel.getParties().size()); for (Party p : _channel.getParties()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java index 1536bd5f9b..f2a32bb6e8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java @@ -43,7 +43,6 @@ public class ExNeedToChangeName implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEED_TO_CHANGE_NAME.writeId(packet); - packet.writeD(_type); packet.writeD(_subType); packet.writeS(_name); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java index be9bec8559..d18b4606b3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java @@ -35,7 +35,6 @@ public class ExNevitAdventEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CHANNELING_EFFECT.writeId(packet); - packet.writeD(_timeLeft); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java index 3a0367c178..09f6250f51 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java @@ -35,7 +35,6 @@ public class ExNevitAdventPointInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_AGATHION_ENERGY_INFO.writeId(packet); - packet.writeD(_points); // 72 = 1%, max 7200 = 100% return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java index 88fdaae499..ef220d86de 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java @@ -37,9 +37,8 @@ public class ExNevitAdventTimeChange implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - // state 0 - pause 1 - started - packet.writeC(_paused ? 0x00 : 0x01); + packet.writeC(_paused ? 0 : 1); // left time in ms max is 16000 its 4m and state is automatically changed to quit packet.writeD(_time); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java index fccdf510cc..4025bf78fa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java @@ -34,7 +34,6 @@ public class ExNewSkillToLearnByLevelUp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEW_SKILL_TO_LEARN_BY_LEVEL_UP.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java index 324c18a517..f2ce8614dc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java @@ -43,8 +43,7 @@ public class ExNoticePostArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTICE_POST_ARRIVED.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java index afe3719d9b..050c7ccea5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java @@ -43,8 +43,7 @@ public class ExNoticePostSent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_WRITE_POST.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java index 5d98c20b09..e0bd08d39a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java @@ -30,7 +30,6 @@ public class ExNotifyPremiumItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_PREMIUM_ITEM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java index 6cb3724448..ba3c0cfeaa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java @@ -34,7 +34,6 @@ public class ExOlympiadMatchEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MATCH_END.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java index 264d5aa484..7ffd5ed3bd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java @@ -55,19 +55,15 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x00); // Type 0 = Match List, 1 = Match Result - + packet.writeD(0); // Type 0 = Match List, 1 = Match Result packet.writeD(_games.size()); - packet.writeD(0x00); - + packet.writeD(0); for (OlympiadGameTask curGame : _games) { final AbstractOlympiadGame game = curGame.getGame(); if (game != null) { packet.writeD(game.getStadiumId()); // Stadium Id (Arena 1 = 0) - if (game instanceof OlympiadGameNonClassed) { packet.writeD(1); @@ -80,8 +76,7 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket { packet.writeD(0); } - - packet.writeD(curGame.isRunning() ? 0x02 : 0x01); // (1 = Standby, 2 = Playing) + packet.writeD(curGame.isRunning() ? 2 : 1); // (1 = Standby, 2 = Playing) packet.writeS(game.getPlayerNames()[0]); // Player 1 Name packet.writeS(game.getPlayerNames()[1]); // Player 2 Name } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java index 712651603d..b387271fba 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java @@ -53,9 +53,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x01); // Type 0 = Match List, 1 = Match Result - + packet.writeD(1); // Type 0 = Match List, 1 = Match Result packet.writeD(_tie ? 1 : 0); // 0 - win, 1 - tie packet.writeS(_winnerList.get(0).getName()); packet.writeD(_winTeam); @@ -69,9 +67,8 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } - packet.writeD(_loseTeam); packet.writeD(_loserList.size()); for (OlympiadInfo info : _loserList) @@ -83,7 +80,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java index 34d81d1f53..712b9e06c6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java @@ -38,7 +38,6 @@ public class ExOlympiadMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MODE.writeId(packet); - packet.writeC(_mode); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java index ebea6c56f3..5b4f2c2523 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java @@ -53,7 +53,6 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_SPELLED_INFO.writeId(packet); - packet.writeD(_playerId); packet.writeD(_effects.size() + _effects2.size()); for (BuffInfo info : _effects) @@ -62,7 +61,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(info.getSkill().getDisplayId()); packet.writeH(info.getSkill().getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(info.getSkill().getAbnormalType().getClientId()); writeOptionalD(packet, info.getSkill().isAura() ? -1 : info.getTime()); } @@ -73,7 +72,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(skill.getDisplayId()); packet.writeH(skill.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(skill.getAbnormalType().getClientId()); packet.writeH(-1); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java index 18c34fe9de..ca473edfcf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java @@ -76,7 +76,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_USER_INFO.writeId(packet); - if (_player != null) { packet.writeC(_player.getOlympiadSide()); @@ -91,7 +90,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket packet.writeS(_par.getName()); packet.writeD(_par.getBaseClass()); } - packet.writeD(_curHp); packet.writeD(_maxHp); packet.writeD(_curCp); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java index e84d0251bd..7ec64cc8c3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java @@ -35,7 +35,6 @@ public class ExOpenMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OPEN_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java index 90349cc1a2..5661dc9f57 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java @@ -56,7 +56,6 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PCCAFE_POINT_INFO.writeId(packet); - packet.writeD(_points); // num points packet.writeD(_mAddPoint); // points inc display packet.writeC(_mPeriodType); // period(0=don't show window,1=acquisition,2=use points) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java index f7e8b4a99a..248a2f7d98 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_ADD.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java index 832bee0012..1f452f4bae 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_DELETE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_summon.getSummonType()); packet.writeD(_summon.getOwner().getObjectId()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java index 0646a67001..703694fa2f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_UPDATE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 0e3edb3ea7..e4c6b79ae0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -47,7 +47,6 @@ public class ExPartyRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2bffdec368..2ebf1dc7f0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -43,10 +43,8 @@ public class ExPetInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class ExPetInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class ExPetInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,9 +154,8 @@ public class ExPetInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -227,28 +205,24 @@ public class ExPetInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PET_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -267,7 +241,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -283,19 +257,19 @@ public class ExPetInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -307,20 +281,20 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -344,12 +318,12 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -379,12 +353,10 @@ public class ExPetInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java index 082f4c7662..0f72c05a3a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java @@ -34,7 +34,6 @@ public class ExPlayScene implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLAY_SCENE.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java index e98d317e14..7e3803bdaa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java @@ -36,7 +36,6 @@ public class ExPledgeCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_COUNT.writeId(packet); - packet.writeD(_count); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java index 838029e284..4084de3481 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java @@ -38,7 +38,6 @@ public class ExPledgeDraftListSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_DRAFT_LIST_SEARCH.writeId(packet); - packet.writeD(_pledgeRecruitList.size()); for (PledgeWaitingInfo prl : _pledgeRecruitList) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java index fb956e9996..44e34004ea 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java @@ -25,11 +25,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExPledgeEmblem implements IClientOutgoingPacket { + private static final int TOTAL_SIZE = 65664; + private final int _crestId; private final int _clanId; private final byte[] _data; private final int _chunkId; - private static final int TOTAL_SIZE = 65664; public ExPledgeEmblem(int crestId, byte[] chunkedData, int clanId, int chunkId) { @@ -43,7 +44,6 @@ public class ExPledgeEmblem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clanId); packet.writeD(_crestId); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java index ed19bf976b..b32f8c0645 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitApplyInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_APPLY_INFO.writeId(packet); - packet.writeD(_status.ordinal()); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java index fc98b7b6f7..af4af9c9c1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitBoardDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_DETAIL.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClanId()); packet.writeD(_pledgeRecruitInfo.getKarma()); packet.writeS(_pledgeRecruitInfo.getInformation()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index b4d48373a6..eda808e754 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -34,7 +34,6 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket private final int _clanOnCurrentPage; private final int _startIndex; private final int _endIndex; - static final int CLAN_PER_PAGE = 12; public ExPledgeRecruitBoardSearch(List clanList, int currentPage) @@ -51,11 +50,9 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_SEARCH.writeId(packet); - packet.writeD(_currentPage); packet.writeD(_totalNumberOfPage); packet.writeD(_clanOnCurrentPage); - for (int i = _startIndex; i < _endIndex; i++) { packet.writeD(_clanList.get(i).getClanId()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 4ae5ffe316..b1f139226d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -40,7 +40,6 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java index 77080a3820..5844f220ec 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java @@ -39,7 +39,6 @@ public class ExPledgeWaitingList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST.writeId(packet); - packet.writeD(pledgePlayerRecruitInfos.size()); for (PledgeApplicantInfo recruitInfo : pledgePlayerRecruitInfos.values()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java index a9245c1309..6b88572057 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java @@ -30,7 +30,6 @@ public class ExPledgeWaitingListAlarm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_ALARM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java index 60997b3da0..28c3967119 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java @@ -40,7 +40,6 @@ public class ExPledgeWaitingListApplied implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_APPLIED.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClan().getId()); packet.writeS(_pledgeRecruitInfo.getClan().getName()); packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java index 66a06892c2..1f53d1bb38 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java @@ -36,7 +36,6 @@ public class ExPledgeWaitingUser implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_USER.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getPlayerId()); packet.writeS(_pledgeRecruitInfo.getMessage()); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java index 49bc9b0995..5f404779f5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java @@ -43,7 +43,6 @@ public class ExPrivateStoreSetWholeMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_objectId); packet.writeS(_msg); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java index cb5e8fbce9..ff996b5d0c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutCommissionResultForVariationMake implements IClientOutgoingPac public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_COMMISSION_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_gemstoneObjId); packet.writeD(_itemId); packet.writeQ(_gemstoneCount); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java index 81721e921f..098472b7ae 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantScrollItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SCROLL_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java index 871f377db2..ffea182a49 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java index c47a4bcff4..8016e128f4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java index c8b46be499..95c0c0e4e1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_INTENSIVE_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_refinerItemObjId); packet.writeD(_lifestoneItemId); packet.writeD(_gemstoneItemId); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 2128b2b19f..2970ca00a2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -41,13 +41,12 @@ public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_CANCEL.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); packet.writeD(_itemAug1); packet.writeD(_itemAug2); packet.writeQ(_price); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java index 80541e65cd..c25dd16b01 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java @@ -34,10 +34,9 @@ public class ExPutItemResultForVariationMake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java index fe5eb74eb0..bc8896164d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java @@ -56,13 +56,12 @@ public class ExQuestNpcLogList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_NPC_LOG_LIST.writeId(packet); - packet.writeD(_questId); packet.writeC(_npcLogList.size()); for (NpcLogListHolder holder : _npcLogList) { packet.writeD(holder.isNpcString() ? holder.getId() : holder.getId() + 1000000); - packet.writeC(holder.isNpcString() ? 0x01 : 0x00); + packet.writeC(holder.isNpcString() ? 1 : 0); packet.writeD(holder.getCount()); } return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java index 62d622caff..60616b256d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java @@ -35,7 +35,6 @@ public class ExRedSky implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RED_SKY.writeId(packet); - packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java index ce40b1a792..163faff855 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java @@ -36,7 +36,6 @@ public class ExRegenMax implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REGEN_MAX.writeId(packet); - packet.writeD(1); packet.writeD(_time); packet.writeD(_tickInterval); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java index d864795cd6..a17525576b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java @@ -34,7 +34,6 @@ public class ExRemoveEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REMOVE_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 57ed88ac29..4e479e75a6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -56,7 +56,6 @@ public class ExReplyReceivedPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_RECEIVED_POST.writeId(packet); - packet.writeD(_msg.getMailType().ordinal()); // GOD if (_msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED) { @@ -76,11 +75,10 @@ public class ExReplyReceivedPost extends AbstractItemPacket } packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown packet.writeS(_msg.getSenderName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -92,9 +90,8 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeQ(_msg.getReqAdena()); packet.writeD(_msg.hasAttachments() ? 1 : 0); packet.writeD(_msg.isReturned() ? 1 : 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 75f6596194..ed490eae91 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -54,14 +54,12 @@ public class ExReplySentPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_SENT_POST.writeId(packet); - - packet.writeD(0x00); // GOD + packet.writeD(0); // GOD packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); packet.writeS(_msg.getReceiverName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -73,11 +71,11 @@ public class ExReplySentPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeQ(_msg.getReqAdena()); - packet.writeD(_msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(_msg.isReturned() ? 0x01 : 00); + packet.writeD(_msg.hasAttachments() ? 1 : 0); + packet.writeD(_msg.isReturned() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index cc4f7ce1d8..e6a3f9bca2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -35,7 +35,6 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java index 2634aa1cdd..60201b177f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java @@ -35,7 +35,6 @@ public class ExRequestHackShield implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REQUEST_HACK_SHIELD.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java index c51ff31d0b..75e3b3a945 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java @@ -29,13 +29,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyList implements IClientOutgoingPacket { + public static final int SHOW_FACESHAPE = 1; + public static final int SHOW_HAIRSTYLE = 0; + private final Player _player; private final int _type; private final Map _beautyItem; - public static final int SHOW_FACESHAPE = 1; - public static final int SHOW_HAIRSTYLE = 0; - public ExResponseBeautyList(Player player, int type) { _player = player; @@ -54,7 +54,6 @@ public class ExResponseBeautyList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java index ca2ed360ab..4b19201833 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java @@ -25,16 +25,15 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket { + public static final int FAILURE = 0; + public static final int SUCCESS = 1; + public static final int CHANGE = 0; + public static final int RESTORE = 1; + private final Player _player; private final int _type; private final int _result; - public static final int FAILURE = 0; - public static final int SUCCESS = 1; - - public static final int CHANGE = 0; - public static final int RESTORE = 1; - public ExResponseBeautyRegistReset(Player player, int type, int result) { _player = player; @@ -46,7 +45,6 @@ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_REGIST_RESET.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java index 0e313ef3b7..c0922cfb04 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java @@ -36,10 +36,8 @@ public class ExResponseResetList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_RESET_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); - packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java index 01fe1945ef..a230033d67 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java @@ -37,7 +37,6 @@ public class ExRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ROTATION.writeId(packet); - packet.writeD(_charId); packet.writeD(_heading); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index c58ccfc233..2646a71e77 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -36,7 +36,6 @@ public class ExRpItemLink extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RP_ITEM_LINK.writeId(packet); - writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java index 04556bbed2..f0c6eba8e9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java @@ -34,7 +34,6 @@ public class ExSearchOrc implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEARCH_ORC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index 1e06cc2a3f..7a4dced122 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -38,7 +38,6 @@ public class ExSendManorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_MANOR_LIST.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java index b63c69f37e..2c25cc8bfc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java @@ -124,7 +124,6 @@ public class ExSendUIEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_UIEVENT.writeId(packet); - packet.writeD(_objectId); packet.writeD(_type); // 0 = show, 1 = hide (there is 2 = pause and 3 = resume also but they don't work well you can only pause count down and you cannot resume it because resume hides the counter). packet.writeD(0); // unknown diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java index 4378479707..716a3e8623 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java @@ -385,16 +385,13 @@ public class ExServerPrimitive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SERVER_PRIMITIVE.writeId(packet); - packet.writeS(_name); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(65535); // has to do something with display range and angle packet.writeD(65535); // has to do something with display range and angle - packet.writeD(_points.size() + _lines.size()); - for (Point point : _points) { packet.writeC(1); // Its the type in this case Point @@ -408,7 +405,6 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(point.getY()); packet.writeD(point.getZ()); } - for (Line line : _lines) { packet.writeC(2); // Its the type in this case Line diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java index fb32e199b2..51fb91b643 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java @@ -46,7 +46,6 @@ public class ExSetCompassZoneCode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_COMPASS_ZONE_CODE.writeId(packet); - packet.writeD(_zoneType); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java index 1d0fbae3a4..34dee8bda0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java @@ -38,7 +38,6 @@ public class ExSetPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_PARTY_LOOTING.writeId(packet); - packet.writeD(_result); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java index 7b14ec8412..4e491af9d1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java @@ -34,7 +34,6 @@ public class ExShowAdventurerGuideBook implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_ADVENTURER_GUIDE_BOOK.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index 82554fdc5f..1f8df76083 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -39,7 +39,6 @@ public class ExShowAgitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AGIT_INFO.writeId(packet); - final Collection clanHalls = ClanHallData.getInstance().getClanHalls(); packet.writeD(clanHalls.size()); clanHalls.forEach(clanHall -> diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index dd11ee0150..51e6646ff5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -44,7 +44,6 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BASE_ATTRIBUTE_CANCEL_WINDOW.writeId(packet); - packet.writeD(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java index 14e55d39f3..e22345c4fd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java @@ -25,13 +25,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExShowBeautyMenu implements IClientOutgoingPacket { - private final Player _player; - private final int _type; - // TODO: Enum public static final int MODIFY_APPEARANCE = 0; public static final int RESTORE_APPEARANCE = 1; + private final Player _player; + private final int _type; + public ExShowBeautyMenu(Player player, int type) { _player = player; @@ -42,7 +42,6 @@ public class ExShowBeautyMenu implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BEAUTY_MENU.writeId(packet); - packet.writeD(_type); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 15d011befc..b0d2b90494 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -41,7 +41,6 @@ public class ExShowCastleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CASTLE_INFO.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) @@ -65,8 +64,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } packet.writeD(castle.getTaxPercent(TaxType.BUY)); packet.writeD((int) (castle.getSiege().getSiegeDate().getTimeInMillis() / 1000)); - - packet.writeC(castle.getSiege().isInProgress() ? 0x01 : 0x00); // Grand Crusade + packet.writeC(castle.getSiege().isInProgress() ? 1 : 0); // Grand Crusade packet.writeC(castle.getSide().ordinal()); // Grand Crusade } return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java index aeb4079f3a..f9a6ebe0e7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java @@ -38,7 +38,6 @@ public class ExShowContactList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_SHOW_POST_FRIEND.writeId(packet); - packet.writeD(_contacts.size()); _contacts.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index a079ea3129..94b989b583 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -37,7 +37,6 @@ public class ExShowCropInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _crops = (nextPeriod && !manor.isManorApproved()) ? null : manor.getCropProcure(manorId, nextPeriod); } @@ -46,10 +45,9 @@ public class ExShowCropInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Crop Sales" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Crop Sales" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); + packet.writeD(0); if (_crops != null) { packet.writeD(_crops.size()); @@ -64,17 +62,17 @@ public class ExShowCropInfo implements IClientOutgoingPacket if (seed == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(seed.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(seed.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(seed.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index ebffd775d8..1f01ee7b87 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -62,10 +62,8 @@ public class ExShowCropSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getCropId()); // crop id diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index ee9fa9fd37..b625a1e4e7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -39,7 +39,6 @@ public class ExShowFortressInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_INFO.writeId(packet); - final Collection forts = FortManager.getInstance().getForts(); packet.writeD(forts.size()); for (Fort fort : forts) @@ -47,7 +46,7 @@ public class ExShowFortressInfo implements IClientOutgoingPacket final Clan clan = fort.getOwnerClan(); packet.writeD(fort.getResidenceId()); packet.writeS(clan != null ? clan.getName() : ""); - packet.writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00); + packet.writeD(fort.getSiege().isInProgress() ? 1 : 0); // Time of possession packet.writeD(fort.getOwnedTime()); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index f389b26ed5..678ab43e96 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -42,11 +42,9 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_MAP_INFO.writeId(packet); - packet.writeD(_fortress.getResidenceId()); packet.writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status packet.writeD(_fortress.getFortSize()); // barracks count - final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId()); if ((commanders != null) && !commanders.isEmpty() && _fortress.getSiege().isInProgress()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 27da99cf41..da186103ae 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -51,7 +51,6 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_SIEGE_INFO.writeId(packet); - packet.writeD(_fortId); // Fortress Id packet.writeD(_size); // Total Barracks Count if (_csize > 0) @@ -64,22 +63,22 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { case 0: { - packet.writeD(0x03); + packet.writeD(3); break; } case 1: { - packet.writeD(0x02); + packet.writeD(2); break; } case 2: { - packet.writeD(0x01); + packet.writeD(1); break; } case 3: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -92,27 +91,27 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket // TODO: once control room supported, update packet.writeD(0x0x) to support 5th room case 0: { - packet.writeD(0x05); + packet.writeD(5); break; } case 1: { - packet.writeD(0x04); + packet.writeD(4); break; } case 2: { - packet.writeD(0x03); + packet.writeD(3); break; } case 3: { - packet.writeD(0x02); + packet.writeD(2); break; } case 4: { - packet.writeD(0x01); + packet.writeD(1); break; } } @@ -124,7 +123,7 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { for (int i = 0; i < _size; i++) { - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java index f7aca7dffd..912839e242 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java @@ -41,8 +41,7 @@ public class ExShowManorDefaultInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_MANOR_DEFAULT_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" and "Crop Sales" buttons + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" and "Crop Sales" buttons packet.writeD(_crops.size()); for (Seed crop : _crops) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 1d3312d668..d03ce2a5fd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -52,10 +52,8 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet); - packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java index cf38d18c1c..f41999329f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java @@ -34,7 +34,6 @@ public class ExShowQuestInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_INFO.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java index 70f31e318f..0fa64c401d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java @@ -37,7 +37,6 @@ public class ExShowQuestMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_MARK.writeId(packet); - packet.writeD(_questId); packet.writeD(_questState); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index ab85228caf..1a6ee00a10 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ExShowReceivedPostList implements IClientOutgoingPacket { - private final List _inbox; - private static final int MESSAGE_FEE = 100; private static final int MESSAGE_FEE_PER_SLOT = 1000; + private final List _inbox; + public ExShowReceivedPostList(int objectId) { _inbox = MailManager.getInstance().getInbox(objectId); @@ -45,7 +45,6 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { @@ -64,18 +63,18 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getSenderName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); + packet.writeD(msg.isUnread() ? 1 : 0); packet.writeD(((msg.getMailType() == MailType.COMMISSION_ITEM_SOLD) || (msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED)) ? 0 : 1); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(msg.isReturned() ? 0x01 : 0x00); - packet.writeD(0x00); // SysString in some case it seems + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(msg.isReturned() ? 1 : 0); + packet.writeD(0); // SysString in some case it seems } } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(MESSAGE_FEE); packet.writeD(MESSAGE_FEE_PER_SLOT); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java index 9679468789..deebb99c8f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java @@ -33,6 +33,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; */ public class ExShowScreenMessage implements IClientOutgoingPacket { + // Positions + public static final byte TOP_LEFT = 1; + public static final byte TOP_CENTER = 2; + public static final byte TOP_RIGHT = 3; + public static final byte MIDDLE_LEFT = 4; + public static final byte MIDDLE_CENTER = 5; + public static final byte MIDDLE_RIGHT = 6; + public static final byte BOTTOM_CENTER = 7; + public static final byte BOTTOM_RIGHT = 8; + private final int _type; private final int _sysMessageId; private final int _unk1; @@ -48,15 +58,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket private List _parameters; // Localisation related. private String _lang; - // Positions - public static final byte TOP_LEFT = 0x01; - public static final byte TOP_CENTER = 0x02; - public static final byte TOP_RIGHT = 0x03; - public static final byte MIDDLE_LEFT = 0x04; - public static final byte MIDDLE_CENTER = 0x05; - public static final byte MIDDLE_RIGHT = 0x06; - public static final byte BOTTOM_CENTER = 0x07; - public static final byte BOTTOM_RIGHT = 0x08; public void setLang(String lang) { @@ -265,7 +266,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SCREEN_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -284,9 +284,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(sml.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -308,9 +308,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -318,7 +318,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket } } } - packet.writeD(_type); packet.writeD(_sysMessageId); packet.writeD(_position); @@ -326,9 +325,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java index 29ab5d355f..6123b08991 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java @@ -37,7 +37,6 @@ public class ExShowSeedInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _seeds = (nextPeriod && !manor.isManorApproved()) ? null : manor.getSeedProduction(manorId, nextPeriod); } @@ -46,16 +45,14 @@ public class ExShowSeedInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown if (_seeds == null) { packet.writeD(0); return true; } - packet.writeD(_seeds.size()); for (SeedProduction seed : _seeds) { @@ -67,17 +64,17 @@ public class ExShowSeedInfo implements IClientOutgoingPacket if (s == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(s.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(s.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(s.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java index e628099700..eb6e686e10 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java @@ -32,13 +32,10 @@ public class ExShowSeedMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_MAP_INFO.writeId(packet); - packet.writeD(2); // seed count - // Seed of Destruction packet.writeD(1); // id 1? Grand Crusade packet.writeD(2770 + GraciaSeedsManager.getInstance().getSoDState()); // sys msg id - // Seed of Infinity packet.writeD(2); // id 2? Grand Crusade // Manager not implemented yet diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index 4fd891a466..373c314eba 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -62,10 +62,8 @@ public class ExShowSeedSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getSeedId()); // seed id diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 1994402da2..269bec5b97 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -47,7 +47,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _cropsItems.put(cropId, item); } } - for (CropProcure crop : CastleManorManager.getInstance().getCropProcure(_manorId, false)) { if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) @@ -61,7 +60,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_cropsItems.size()); // size for (Item item : _cropsItems.values()) @@ -70,9 +68,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket packet.writeD(item.getObjectId()); // Object id packet.writeD(item.getId()); // crop id packet.writeD(seed.getLevel()); // seed level - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(1)); // reward 1 id - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(2)); // reward 2 id if (_castleCrops.containsKey(item.getId())) { @@ -85,9 +83,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket else { packet.writeD(0xFFFFFFFF); // manor - packet.writeQ(0x00); // buy residual - packet.writeQ(0x00); // buy price - packet.writeC(0x00); // reward + packet.writeQ(0); // buy residual + packet.writeQ(0); // buy price + packet.writeC(0); // reward } packet.writeQ(item.getCount()); // my crops } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index db4bccc928..b61d5b2301 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -40,7 +40,6 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { @@ -50,17 +49,17 @@ public class ExShowSentPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getReceiverName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); - packet.writeD(0x01); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(msg.isUnread() ? 1 : 0); + packet.writeD(1); + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(0); } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java index 0e4e9fd2ef..0dca57f2f8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java @@ -48,7 +48,6 @@ public class ExShowTerritory implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TERRITORY.writeId(packet); - packet.writeD(_vertices.size()); packet.writeD(_minZ); packet.writeD(_maxZ); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java index 4e284f82c5..86e1009bbf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java @@ -46,7 +46,6 @@ public class ExShowTrace implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TRACE.writeId(packet); - packet.writeH(0); // type broken in H5 packet.writeD(0); // time broken in H5 packet.writeH(_locations.size()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java index 3245767ed7..836a5c9624 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java @@ -44,7 +44,6 @@ public class ExShowUsm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_USM.writeId(packet); - packet.writeD(_videoId); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java index 4acdffa842..1f1a14c31b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java @@ -34,7 +34,6 @@ public class ExShowVariationCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_CANCEL_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java index 3a2298019e..9870424e26 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java @@ -35,7 +35,6 @@ public class ExShowVariationMakeWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_MAKE_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java index 169827bab3..86211c8d97 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java @@ -44,10 +44,9 @@ public class ExSpawnEmitter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SPAWN_EMITTER.writeId(packet); - packet.writeD(_npcObjectId); packet.writeD(_playerObjectId); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java index 620800c1c4..534549b4fe 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java @@ -36,7 +36,6 @@ public class ExStartScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_START_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java index 0bd990cf34..babac59129 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java index 0e2689d598..d3e67afe99 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipObjId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java index 44b064113f..f5b3e1340f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java @@ -36,7 +36,6 @@ public class ExStopScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index 0b1e077353..7c8def3864 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -66,7 +66,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket } OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet); - packet.writeD(_inventory); packet.writeD(_warehouse); packet.writeD(_freight); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java index 3293a5b557..57563ca2f9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java @@ -39,7 +39,6 @@ public class ExSubPledgeSkillAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUB_PLEDGET_SKILL_ADD.writeId(packet); - packet.writeD(_type); packet.writeD(_skillId); packet.writeD(_skillLevel); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java index d61dfa20ab..816d6f16a6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java @@ -97,7 +97,6 @@ public class ExSubjobInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUBJOB_INFO.writeId(packet); - packet.writeC(_type); packet.writeD(_currClassId); packet.writeD(_currRace); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java index 85616016c7..b7a152629d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java @@ -38,7 +38,6 @@ public class ExTacticalSign implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TACTICAL_SIGN.writeId(packet); - packet.writeD(_target.getObjectId()); packet.writeD(_tokenId); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java index 3486e6281d..9e03a8bd0a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java @@ -39,7 +39,6 @@ public class ExTeleportToLocationActivate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_TO_LOCATION_ACTIVATE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java index a214c53a0f..7bcddd964d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java @@ -27,6 +27,7 @@ public class ExUISetting implements IClientOutgoingPacket { public static final String UI_KEY_MAPPING_VAR = "UI_KEY_MAPPING"; public static final String SPLIT_VAR = " "; + private final byte[] _uiKeyMapping; public ExUISetting(Player player) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java index 187770cfc8..eff4285a8b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java @@ -37,7 +37,6 @@ public class ExUnReadMailCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_UN_READ_MAIL_COUNT.writeId(packet); - packet.writeD(_mailUnreadCount); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java index f992b3c937..e59c651371 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java @@ -41,7 +41,6 @@ public class ExUseSharedGroupItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USE_SHARED_GROUP_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeD(_grpId); packet.writeD(_remainingTime); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java index 474fcc5208..f49d451587 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class ExUserInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getTransformationId()); - final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); final boolean isInvisible = _player.isInvisible(); packet.writeD(abnormalVisualEffects.size() + (isInvisible ? 1 : 0)); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java index b841449ab3..1069a64e3e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java @@ -36,12 +36,9 @@ public class ExUserInfoCubic implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_CUBIC.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(_player.getCubics().size()); - _player.getCubics().keySet().forEach(packet::writeH); - packet.writeD(_player.getAgathionId()); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java index 048986d108..7a0d1bfd74 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java @@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExUserInfoEquipSlot extends AbstractMaskPacket { private final Player _player; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -63,11 +62,9 @@ public class ExUserInfoEquipSlot extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_EQUIP_SLOT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(InventorySlot.values().length); packet.writeB(_masks); - final PlayerInventory inventory = _player.getInventory(); for (InventorySlot slot : InventorySlot.values()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java index 3eb1cf9578..d655e48843 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java @@ -36,7 +36,6 @@ public class ExUserInfoInvenWeight implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_INVEN_WEIGHT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java index 91e0e92338..16aa81e9c0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java @@ -44,7 +44,6 @@ public class ExValidateLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java index 727267c9d5..50cb4025e4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java @@ -35,7 +35,6 @@ public class ExVariationCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_CANCEL_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java index 5cdc1b8d0e..4fde190ae2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java @@ -32,14 +32,13 @@ public class ExVariationResult implements IClientOutgoingPacket { _option1 = option1; _option2 = option2; - _success = success ? 0x01 : 0x00; + _success = success ? 1 : 0; } @Override public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_RESULT.writeId(packet); - packet.writeD(_option1); packet.writeD(_option2); packet.writeD(_success); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java index db0acfd5ff..60fb57c0b3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java @@ -41,10 +41,9 @@ public class ExVitalityEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_EFFECT_INFO.writeId(packet); - packet.writeD(_points); packet.writeD(_vitalityBonus); // Vitality Bonus - packet.writeH(0x00); // Vitality additional bonus in % + packet.writeH(0); // Vitality additional bonus in % packet.writeH(_vitalityItemsRemaining); // How much vitality items remaining for use packet.writeH(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java index 3cd9d26602..9a401c2321 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java @@ -35,7 +35,6 @@ public class ExVitalityPointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_POINT_INFO.writeId(packet); - packet.writeD(_vitalityPoints); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java index 71baff96ea..c4c5539ca4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java @@ -45,7 +45,6 @@ public class ExVoteSystemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VOTE_SYSTEM_INFO.writeId(packet); - packet.writeD(_recomLeft); packet.writeD(_recomHave); packet.writeD(_bonusTime); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java index bc41adf7f2..8abcfc022e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java @@ -37,7 +37,6 @@ public class ExWorldChatCnt implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_WORLD_CHAT_CNT.writeId(packet); - packet.writeD(_points); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java index 5f935fe0dc..dc9c2288f8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java @@ -79,19 +79,17 @@ public class FakePlayerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // vehicleId + packet.writeD(0); // vehicleId packet.writeD(_objId); packet.writeS(_npc.getName()); - packet.writeH(_npc.getRace().ordinal()); - packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 0x01 : 0x00); + packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 1 : 0); packet.writeD(_fpcHolder.getClassId()); - - packet.writeD(0x00); // Inventory.PAPERDOLL_UNDER + packet.writeD(0); // Inventory.PAPERDOLL_UNDER packet.writeD(_fpcHolder.getEquipHead()); packet.writeD(_fpcHolder.getEquipRHand()); packet.writeD(_fpcHolder.getEquipLHand()); @@ -103,28 +101,22 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_fpcHolder.getEquipRHand()); // dual hand packet.writeD(_fpcHolder.getEquipHair()); packet.writeD(_fpcHolder.getEquipHair2()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderAugument()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } - packet.writeC(_fpcHolder.getArmorEnchantLevel()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderVisualId()) { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeC(_npc.getScriptValue()); // getPvpFlag() packet.writeD(_npc.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -135,16 +127,12 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_npc.getCollisionRadius()); packet.writeF(_npc.getCollisionHeight()); - packet.writeD(_fpcHolder.getHair()); packet.writeD(_fpcHolder.getHairColor()); packet.writeD(_fpcHolder.getFace()); - packet.writeS(_npc.getTemplate().getTitle()); - if (_clan != null) { packet.writeD(_clan.getId()); @@ -154,71 +142,51 @@ public class FakePlayerInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - - packet.writeC(0x01); // isSitting() ? 0x00 : 0x01 (at some initial tests it worked) - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); - packet.writeC(_npc.isInCombat() ? 0x01 : 0x00); - - packet.writeC(_npc.isAlikeDead() ? 0x01 : 0x00); - - packet.writeC(_npc.isInvisible() ? 0x01 : 0x00); - - packet.writeC(0x00); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount - packet.writeC(0x00); // getPrivateStoreType().getId() - - packet.writeH(0x00); // getCubics().size() + packet.writeC(1); // isSitting() ? 0 : 1 (at some initial tests it worked) + packet.writeC(_npc.isRunning() ? 1 : 0); + packet.writeC(_npc.isInCombat() ? 1 : 0); + packet.writeC(_npc.isAlikeDead() ? 1 : 0); + packet.writeC(_npc.isInvisible() ? 1 : 0); + packet.writeC(0); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount + packet.writeC(0); // getPrivateStoreType().getId() + packet.writeH(0); // getCubics().size() // getCubics().keySet().forEach(packet::writeH); - packet.writeC(0x00); - + packet.writeC(0); packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : 0); packet.writeH(_fpcHolder.getRecommends()); - packet.writeD(0x00); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 - + packet.writeD(0); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 packet.writeD(_fpcHolder.getClassId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(_fpcHolder.getWeaponEnchantLevel()); // isMounted() ? 0 : _enchantLevel - packet.writeC(_npc.getTeam().getId()); - - packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0x00); + packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0); packet.writeC(_fpcHolder.getNobleLevel()); - packet.writeC(_fpcHolder.isHero() ? 0x01 : 0x00); - - packet.writeC(_fpcHolder.isFishing() ? 0x01 : 0x00); - + packet.writeC(_fpcHolder.isHero() ? 1 : 0); + packet.writeC(_fpcHolder.isFishing() ? 1 : 0); packet.writeD(_fpcHolder.getBaitLocationX()); packet.writeD(_fpcHolder.getBaitLocationY()); packet.writeD(_fpcHolder.getBaitLocationZ()); - packet.writeD(_fpcHolder.getNameColor()); - packet.writeD(_heading); - packet.writeC(_fpcHolder.getPledgeStatus()); - packet.writeH(0x00); // getPledgeType() - + packet.writeH(0); // getPledgeType() packet.writeD(_fpcHolder.getTitleColor()); - - packet.writeC(0x00); // isCursedWeaponEquipped - - packet.writeD(0x00); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 - packet.writeD(0x00); // getTransformationDisplayId() + packet.writeC(0); // isCursedWeaponEquipped + packet.writeD(0); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 + packet.writeD(0); // getTransformationDisplayId() packet.writeD(_fpcHolder.getAgathionId()); - - packet.writeC(0x00); - - packet.writeD(0x00); // getCurrentCp() + packet.writeC(0); + packet.writeD(0); // getCurrentCp() packet.writeD(_npc.getMaxHp()); packet.writeD((int) Math.round(_npc.getCurrentHp())); packet.writeD(_npc.getMaxMp()); packet.writeD((int) Math.round(_npc.getCurrentMp())); - - packet.writeC(0x00); + packet.writeC(0); final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) @@ -229,9 +197,9 @@ public class FakePlayerInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(0x00); // cocPlayer.getPosition() - packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 0x01 : 0x00); - packet.writeC(0x00); // Used Ability Points + packet.writeC(0); // cocPlayer.getPosition() + packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 1 : 0); + packet.writeC(0); // Used Ability Points return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java index ae088538da..03223c8a3e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java @@ -62,7 +62,6 @@ public class FlyToLocation implements IClientOutgoingPacket _destY = destY; _destZ = destZ; _type = type; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -82,7 +81,6 @@ public class FlyToLocation implements IClientOutgoingPacket _flySpeed = flySpeed; _flyDelay = flyDelay; _animationSpeed = animationSpeed; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -103,7 +101,6 @@ public class FlyToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FLY_TO_LOCATION.writeId(packet); - packet.writeD(_chaObjId); packet.writeD(_destX); packet.writeD(_destY); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java index 1e52b0ef72..471d70f791 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java @@ -35,8 +35,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x01); + packet.writeC(1); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index ef1d37297e..2ee6ffbcd9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -50,25 +50,24 @@ public class GMHennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GMHENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON packet.writeH(_player.getHennaValue(BaseStat.MEN)); // equip MEN packet.writeH(_player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeH(_player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeH(0x00); // equip LUC - packet.writeH(0x00); // equip CHA + packet.writeH(0); // equip LUC + packet.writeH(0); // equip CHA packet.writeD(3); // Slots packet.writeD(_hennas.size()); // Size for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java index 38ca4c7be0..59bf0d9d93 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java @@ -38,7 +38,6 @@ public class GMHide implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_HIDE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index 5e6fadd313..0c7a4684a5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -50,7 +50,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -69,8 +68,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getINT()); packet.writeD(_player.getWIT()); packet.writeD(_player.getMEN()); - packet.writeD(0x00); // LUC - packet.writeD(0x00); // CHA + packet.writeD(0); // LUC + packet.writeD(0); // CHA packet.writeD(_player.getMaxHp()); packet.writeD((int) _player.getCurrentHp()); packet.writeD(_player.getMaxMp()); @@ -79,28 +78,24 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); packet.writeD(_player.getPkKills()); - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollObjectId(slot)); } - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); } - for (int slot : getPaperdollOrder()) { final VariationInstance augment = _player.getInventory().getPaperdollAugmentation(slot); packet.writeD(augment != null ? augment.getOption1Id() : 0); // Confirmed packet.writeD(augment != null ? augment.getOption2Id() : 0); // Confirmed } - packet.writeC(_player.getInventory().getTalismanSlots()); // CT2.3 packet.writeC(_player.getInventory().canEquipCloak() ? 1 : 0); // CT2.3 - packet.writeD(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeH(0); packet.writeD(_player.getPAtk()); packet.writeD(_player.getPAtkSpd()); packet.writeD(_player.getPDef()); @@ -108,18 +103,14 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAccuracy()); packet.writeD(_player.getCriticalHit()); packet.writeD(_player.getMAtk()); - packet.writeD(_player.getMAtkSpd()); packet.writeD(_player.getPAtkSpd()); - packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicEvasionRate()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name packet.writeD(_player.getReputation()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -135,8 +126,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeD(_player.isGM() ? 0x01 : 0x00); // builder level - + packet.writeD(_player.isGM() ? 1 : 0); // builder level packet.writeS(_player.getTitle()); packet.writeD(_player.getClanId()); // pledge id packet.writeD(_player.getClanCrestId()); // pledge crest id @@ -146,26 +136,19 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeC(_player.hasDwarvenCraft() ? 1 : 0); packet.writeD(_player.getPkKills()); packet.writeD(_player.getPvpKills()); - packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); - - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeC(321); - packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window - - packet.writeC(_player.isNoble() ? 0x01 : 0x00); - packet.writeC(_player.isHero() ? 0x01 : 0x00); - + packet.writeC(_player.isNoble() ? 1 : 0); + packet.writeC(_player.isHero() ? 1 : 0); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); - final AttributeType attackAttribute = _player.getAttackElement(); packet.writeH(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); @@ -175,8 +158,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket } packet.writeD(_player.getFame()); packet.writeD(_player.getVitalityPoints()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index 1d88596096..552b6e6168 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -37,14 +37,12 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_player.getName()); packet.writeD(_clan.getId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); @@ -52,15 +50,14 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 packet.writeD(_clan.getAllyCrestId()); // c2 packet.writeD(_clan.isAtWar() ? 1 : 0); // c3 - packet.writeD(0x00); // T3 Unknown - + packet.writeD(0); // T3 Unknown packet.writeD(_clan.getMembers().size()); for (ClanMember member : _clan.getMembers()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java index 93af10e254..3c155ff816 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -38,10 +38,8 @@ public class GMViewSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_SKILL_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_skills.size()); - final boolean isDisabled = (_player.getClan() != null) && (_player.getClan().getReputationScore() < 0); for (Skill skill : _skills) { @@ -49,7 +47,7 @@ public class GMViewSkillInfo implements IClientOutgoingPacket packet.writeH(skill.getDisplayLevel()); packet.writeH(skill.getSubLevel()); packet.writeD(skill.getDisplayId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(isDisabled && skill.isClanSkill() ? 1 : 0); packet.writeC(skill.isEnchantable() ? 1 : 0); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index f49138fafe..c909d5e6e1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -51,7 +51,6 @@ public class GMViewWarehouseWithdrawList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_WAREHOUSE_WITHDRAW_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java index d8c273f914..449271993b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java @@ -35,7 +35,6 @@ public class GameGuardQuery implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GAME_GUARD_QUERY.writeId(packet); - packet.writeD(0x27533DD9); packet.writeD(0x2E72A51D); packet.writeD(0x2017038B); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index b0c011b696..037b2e6b6b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -35,10 +35,8 @@ public class GetItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ITEM.writeId(packet); - packet.writeD(_playerId); packet.writeD(_item.getObjectId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java index f8c6126c87..5f4d7bf3ca 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java @@ -50,7 +50,6 @@ public class GetOffVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_OFF_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java index ffa8d5f310..77d1e6ba28 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java @@ -45,7 +45,6 @@ public class GetOnVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ON_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java index e5dcb9ded6..b1f5b588f9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java @@ -44,14 +44,13 @@ public class GmViewQuestInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_QUEST_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeH(_questList.size()); // quest count - for (Quest quest : _questList) { final QuestState qs = _player.getQuestState(quest.getName()); packet.writeD(quest.getId()); packet.writeD(qs == null ? 0 : qs.getCond()); } - packet.writeH(0x00); // some size + packet.writeH(0); // some size // for size; ddQQ return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 7e0614b359..3283ac802a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -51,7 +51,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeQ(_player.getAdena()); // activeChar current amount of Adena packet.writeD(3); // available equip slot packet.writeD(_hennaEquipList.size()); - for (Henna henna : _hennaEquipList) { // Player must have at least one dye in inventory @@ -62,8 +61,8 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); // item Id of the dye packet.writeQ(henna.getWearCount()); // amount of dyes required packet.writeQ(henna.getWearFee()); // amount of Adena required - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not - // packet.writeD(0x00); // Does not exist in Classic. + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // meet the requirement or not + // packet.writeD(0); // Does not exist in Classic. } } return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 0e6e64c7b2..23364ad722 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -50,25 +50,24 @@ public class HennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON packet.writeH(_player.getHennaValue(BaseStat.MEN)); // equip MEN packet.writeH(_player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeH(_player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeH(0x00); // equip LUC - packet.writeH(0x00); // equip CHA + packet.writeH(0); // equip LUC + packet.writeH(0); // equip CHA packet.writeD(3 - _player.getHennaEmptySlots()); // Slots packet.writeD(_hennas.size()); // Size for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); } - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 658087380a..9a22f0a564 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -40,12 +40,11 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_ITEM_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getWearCount()); // total amount of dye require packet.writeQ(_henna.getWearFee()); // total amount of Adena require to draw symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to draw or not 0 is false and 1 is true + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to draw or not 0 is false and 1 is true packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() + _player.getHennaValue(BaseStat.INT)); // equip INT @@ -59,7 +58,7 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket packet.writeH(_player.getDEX() + _player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeD(_player.getWIT()); // current WIT packet.writeH(_player.getWIT() + _player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 3800940bac..162812f30b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -40,12 +40,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getCancelCount()); // total amount of dye require packet.writeQ(_henna.getCancelFee()); // total amount of Adena require to remove symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to remove or not + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to remove or not packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() - _player.getHennaValue(BaseStat.INT)); // equip INT @@ -59,11 +58,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket packet.writeH(_player.getDEX() - _player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeD(_player.getWIT()); // current WIT packet.writeH(_player.getWIT() - _player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeD(0x00); // current LUC - packet.writeH(0x00); // equip LUC - packet.writeD(0x00); // current CHA - packet.writeH(0x00); // equip CHA - packet.writeD(0x00); + packet.writeD(0); // current LUC + packet.writeH(0); // equip LUC + packet.writeD(0); // current CHA + packet.writeH(0); // equip CHA + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 3a780986a0..d9f092b327 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -37,11 +37,9 @@ public class HennaRemoveList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); - packet.writeD(0x03); // seems to be max size + packet.writeD(3); // seems to be max size packet.writeD(3 - _player.getHennaEmptySlots()); - for (Henna henna : _player.getHennaList()) { if (henna != null) @@ -50,7 +48,7 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); packet.writeQ(henna.getCancelCount()); packet.writeQ(henna.getCancelFee()); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index e7d3f6f386..e0d5fe7c3f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -67,14 +67,12 @@ public interface IClientOutgoingPacket extends IOutgoingPacket Inventory.PAPERDOLL_BROOCH_JEWEL5, Inventory.PAPERDOLL_BROOCH_JEWEL6 }; - int[] PAPERDOLL_ORDER_AUGMENT = new int[] { Inventory.PAPERDOLL_RHAND, Inventory.PAPERDOLL_LHAND, Inventory.PAPERDOLL_RHAND }; - int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 0c54e810f0..3378827f34 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -46,7 +46,6 @@ public class InventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index c4598a72e6..cef69ecb6f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -59,8 +59,8 @@ public class ItemList extends AbstractItemPacket } else { - packet.writeC(0x01); // _showWindow ? 0x01 : 0x00 - packet.writeD(0x00); + packet.writeC(1); // _showWindow ? 1 : 0 + packet.writeD(0); packet.writeD(_items.size()); } writeInventoryBlock(packet, _player.getInventory()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java index b32b4df4a3..c3b9918230 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java @@ -32,9 +32,8 @@ public class JoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PARTY.writeId(packet); - packet.writeD(_response); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java index 65e06efeb7..f347f7efcd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java @@ -32,7 +32,6 @@ public class JoinPledge implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PLEDGE.writeId(packet); - packet.writeD(_pledgeId); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index 96f6d7c34d..996622b9e9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -35,17 +35,16 @@ public class KeyPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VERSION_CHECK.writeId(packet); - packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok for (int i = 0; i < 8; i++) { packet.writeC(_key[i]); // key } - packet.writeD(0x01); + packet.writeD(1); packet.writeD(Config.SERVER_ID); // server id - packet.writeC(0x01); - packet.writeD(0x00); // obfuscation key - packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 0x01 : 0x00); // isClassic + packet.writeC(1); + packet.writeD(0); // obfuscation key + packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 1 : 0); // isClassic return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java index 484c10f0c4..62424fd03a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java @@ -40,7 +40,6 @@ public class L2FriendSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_SAY.writeId(packet); - packet.writeD(0); // ?? packet.writeS(_receiver); packet.writeS(_sender); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java index b875edb772..790d599b5b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java @@ -32,11 +32,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ListPartyWaiting implements IClientOutgoingPacket { + private static final int NUM_PER_PAGE = 64; + private final List _rooms = new LinkedList<>(); private final int _size; - private static final int NUM_PER_PAGE = 64; - public ListPartyWaiting(PartyMatchingRoomLevelType type, int location, int page, int requestorLevel) { final List rooms = MatchingRoomManager.getInstance().getPartyMathchingRooms(location, type, requestorLevel); @@ -57,7 +57,6 @@ public class ListPartyWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_PARTY_WATING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java index 4f8f9adc64..bb0ac61dbd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java @@ -54,7 +54,6 @@ public class LoginFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LOGIN_FAIL.writeId(packet); - packet.writeD(_success); packet.writeD(_reason); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java index 18a522c315..6743e3e66f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java @@ -32,7 +32,6 @@ public class MagicSkillCanceld implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_CANCELED.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java index d56de10079..7ab29cc1a8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java @@ -66,7 +66,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // MagicSkillUse castingType packet.writeD(_objectId); packet.writeD(_skillId); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java index 3df8463279..a86626cfa6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java @@ -84,7 +84,6 @@ public class MagicSkillUse implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_USE.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // Casting bar type: 0 - default, 1 - default up, 2 - blue, 3 - green, 4 - red. packet.writeD(_creature.getObjectId()); packet.writeD(_target.getObjectId()); @@ -111,7 +110,7 @@ public class MagicSkillUse implements IClientOutgoingPacket packet.writeD(_target.getX()); packet.writeD(_target.getY()); packet.writeD(_target.getZ()); - packet.writeD(_actionId >= 0 ? 0x01 : 0x00); // 1 when ID from RequestActionUse is used + packet.writeD(_actionId >= 0 ? 1 : 0); // 1 when ID from RequestActionUse is used packet.writeD(_actionId >= 0 ? _actionId : 0); // ID from RequestActionUse. Used to set cooldown on summon skills. return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java index 6b710c692e..12e2488f24 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java @@ -37,11 +37,9 @@ public class ManagePledgePower implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet); - packet.writeD(_rank); packet.writeD(_action); packet.writeD(_clan.getRankPrivs(_rank).getBitmask()); - return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 95f4b6f201..4e2ab3f00b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -42,11 +42,9 @@ public class MonRaceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MON_RACE_INFO.writeId(packet); - packet.writeD(_unknown1); packet.writeD(_unknown2); - packet.writeD(0x08); - + packet.writeD(8); for (int i = 0; i < 8; i++) { packet.writeD(_monsters[i].getObjectId()); // npcObjectID @@ -68,7 +66,7 @@ public class MonRaceInfo implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java index 0093b3edc9..e6386921ff 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java @@ -45,13 +45,10 @@ public class MoveToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_xDst); packet.writeD(_yDst); packet.writeD(_zDst); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java index b1fb3ea003..59103c6c4c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java @@ -48,7 +48,6 @@ public class MoveToLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java index 30ff3c96af..aa261f924f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java @@ -50,11 +50,9 @@ public class MoveToPawn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_PAWN.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetId); packet.writeD(_distance); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index e1da19cc8f..50ff0191b8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -58,18 +58,16 @@ public class MultiSellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.MULTI_SELL_LIST.writeId(packet); - - packet.writeC(0x00); // Helios + packet.writeC(0); // Helios packet.writeD(_list.getId()); // list id - packet.writeC(0x00); // GOD Unknown + packet.writeC(0); // GOD Unknown packet.writeD(1 + (_index / PAGE_SIZE)); // page started from 1 - packet.writeD(_finished ? 0x01 : 0x00); // finished + packet.writeD(_finished ? 1 : 0); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - packet.writeC(0x00); // Grand Crusade - packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window - packet.writeD(0x20); // Helios - Always 32 - + packet.writeC(0); // Grand Crusade + packet.writeC(_list.isChanceMultisell() ? 1 : 0); // new multisell window + packet.writeD(32); // Helios - Always 32 while (_size-- > 0) { ItemInfo itemEnchantment = _list.getItemEnchantment(_index); @@ -86,19 +84,15 @@ public class MultiSellList extends AbstractItemPacket } } } - packet.writeD(_index); // Entry ID. Start from 1. packet.writeC(entry.isStackable() ? 1 : 0); - // Those values will be passed down to MultiSellChoose packet. packet.writeH(itemEnchantment != null ? itemEnchantment.getEnchantLevel() : 0); // enchant level writeItemAugment(packet, itemEnchantment); writeItemElemental(packet, itemEnchantment); writeItemEnsoulOptions(packet, itemEnchantment); - packet.writeH(entry.getProducts().size()); packet.writeH(entry.getIngredients().size()); - for (ItemChanceHolder product : entry.getProducts()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(product.getId()); @@ -122,7 +116,6 @@ public class MultiSellList extends AbstractItemPacket writeItemElemental(packet, displayItemEnchantment); writeItemEnsoulOptions(packet, displayItemEnchantment); } - for (ItemChanceHolder ingredient : entry.getIngredients()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(ingredient.getId()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java index 6e85f5348c..cd46aac3aa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java @@ -45,11 +45,10 @@ public class MyTargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MY_TARGET_SELECTED.writeId(packet); - - packet.writeD(0x01); // Grand Crusade + packet.writeD(1); // Grand Crusade packet.writeD(_objectId); packet.writeH(_color); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java index 1901ad1297..166c5c1e00 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java @@ -36,7 +36,6 @@ public class NewCharacterSuccess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NEW_CHARACTER_SUCCESS.writeId(packet); - packet.writeD(_chars.size()); for (PlayerTemplate chr : _chars) { @@ -44,31 +43,24 @@ public class NewCharacterSuccess implements IClientOutgoingPacket { continue; } - // TODO: Unhardcode these packet.writeD(chr.getRace().ordinal()); packet.writeD(chr.getClassId().getId()); - packet.writeD(99); packet.writeD(chr.getBaseSTR()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseDEX()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseCON()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseINT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseWIT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseMEN()); packet.writeD(1); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java index be1605f679..6061ea26ef 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java @@ -38,7 +38,6 @@ public class NicknameChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NICK_NAME_CHANGED.writeId(packet); - packet.writeD(_objectId); packet.writeS(_title); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index f9cd107e2c..3e4837b4a4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -54,24 +54,20 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public NpcHtmlMessage(int npcObjId, int itemId) { super(npcObjId); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } public NpcHtmlMessage(int npcObjId, int itemId, String html) { super(npcObjId, html); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } @@ -79,11 +75,10 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java index 61f195e35d..05489103cb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java @@ -47,10 +47,8 @@ public class NpcInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -58,7 +56,6 @@ public class NpcInfo extends AbstractMaskPacket private int _clanId = 0; private int _statusMask = 0; private final Set _abnormalVisualEffects; - private String[] _localisation; public void setLang(String lang) @@ -101,112 +98,90 @@ public class NpcInfo extends AbstractMaskPacket { addComponentType(NpcInfoType.HEADING); } - if ((npc.getStat().getPAtkSpd() > 0) || (npc.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (npc.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((npc.getLeftHandItem() > 0) || (npc.getRightHandItem() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (npc.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (npc.getDisplayEffect() > 0) { addComponentType(NpcInfoType.DISPLAY_EFFECT); } - if (npc.isInsideZone(ZoneId.WATER) || npc.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (npc.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (npc.getCloneObjId() > 0) { addComponentType(NpcInfoType.CLONE); } - if (npc.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (npc.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (npc.getCurrentHp() <= npc.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (npc.getCurrentMp() <= npc.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (npc.getTemplate().isUsingServerSideName()) { addComponentType(NpcInfoType.NAME); } - if (npc.getTemplate().isUsingServerSideTitle() || (npc.isMonster() && (Config.SHOW_NPC_LEVEL || Config.SHOW_NPC_AGGRESSION)) || npc.isChampion() || npc.isTrap()) { addComponentType(NpcInfoType.TITLE); } - if (npc.getNameString() != null) { addComponentType(NpcInfoType.NAME_NPCSTRINGID); } - if (npc.getTitleString() != null) { addComponentType(NpcInfoType.TITLE_NPCSTRINGID); } - if (_npc.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (!_abnormalVisualEffects.isEmpty() || npc.isInvisible()) { addComponentType(NpcInfoType.ABNORMALS); } - if (npc.getEnchantEffect() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (npc.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (npc.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (npc.getClanId() > 0) { final Clan clan = ClanTable.getInstance().getClan(npc.getClanId()); @@ -220,14 +195,11 @@ public class NpcInfo extends AbstractMaskPacket addComponentType(NpcInfoType.CLAN); } } - addComponentType(NpcInfoType.COLOR_EFFECT); - if (npc.getPvpFlag() > 0) { addComponentType(NpcInfoType.PVP_FLAG); } - // TODO: Confirm me if (npc.isInCombat()) { @@ -245,8 +217,7 @@ public class NpcInfo extends AbstractMaskPacket { _statusMask |= 0x08; } - - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -296,27 +267,23 @@ public class NpcInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO.writeId(packet); - packet.writeD(_npc.getObjectId()); - packet.writeC(_npc.isShowSummonAnimation() ? 0x02 : 0x00); // // 0=teleported 1=default 2=summoned + packet.writeC(_npc.isShowSummonAnimation() ? 2 : 0); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 0x01 : 0x00); + packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { String title = _npc.getTitle(); - // Localisation related. if ((_localisation != null) && !_localisation[1].equals("")) { @@ -329,10 +296,8 @@ public class NpcInfo extends AbstractMaskPacket title = title.replace(NpcData.getInstance().getTemplate(_npc.getId()).getTitle(), _localisation[1]); } } - packet.writeS(title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -351,7 +316,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -366,20 +331,20 @@ public class NpcInfo extends AbstractMaskPacket if (containsMask(NpcInfoType.EQUIPPED)) { packet.writeD(_npc.getRightHandItem()); - packet.writeD(0x00); // Armor id? + packet.writeD(0); // Armor id? packet.writeD(_npc.getLeftHandItem()); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_npc.isDead() ? 0x00 : 0x01); + packet.writeC(_npc.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); + packet.writeC(_npc.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 0x01 : _npc.isFlying() ? 0x02 : 0x00); + packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -391,7 +356,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_npc.isFlying() ? 0x01 : 0x00); + packet.writeD(_npc.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { @@ -427,12 +392,12 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(0x00); // 2 - do some animation on spawn + packet.writeC(0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -464,12 +429,10 @@ public class NpcInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java index c95a8e5274..923e9cebad 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class NpcInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_npc.getObjectId()); packet.writeD(_npc.getTransformationDisplayId()); - final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size()); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java index a294edc57a..2a0ba41eeb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java @@ -38,7 +38,6 @@ public class NpcQuestHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NPC_QUEST_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_questId); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java index d3328ade97..fc6d0d4a3a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java @@ -106,7 +106,6 @@ public class NpcSay implements IClientOutgoingPacket { _parameters = new ArrayList<>(); } - for (String item : params) { if ((item != null) && (item.length() > 0)) @@ -127,11 +126,9 @@ public class NpcSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_SAY.writeId(packet); - packet.writeD(_objectId); packet.writeD(_textType.getClientId()); packet.writeD(_npcId); - // Localisation related. if (_lang != null) { @@ -147,7 +144,6 @@ public class NpcSay implements IClientOutgoingPacket } } } - packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java index 356e3f48a9..ac61f9d247 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java @@ -33,11 +33,10 @@ public class ObservationMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_START.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me packet.writeD(0xc0); // TODO: Find me return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java index 5c0a0766b3..896ccea02b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java @@ -33,7 +33,6 @@ public class ObservationReturn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_END.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java index c2f7ab404f..173772c870 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java @@ -37,7 +37,6 @@ public class OnEventTrigger implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EVENT_TRIGGER.writeId(packet); - packet.writeD(_emitterId); packet.writeC(_enabled); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index fbb5c84dfe..37d4fea9cf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -45,7 +45,6 @@ public class PackageSendableList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java index a53f589386..e24d63f717 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java @@ -39,7 +39,6 @@ public class PackageToList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_TO_LIST.writeId(packet); - packet.writeD(_players.size()); for (Entry entry : _players.entrySet()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 655c7abcd1..44b23b37f4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -55,7 +55,6 @@ public class PartyMemberPosition implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); - packet.writeD(locations.size()); for (Entry entry : locations.entrySet()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java index 9e275ec246..c9d3595037 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java @@ -36,7 +36,6 @@ public class PartyRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java index b9c7d06769..8c97cac6b5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java @@ -36,12 +36,10 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ADD.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); // c3 packet.writeD(_party.getDistributionType().getId()); // c3 packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); - packet.writeD((int) _member.getCurrentCp()); // c4 packet.writeD(_member.getMaxCp()); // c4 packet.writeD((int) _member.getCurrentHp()); @@ -51,7 +49,7 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket packet.writeD(_member.getVitalityPoints()); packet.writeC(_member.getLevel()); packet.writeH(_member.getClassId().getId()); - packet.writeC(0x00); + packet.writeC(0); packet.writeH(_member.getRace().ordinal()); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java index 65d0c60c2e..5ad91f5463 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java @@ -37,21 +37,17 @@ public class PartySmallWindowAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ALL.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); packet.writeC(_party.getDistributionType().getId()); packet.writeC(_party.getMemberCount() - 1); - for (Player member : _party.getMembers()) { if ((member != null) && (member != _exclude)) { packet.writeD(member.getObjectId()); packet.writeS(member.getName()); - packet.writeD((int) member.getCurrentCp()); // c4 packet.writeD(member.getMaxCp()); // c4 - packet.writeD((int) member.getCurrentHp()); packet.writeD(member.getMaxHp()); packet.writeD((int) member.getCurrentMp()); @@ -59,7 +55,7 @@ public class PartySmallWindowAll implements IClientOutgoingPacket packet.writeD(member.getVitalityPoints()); packet.writeC(member.getLevel()); packet.writeH(member.getClassId().getId()); - packet.writeC(0x01); // Unk + packet.writeC(1); // Unk packet.writeH(member.getRace().ordinal()); final Summon pet = member.getPet(); packet.writeD(member.getServitors().size() + (pet != null ? 1 : 0)); // Summon size, one only atm diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java index 94a8a5a2ce..09ce132af4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java @@ -33,7 +33,6 @@ public class PartySmallWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_DELETE.writeId(packet); - packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java index c53c6c7779..e9ea2efbbe 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java @@ -42,7 +42,6 @@ public class PartySmallWindowUpdate extends AbstractMaskPacket _summon.getStat().getExp()) { packet.writeQ(_summon.getStat().getExp()); // 0% absolute value @@ -160,9 +148,7 @@ public class PetInfo implements IClientOutgoingPacket { packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value } - packet.writeQ(_summon.getExpForNextLevel()); // 100% absoulte value - packet.writeD(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight packet.writeD(_summon.getMaxLoad()); // max weight it can carry packet.writeD(_summon.getPAtk()); // patk @@ -178,25 +164,20 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD((int) _summon.getStat().getMoveSpeed()); // speed packet.writeD(_summon.getPAtkSpd()); // atkspeed packet.writeD(_summon.getMAtkSpd()); // casting speed - packet.writeC(0); // TODO: Check me, might be ride status packet.writeC(_summon.getTeam().getId()); // Confirmed packet.writeC(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed packet.writeC(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed - - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. - + packet.writeD(0); // TODO: Find me + packet.writeD(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. packet.writeC(_summon.getOwner().getSummonPoints()); // Used Summon Points packet.writeC(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points - final Set aves = _summon.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeH(aves.size()); // Confirmed for (AbnormalVisualEffect ave : aves) { packet.writeH(ave.getClientId()); // Confirmed } - packet.writeC(_statusMask); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 5b43daa74b..1f60ec39d1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -46,7 +46,6 @@ public class PetInventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.PET_INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index e4cf35779f..16dc83b7ed 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -35,7 +35,6 @@ public class PetItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java index fdb00ddbb1..913f65d470 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java @@ -38,7 +38,6 @@ public class PetStatusShow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_SHOW.writeId(packet); - packet.writeD(_summonType); packet.writeD(_summonObjectId); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 25c2c74292..823a8c405a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -52,7 +52,6 @@ public class PetStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_UPDATE.writeId(packet); - packet.writeD(_summon.getSummonType()); packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getX()); @@ -69,7 +68,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket packet.writeQ(_summon.getStat().getExp()); packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value packet.writeQ(_summon.getExpForNextLevel()); // 100% absolute value - packet.writeD(0x01); // TODO: Find me! + packet.writeD(1); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java index 4bc3570779..0898b01f67 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java @@ -63,7 +63,6 @@ public class PlaySound implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLAY_SOUND.writeId(packet); - packet.writeD(_unknown1); // unknown 0 for quest and ship; packet.writeS(_soundFile); packet.writeD(_unknown3); // unknown 0 for quest; 1 for ship; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java index fbe57d4aaf..5108fe7e1b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java @@ -44,7 +44,6 @@ public class PledgeCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java index aa11b1213e..6805f64d7c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java @@ -34,7 +34,6 @@ public class PledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_INFO.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getId()); packet.writeS(_clan.getName()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java index 72f2c71838..193ee17589 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java @@ -36,12 +36,10 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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 - // clan or subpledge name if (_member.getPledgeType() != 0) { @@ -51,7 +49,6 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket { packet.writeS(_member.getClan().getName()); } - packet.writeS(_member.getApprenticeOrSponsorName()); // name of this member's apprentice/sponsor return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java index eefd482979..6aa5067c8f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java @@ -36,7 +36,6 @@ public class PledgeReceivePowerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_POWER_INFO.writeId(packet); - packet.writeD(_member.getPowerGrade()); // power grade packet.writeS(_member.getName()); packet.writeD(_member.getClan().getRankPrivs(_member.getPowerGrade()).getBitmask()); // privileges diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 818c38a076..01f71eea17 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -40,8 +40,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_SUB_PLEDGE_CREATED.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); packet.writeD(_subPledge.getId()); packet.writeS(_subPledge.getName()); packet.writeS(getLeaderName()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java index 4d0efeb82a..7649947064 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java @@ -43,7 +43,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(packet); - packet.writeD(_tab); // page packet.writeD(_clanList.size()); for (ClanWar clanWar : _clanList) @@ -53,7 +52,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket { continue; } - packet.writeS(clan.getName()); packet.writeD(clanWar.getState().ordinal()); // type: 0 = Declaration, 1 = Blood Declaration, 2 = In War, 3 = Victory, 4 = Defeat, 5 = Tie, 6 = Error packet.writeD(clanWar.getRemainingTime()); // Time if friends to start remaining diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java index 2cbbdbf046..80d10fcb66 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java @@ -34,26 +34,25 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_INFO_UPDATE.writeId(packet); - // sending empty data so client will ask all the info in response ;) packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getLevel()); // clan level packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); // castle state ? + packet.writeD(0); // castle state ? packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); // clan reputation score - packet.writeD(0x00); // ? - packet.writeD(0x00); // ? + packet.writeD(0); // ? + packet.writeD(0); // ? packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); // c5 packet.writeD(_clan.getAllyCrestId()); // c5 packet.writeD(_clan.isAtWar() ? 1 : 0); // c5 - packet.writeD(0x00); // TODO: Find me! - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java index ae26e50dbb..2fa9f26d4a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java @@ -51,12 +51,11 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ADD.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); - packet.writeD(0x00); - packet.writeD(0x01); + packet.writeD(0); + packet.writeD(1); packet.writeD(_isOnline); // 1 = online 0 = offline packet.writeD(_pledgeType); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index c5ea7b284b..a1be315cf4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -41,7 +41,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket { _clan = clan; _pledge = pledge; - _pledgeId = _pledge == null ? 0x00 : _pledge.getId(); + _pledgeId = _pledge == null ? 0 : _pledge.getId(); _leaderName = pledge == null ? clan.getLeaderName() : CharNameTable.getInstance().getNameById(pledge.getLeaderId()); _name = pledge == null ? clan.getName() : pledge.getName(); _members = _clan.getMembers(); @@ -65,31 +65,28 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(packet); - - packet.writeD(_isSubPledge ? 0x00 : 0x01); + packet.writeD(_isSubPledge ? 0 : 1); packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_pledgeId); packet.writeS(_name); packet.writeS(_leaderName); - packet.writeD(_clan.getCrestId()); // crest id .. is used again packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); // 0 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(0); // 0 packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.isAtWar() ? 1 : 0); // new c3 - packet.writeD(0x00); // Territory castle ID + packet.writeD(0); // Territory castle ID packet.writeD(_clan.getSubPledgeMembersCount(_pledgeId)); - for (ClanMember m : _members) { if (m.getPledgeType() != _pledgeId) @@ -107,8 +104,8 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket } else { - packet.writeD(0x01); // no visible effect - packet.writeD(0x01); // packet.writeD(1); + packet.writeD(1); // no visible effect + packet.writeD(1); // packet.writeD(1); } packet.writeD(m.isOnline() ? m.getObjectId() : 0); // objectId = online 0 = offline packet.writeD(m.getSponsor() != 0 ? 1 : 0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java index 0fd387e419..154bcc610d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java @@ -32,7 +32,6 @@ public class PledgeShowMemberListDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_DELETE.writeId(packet); - packet.writeS(_player); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java index c61f412ed0..7b8c7c516b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java @@ -66,7 +66,6 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index 4e89797e45..09f70ea024 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -62,14 +62,14 @@ public class PledgeSkillList implements IClientOutgoingPacket { packet.writeD(sk.getDisplayId()); packet.writeH(sk.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } for (SubPledgeSkill sk : _subSkills) { packet.writeD(sk._subType); // Clan Sub-unit types packet.writeD(sk._skillId); packet.writeH(sk._skillLevel); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java index f3b8d4c26c..a94601294f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java @@ -37,7 +37,6 @@ public class PledgeSkillListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST_ADD.writeId(packet); - packet.writeD(_id); packet.writeD(_level); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java index 9e1b4843ac..5f32f2bf54 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java @@ -33,15 +33,14 @@ public class PledgeStatusChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_STATUS_CHANGED.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getLeaderId()); packet.writeD(_clan.getId()); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getAllyId()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.getCrestLargeId()); - packet.writeD(0x00); // pledge type ? + packet.writeD(0); // pledge type ? return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java index 5b56d0b28d..41d0f9f7d8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java @@ -44,12 +44,10 @@ public class PrivateStoreListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_LIST.writeId(packet); - packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); // Viewer's item count? + packet.writeD(0); // Viewer's item count? packet.writeD(_items.size()); - int slotNumber = 0; for (TradeItem item : _items) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 67b6ba8d94..d72050283e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -43,11 +43,10 @@ public class PrivateStoreListSell extends AbstractItemPacket else { OutgoingPackets.PRIVATE_STORE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index d05590cbde..df056c2e43 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -60,13 +60,13 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket { packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); + packet.writeD(0); for (Item item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item2 : _buyList) { writeItem(packet, item2); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index d8768104a4..6bbabb282b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -63,13 +63,13 @@ public class PrivateStoreManageListSell extends AbstractItemPacket packet.writeD(_objId); packet.writeD(_packageSale ? 1 : 0); packet.writeQ(_playerAdena); - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item2 : _sellList) { writeItem(packet, item2); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java index 8a5b9eef92..0d7bcbea16 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgBuy implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java index b00bd2add2..8fdb5701b8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgSell implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java index c3958367e8..5ddaa46ba0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java @@ -40,7 +40,6 @@ public class RadarControl implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RADAR_CONTROL.writeId(packet); - packet.writeD(_showRadar); packet.writeD(_type); // maybe type packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java index 3918894601..5d67413b6f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java @@ -43,10 +43,8 @@ public class RecipeBookItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_BOOK_ITEM_LIST.writeId(packet); - - packet.writeD(_isDwarvenCraft ? 0x00 : 0x01); // 0 = Dwarven - 1 = Common + packet.writeD(_isDwarvenCraft ? 0 : 1); // 0 = Dwarven - 1 = Common packet.writeD(_maxMp); - if (_recipes == null) { packet.writeD(0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 59ec218c84..9f460fe896 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -55,11 +55,10 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeD((int) _player.getCurrentMp()); packet.writeD(_player.getMaxMp()); packet.writeD(_success ? 1 : 0); // item creation success/failed - packet.writeC(0x00); - packet.writeQ(0x00); + packet.writeC(0); + packet.writeQ(0); return true; } - PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java index 4474a37c03..f4db5be9df 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java @@ -35,15 +35,14 @@ public class RecipeShopItemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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); - packet.writeQ(0x00); - packet.writeC(0x00); // Trigger offering window if 1 - packet.writeQ(0x00); + packet.writeQ(0); + packet.writeC(0); // Trigger offering window if 1 + packet.writeQ(0); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java index 75e45f5877..38b0b8ea4e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java @@ -43,7 +43,6 @@ public class RecipeShopManageList implements IClientOutgoingPacket { _recipes = _seller.getCommonRecipeBook(); } - if (_seller.hasManufactureShop()) { final Iterator it = _seller.getManufactureItems().values().iterator(); @@ -63,11 +62,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MANAGE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD((int) _seller.getAdena()); - packet.writeD(_isDwarven ? 0x00 : 0x01); - + packet.writeD(_isDwarven ? 0 : 1); if (_recipes == null) { packet.writeD(0); @@ -83,10 +80,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket packet.writeD(count); } } - if (!_seller.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -94,7 +90,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket for (ManufactureItem item : _seller.getManufactureItems().values()) { packet.writeD(item.getRecipeId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeQ(item.getCost()); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java index c025b5e4ed..2b9bc5b6e7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java @@ -33,7 +33,6 @@ public class RecipeShopMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MSG.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeS(_player.getStoreName()); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java index be8ae1181e..8b3cb42f47 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java @@ -36,14 +36,13 @@ public class RecipeShopSellList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_SELL_LIST.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD((int) _manufacturer.getCurrentMp()); // Creator's MP packet.writeD(_manufacturer.getMaxMp()); // Creator's MP packet.writeQ(_buyer.getAdena()); // Buyer Adena if (!_manufacturer.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -51,7 +50,7 @@ public class RecipeShopSellList implements IClientOutgoingPacket for (ManufactureItem temp : _manufacturer.getManufactureItems().values()) { packet.writeD(temp.getRecipeId()); - packet.writeD(0x00); // unknown + packet.writeD(0); // unknown packet.writeQ(temp.getCost()); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 74700e29b0..269e14d50b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -88,7 +88,6 @@ public class RelationChanged implements IClientOutgoingPacket { return; } - final Relation r = new Relation(); r._objId = activeChar.getObjectId(); r._relation = relation; @@ -102,7 +101,6 @@ public class RelationChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RELATION_CHANGED.writeId(packet); - packet.writeC(_mask); if (_multi == null) { @@ -122,7 +120,6 @@ public class RelationChanged implements IClientOutgoingPacket private void writeRelation(PacketWriter packet, Relation relation) { packet.writeD(relation._objId); - if ((_mask & SEND_DEFAULT) != SEND_DEFAULT) { packet.writeD(relation._relation); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java index b4e9dc25c5..4477cfb705 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java @@ -35,7 +35,6 @@ public class RequestEnchant implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java index 4ef15fb74c..7a0a6cbe58 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java @@ -33,7 +33,6 @@ public class Revive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.REVIVE.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java index 9c409601e3..b9ddf7733f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java @@ -42,7 +42,6 @@ public class Ride implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RIDE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_mounted); packet.writeD(_rideType); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 813ce03f4d..13ef62f55f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -49,11 +49,9 @@ public class SellListProcure implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SELL_LIST_PROCURE.writeId(packet); - packet.writeQ(_money); // money - packet.writeD(0x00); // lease ? + packet.writeD(0); // lease ? packet.writeH(_sellList.size()); // list size - for (Entry entry : _sellList.entrySet()) { final Item item = entry.getKey(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java index baa37a8507..75b5b07854 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java @@ -39,12 +39,10 @@ public class SendMacroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MACRO_LIST.writeId(packet); - packet.writeC(_updateType.getId()); - packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0x00); // modified, created or deleted macro's id + packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0); // modified, created or deleted macro's id packet.writeC(_count); // count of Macros packet.writeC(_macro != null ? 1 : 0); // unknown - if ((_macro != null) && (_updateType != MacroUpdateType.DELETE)) { packet.writeD(_macro.getId()); // Macro ID @@ -52,9 +50,7 @@ public class SendMacroList implements IClientOutgoingPacket packet.writeS(_macro.getDescr()); // Desc packet.writeS(_macro.getAcronym()); // acronym packet.writeD(_macro.getIcon()); // icon - packet.writeC(_macro.getCommands().size()); // count - int i = 1; for (MacroCmd cmd : _macro.getCommands()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java index 47fada25be..21622b5f19 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java @@ -32,7 +32,6 @@ public class SendTradeRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_REQUEST.writeId(packet); - packet.writeD(_senderId); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java index 69aa749406..1513a0e3d1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java @@ -55,7 +55,6 @@ public class ServerObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SERVER_OBJECT_INFO.writeId(packet); - packet.writeD(_activeChar.getObjectId()); packet.writeD(_displayId + 1000000); packet.writeS(_name); // name @@ -70,8 +69,8 @@ public class ServerObjectInfo implements IClientOutgoingPacket packet.writeF(_collisionHeight); packet.writeD((int) (_isAttackable ? _activeChar.getCurrentHp() : 0)); packet.writeD(_isAttackable ? _activeChar.getMaxHp() : 0); - packet.writeD(0x01); // object type - packet.writeD(0x00); // special effects + packet.writeD(1); // object type + packet.writeD(0); // special effects return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java index 88b370ad8b..0164e5c4a2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java @@ -34,7 +34,6 @@ public class SetSummonRemainTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SET_SUMMON_REMAIN_TIME.writeId(packet); - packet.writeD(_maxTime); packet.writeD(_remainingTime); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java index db28b72acf..016f5a0c9a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java @@ -38,7 +38,6 @@ public class ShopPreviewInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_INFO.writeId(packet); - packet.writeD(Inventory.PAPERDOLL_TOTALSLOTS); // Slots packet.writeD(getFromList(Inventory.PAPERDOLL_UNDER)); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index df50db952f..a55186f551 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -51,11 +51,9 @@ public class ShopPreviewList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_LIST.writeId(packet); - packet.writeD(5056); packet.writeQ(_money); // current money packet.writeD(_listId); - int newlength = 0; for (Product product : _list) { @@ -65,23 +63,20 @@ public class ShopPreviewList implements IClientOutgoingPacket } } packet.writeH(newlength); - for (Product product : _list) { if ((product.getItem().getCrystalType().getLevel() <= _expertise) && product.getItem().isEquipable()) { packet.writeD(product.getItemId()); packet.writeH(product.getItem().getType2()); // item type2 - if (product.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { packet.writeQ(product.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } else { - packet.writeQ(0x00); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand + packet.writeQ(0); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } - packet.writeQ(Config.WEAR_PRICE); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 298301ed0d..b13080ff28 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -40,7 +40,6 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_BUFF_STATUS_UPDATE.writeId(packet); - packet.writeD(_skillId); packet.writeH(_skillLevel); packet.writeH(_skillSubLevel); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index c6a67fb97c..b8624ce4cd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -33,7 +33,6 @@ public class ShortCutInit implements IClientOutgoingPacket { return; } - _shortCuts = player.getAllShortCuts(); } @@ -41,24 +40,22 @@ public class ShortCutInit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); packet.writeD(sc.getSlot() + (sc.getPage() * 12)); - switch (sc.getType()) { case ITEM: { packet.writeD(sc.getId()); - packet.writeD(0x01); // Enabled or not + packet.writeD(1); // Enabled or not packet.writeD(sc.getSharedReuseGroup()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeQ(0x00); // Augment id - packet.writeD(0x00); // Visual id + packet.writeD(0); + packet.writeD(0); + packet.writeQ(0); // Augment id + packet.writeD(0); // Visual id break; } case SKILL: @@ -67,8 +64,8 @@ public class ShortCutInit implements IClientOutgoingPacket packet.writeH(sc.getLevel()); packet.writeH(sc.getSubLevel()); packet.writeD(sc.getSharedReuseGroup()); - packet.writeC(0x00); // C5 - packet.writeD(0x01); // C6 + packet.writeC(0); // C5 + packet.writeD(1); // C6 break; } case ACTION: @@ -77,7 +74,7 @@ public class ShortCutInit implements IClientOutgoingPacket case BOOKMARK: { packet.writeD(sc.getId()); - packet.writeD(0x01); // C6 + packet.writeD(1); // C6 } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java index 43d61af661..f099eab47e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java @@ -37,7 +37,6 @@ public class ShortCutRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_REGISTER.writeId(packet); - packet.writeD(_shortcut.getType().ordinal()); packet.writeD(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client switch (_shortcut.getType()) @@ -47,10 +46,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeD(_shortcut.getId()); packet.writeD(_shortcut.getCharacterType()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeD(0x00); // unknown - packet.writeD(0x00); // unknown - packet.writeD(0x00); // item augment id - packet.writeD(0x00); // TODO: Find me, item visual id ? + packet.writeD(0); // unknown + packet.writeD(0); // unknown + packet.writeD(0); // item augment id + packet.writeD(0); // TODO: Find me, item visual id ? break; } case SKILL: @@ -59,10 +58,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeH(_shortcut.getLevel()); packet.writeH(_shortcut.getSubLevel()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeC(0x00); // C5 + packet.writeC(0); // C5 packet.writeD(_shortcut.getCharacterType()); - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me + packet.writeD(0); // TODO: Find me break; } case ACTION: diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java index d6f71b5f70..cfae3b3fad 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java @@ -54,7 +54,6 @@ public class ShowBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - packet.writeC(_showBoard); // c4 1 to show community 00 to hide packet.writeS("bypass _bbshome"); // top packet.writeS("bypass _bbsgetfav"); // favorite diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java index 4b62a7001b..4d62e99d7a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java @@ -32,7 +32,6 @@ public class ShowCalculator implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_CALC.writeId(packet); - packet.writeD(_calculatorId); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java index 55f58d5375..4574762467 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java @@ -32,9 +32,8 @@ public class ShowMiniMap implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_MINIMAP.writeId(packet); - packet.writeD(_mapId); - packet.writeC(0x00); // Seven Signs state + packet.writeC(0); // Seven Signs state return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java index 303eab4e8a..97100d09d2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java @@ -34,7 +34,6 @@ public class ShowPCCafeCouponShowUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_PCCAFE_COUPON_SHOW_UI.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java index d86958e586..0a0f3ae861 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java @@ -35,7 +35,6 @@ public class ShowXMasSeal implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_XMAS_SEAL.writeId(packet); - packet.writeD(_item); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java index 66eccc7fbf..1baa030c4d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java @@ -28,9 +28,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = ca
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Attackers Clans?
* d = Number of Attackers Clans
* { //repeats
@@ -58,11 +58,10 @@ public class SiegeAttackerList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _castle.getSiege().getAttackerClans().size(); if (size > 0) { @@ -76,12 +75,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -90,8 +88,8 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index 5d5c831f14..8afd1f38ce 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -29,9 +29,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = 0xcb
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Defending Clans?
* d = Number of Defending Clans
* { //repeats
@@ -60,16 +60,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // Unknown - packet.writeD(0x01); // Unknown - packet.writeD(0x00); // Unknown - + packet.writeD(0); // Unknown + packet.writeD(1); // Unknown + packet.writeD(0); // Unknown final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0); packet.writeD(size); packet.writeD(size); - // Add owners final Clan ownerClan = _castle.getOwner(); if (ownerClan != null) @@ -78,14 +75,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket packet.writeS(ownerClan.getName()); packet.writeS(ownerClan.getLeaderName()); packet.writeD(ownerClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.OWNER.ordinal()); packet.writeD(ownerClan.getAllyId()); packet.writeS(ownerClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(ownerClan.getAllyCrestId()); } - // List of confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans()) { @@ -94,19 +90,17 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(defendingClan.getAllyCrestId()); } - // List of not confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans()) { @@ -115,12 +109,11 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER_PENDING.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 0a3fe46cb7..dfeefdaecf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -59,13 +59,11 @@ public class SiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_INFO.writeId(packet); - if (_castle != null) { packet.writeD(_castle.getResidenceId()); - final int ownerId = _castle.getOwnerId(); - packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 0x01 : 0x00); + packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0); packet.writeD(ownerId); if (ownerId > 0) { @@ -89,7 +87,6 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { @@ -97,7 +94,7 @@ public class SiegeInfo implements IClientOutgoingPacket cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis()); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(Config.SIEGE_HOUR_LIST.size()); for (int hour : Config.SIEGE_HOUR_LIST) { @@ -108,7 +105,7 @@ public class SiegeInfo implements IClientOutgoingPacket else { packet.writeD((int) (_castle.getSiegeDate().getTimeInMillis() / 1000)); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index d11b3817c0..3c4c475339 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -51,12 +51,11 @@ public class SkillCoolTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SKILL_COOL_TIME.writeId(packet); - packet.writeD(_skillReuseTimeStamps.size()); for (TimeStamp ts : _skillReuseTimeStamps) { packet.writeD(ts.getSkillId()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD((int) ts.getReuse() / 1000); packet.writeD((int) Math.max(ts.getStamp() - _currentTime, 0) / 1000); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index de54232b51..ed4615c403 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -41,10 +41,9 @@ public class Snoop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SNOOP.writeId(packet); - packet.writeD(_convoId); packet.writeS(_name); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_type.getClientId()); packet.writeS(_speaker); packet.writeS(_msg); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java index 37827bdf6c..52f15519a5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java @@ -37,10 +37,9 @@ public class SocialAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SOCIAL_ACTION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_actionId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index fd7e43a153..19066f5f85 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -33,16 +33,15 @@ public class SpawnItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPAWN_ITEM.writeId(packet); - packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeD(_item.isStackable() ? 0x01 : 0x00); + packet.writeD(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java index ccae75b850..04f3ad716c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java @@ -110,7 +110,6 @@ public class SpecialCamera implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPECIAL_CAMERA.writeId(packet); - packet.writeD(_id); packet.writeD(_force); packet.writeD(_angle1); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java index cdd3821740..281756e793 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java @@ -34,7 +34,6 @@ public class StartPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_PLEDGE_WAR.writeId(packet); - packet.writeS(_playerName); packet.writeS(_pledgeName); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java index 48b4238eea..27fb4f606b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java @@ -38,7 +38,6 @@ public class StartRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_side); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java index b4f421df36..067bdeb082 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java @@ -72,7 +72,6 @@ public class StaticObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATIC_OBJECT.writeId(packet); - packet.writeD(_staticObjectId); packet.writeD(_objectId); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index 928b54aa48..40836e4af8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -46,7 +46,6 @@ public class StatusUpdate implements IClientOutgoingPacket public void addUpdate(StatusUpdateType type, int level) { _updates.put(type, level); - if (_isPlayable) { switch (type) @@ -75,10 +74,9 @@ public class StatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATUS_UPDATE.writeId(packet); - packet.writeD(_objectId); // casterId - packet.writeD(_isVisible ? _casterObjectId : 0x00); - packet.writeC(_isVisible ? 0x01 : 0x00); + packet.writeD(_isVisible ? _casterObjectId : 0); + packet.writeC(_isVisible ? 1 : 0); packet.writeC(_updates.size()); for (Entry entry : _updates.entrySet()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java index 9919307366..cf2b71df5a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java @@ -53,7 +53,6 @@ public class StopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java index 50fdc3fe4c..78fdb5d70c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java @@ -43,7 +43,6 @@ public class StopMoveInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java index 9c828c3962..b254cad8b1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java @@ -34,7 +34,6 @@ public class StopPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java index b0392de226..ca69cd5346 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java @@ -36,7 +36,6 @@ public class StopRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FINISH_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_speed); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index c1feb37b2f..2d92796c75 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -43,10 +43,8 @@ public class SummonInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class SummonInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class SummonInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,11 +154,9 @@ public class SummonInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - // Show red aura? - // if (_statusMask != 0) + // if (_statusMask != 0x00) // { // addComponentType(NpcInfoType.VISUAL_STATE); // } @@ -229,28 +206,24 @@ public class SummonInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.SUMMON_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -269,7 +242,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -285,19 +258,19 @@ public class SummonInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -309,20 +282,20 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -346,12 +319,12 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -381,12 +354,10 @@ public class SummonInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java index 864462f76f..6f88551204 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java @@ -34,7 +34,6 @@ public class SurrenderPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SURRENDER_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 746b2da3f7..b509d599db 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -161,7 +161,6 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } - _params[_paramIndex++] = param; } @@ -267,7 +266,6 @@ public class SystemMessage implements IClientOutgoingPacket { return addString(item.getName()); } - append(new SMParam(TYPE_ITEM_NAME, id)); return this; } @@ -389,7 +387,6 @@ public class SystemMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SYSTEM_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -402,13 +399,12 @@ public class SystemMessage implements IClientOutgoingPacket params[i] = _params[i].getValue(); } packet.writeH(SystemMessageId.S1_2.getId()); - packet.writeC(0x01); + packet.writeC(1); packet.writeC(TYPE_TEXT); packet.writeS(sml.getLocalisation(params)); return true; } } - packet.writeH(getId()); packet.writeC(_params.length); for (SMParam param : _params) @@ -418,9 +414,7 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } - packet.writeC(param.getType()); - switch (param.getType()) { case TYPE_ELEMENT_NAME: diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java index a91da07e77..d357efbb0e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java @@ -47,13 +47,12 @@ public class TargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_SELECTED.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java index 3dadd249f6..3d7208c06f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java @@ -42,12 +42,11 @@ public class TargetUnselected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_UNSELECTED.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index 943b5078b6..13f9b9565a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -41,14 +41,13 @@ public class TeleportToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TELEPORT_TO_LOCATION.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // Fade 0, Instant 1. + packet.writeD(0); // Fade 0, Instant 1. packet.writeD(_heading); - packet.writeD(0x00); // Unknown. + packet.writeD(0); // Unknown. return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java index cb82f2da59..8d09576d9d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java @@ -32,7 +32,6 @@ public class TradeDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_DONE.writeId(packet); - packet.writeD(_num); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java index 716ed2a099..6a94d2463f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java @@ -41,9 +41,9 @@ public class TradeOtherAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java index 3d0ef0b501..7907f3d498 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java @@ -41,9 +41,9 @@ public class TradeOwnAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c59568bf1d..3822108c5a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -58,7 +58,6 @@ public class TradeStart extends AbstractItemPacket { _mask |= 0x08; } - // Does not shows level if (_partner.isGM()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java index f8e2a191de..e5ec2376cc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java @@ -44,10 +44,10 @@ public class TradeUpdate extends AbstractItemPacket { OutgoingPackets.TRADE_UPDATE.writeId(packet); packet.writeC(_sendType); - packet.writeD(0x01); + packet.writeD(1); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2); writeItem(packet, _item, _count); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java index c7102ca385..728020c0b1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java @@ -32,7 +32,6 @@ public class TutorialEnableClientEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_ENABLE_CLIENT_EVENT.writeId(packet); - packet.writeD(_eventId); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java index 92ac75afcf..7cc33a0f80 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java @@ -48,7 +48,6 @@ public class TutorialShowHtml extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_HTML.writeId(packet); - packet.writeD(_type); packet.writeS(getHtml()); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java index 75a57be38b..2ee62835db 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java @@ -37,7 +37,6 @@ public class TutorialShowQuestionMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_QUESTION_MARK.writeId(packet); - packet.writeC(_markType); packet.writeD(_markId); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index e2a9a7496c..900fa10750 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class UserInfo extends AbstractMaskPacket { private Player _player; - private int _relation; private int _runSpd; private int _walkSpd; @@ -47,14 +46,12 @@ public class UserInfo extends AbstractMaskPacket private int _enchantLevel; private int _armorEnchant; private String _title; - private final byte[] _masks = new byte[] { (byte) 0x00, (byte) 0x00, (byte) 0x00 }; - private int _initSize = 5; public UserInfo(Player player) @@ -78,6 +75,7 @@ public class UserInfo extends AbstractMaskPacket _enchantLevel = player.getInventory().getWeaponEnchant(); _armorEnchant = player.getInventory().getArmorMinEnchant(); _title = player.getTitle(); + if (player.isGM() && player.isInvisible()) { _title = "[Invisible]"; @@ -133,29 +131,25 @@ public class UserInfo extends AbstractMaskPacket } OutgoingPackets.USER_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_initSize); packet.writeH(24); packet.writeB(_masks); - if (containsMask(UserInfoType.RELATION)) { packet.writeD(_relation); } - if (containsMask(UserInfoType.BASIC_INFO)) { packet.writeH(16 + (_player.getAppearance().getVisibleName().length() * 2)); packet.writeString(_player.getName()); - packet.writeC(_player.isGM() ? 0x01 : 0x00); + packet.writeC(_player.isGM() ? 1 : 0); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } - if (containsMask(UserInfoType.BASE_STATS)) { packet.writeH(18); @@ -165,10 +159,9 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getINT()); packet.writeH(_player.getWIT()); packet.writeH(_player.getMEN()); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); } - if (containsMask(UserInfoType.MAX_HPCPMP)) { packet.writeH(14); @@ -176,7 +169,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMaxMp()); packet.writeD(_player.getMaxCp()); } - if (containsMask(UserInfoType.CURRENT_HPMPCP_EXP_SP)) { packet.writeH(38); @@ -187,32 +179,28 @@ public class UserInfo extends AbstractMaskPacket packet.writeQ(_player.getExp()); packet.writeF((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel()))); } - if (containsMask(UserInfoType.ENCHANTLEVEL)) { packet.writeH(4); packet.writeC(_enchantLevel); packet.writeC(_armorEnchant); } - if (containsMask(UserInfoType.APPAREANCE)) { packet.writeH(15); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); } - if (containsMask(UserInfoType.STATUS)) { packet.writeH(6); packet.writeC(_player.getMountType().ordinal()); packet.writeC(_player.getPrivateStoreType().getId()); packet.writeC(_player.hasDwarvenCraft() || (_player.getSkillLevel(248) > 0) ? 1 : 0); - packet.writeC(0x00); + packet.writeC(0); } - if (containsMask(UserInfoType.STATS)) { packet.writeH(56); @@ -231,18 +219,16 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); } - if (containsMask(UserInfoType.ELEMENTALS)) { packet.writeH(14); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); } - if (containsMask(UserInfoType.POSITION)) { packet.writeH(18); @@ -251,7 +237,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getZ()); packet.writeD(_player.isInVehicle() ? _player.getVehicle().getObjectId() : 0); } - if (containsMask(UserInfoType.SPEED)) { packet.writeH(18); @@ -264,28 +249,24 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_flyRunSpd); packet.writeH(_flyWalkSpd); } - if (containsMask(UserInfoType.MULTIPLIER)) { packet.writeH(18); packet.writeF(_moveMultiplier); packet.writeF(_player.getAttackSpeedMultiplier()); } - if (containsMask(UserInfoType.COL_RADIUS_HEIGHT)) { packet.writeH(18); packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); } - if (containsMask(UserInfoType.ATK_ELEMENTAL)) { packet.writeH(5); - packet.writeC(0x00); - packet.writeH(0x00); + packet.writeC(0); + packet.writeH(0); } - if (containsMask(UserInfoType.CLAN)) { packet.writeH(32 + (_title.length() * 2)); @@ -295,12 +276,11 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getClanCrestLargeId()); packet.writeD(_player.getClanCrestId()); packet.writeD(_player.getClanPrivileges().getBitmask()); - packet.writeC(_player.isClanLeader() ? 0x01 : 0x00); + packet.writeC(_player.isClanLeader() ? 1 : 0); packet.writeD(_player.getAllyId()); packet.writeD(_player.getAllyCrestId()); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); } - if (containsMask(UserInfoType.SOCIAL)) { packet.writeH(22); @@ -314,70 +294,62 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); } - if (containsMask(UserInfoType.VITA_FAME)) { packet.writeH(15); packet.writeD(_player.getVitalityPoints()); - packet.writeC(0x00); // Vita Bonus + packet.writeC(0); // Vita Bonus packet.writeD(_player.getFame()); packet.writeD(_player.getRaidbossPoints()); } - if (containsMask(UserInfoType.SLOTS)) { packet.writeH(11); // 140 packet.writeC(_player.getInventory().getTalismanSlots()); packet.writeC(_player.getInventory().getBroochJewelSlots()); packet.writeC(_player.getTeam().getId()); - packet.writeC(0x00); - packet.writeC(0x00); - packet.writeC(0x00); - packet.writeC(0x00); - + packet.writeC(0); + packet.writeC(0); + packet.writeC(0); + packet.writeC(0); if (_player.getInventory().getAgathionSlots() > 0) { - packet.writeC(0x01); + packet.writeC(1); packet.writeC(_player.getInventory().getAgathionSlots() - 1); } else { - packet.writeC(0x00); - packet.writeC(0x00); + packet.writeC(0); + packet.writeC(0); } } - if (containsMask(UserInfoType.MOVEMENTS)) { packet.writeH(4); packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); - packet.writeC(_player.isRunning() ? 0x01 : 0x00); + packet.writeC(_player.isRunning() ? 1 : 0); } - if (containsMask(UserInfoType.COLOR)) { packet.writeH(10); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); } - if (containsMask(UserInfoType.INVENTORY_LIMIT)) { packet.writeH(9); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); packet.writeH(_player.getInventoryLimit()); packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); } - if (containsMask(UserInfoType.TRUE_HERO)) { packet.writeH(9); - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeC(_player.isTrueHero() ? 100 : 0x00); + packet.writeD(0); + packet.writeH(0); + packet.writeC(_player.isTrueHero() ? 100 : 0); } - return true; } @@ -394,7 +366,6 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x10; // Party leader } } - if (clan != null) { relation |= 0x20; // Clan member @@ -403,12 +374,10 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x40; // Clan leader } } - if (player.isInSiege()) { relation |= 0x80; // In siege } - return relation; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java index 283bcf1614..90c416726a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java @@ -36,7 +36,6 @@ public class ValidateLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java index 4d8f9683d0..83f72bf981 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java @@ -40,7 +40,6 @@ public class ValidateLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java index b684e70bdc..71367cd26d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java @@ -36,7 +36,6 @@ public class VehicleCheckLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_CHECK_LOCATION.writeId(packet); - packet.writeD(_boat.getObjectId()); packet.writeD(_boat.getX()); packet.writeD(_boat.getY()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java index a4a5780f30..5b565c08b7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java @@ -46,7 +46,6 @@ public class VehicleDeparture implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_DEPARTURE.writeId(packet); - packet.writeD(_objId); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java index ec611028bf..4a995a6352 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java @@ -44,7 +44,6 @@ public class VehicleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java index 207a6fd899..bf629dcbbc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java @@ -42,7 +42,6 @@ public class VehicleStarted implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_START.writeId(packet); - packet.writeD(_objectId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 35ca986d35..5eb9eb7ab9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -30,6 +30,7 @@ public class WareHouseDepositList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; public static final int FREIGHT = 1; + private final int _sendType; private final long _playerAdena; private final List _items = new ArrayList<>(); @@ -49,7 +50,6 @@ public class WareHouseDepositList extends AbstractItemPacket _sendType = sendType; _whType = type; _playerAdena = player.getAdena(); - final boolean isPrivate = _whType == PRIVATE; for (Item temp : player.getInventory().getAvailableItems(true, isPrivate, false)) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 7af1cd273c..5ece99310a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -32,6 +32,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private final int _sendType; private Player _player; private long _playerAdena; @@ -60,7 +61,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } - _items = _player.getActiveWarehouse().getItems(); for (Item item : _items) { @@ -78,15 +78,15 @@ public class WareHouseWithdrawalList extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeH(0x00); + packet.writeH(0); packet.writeD(_invSize); packet.writeD(_items.size()); for (Item item : _items) { writeItem(packet, item); packet.writeD(item.getObjectId()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } else diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java index 5f2dd05f3b..aea1476fb2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java @@ -35,8 +35,7 @@ public class ExDivideAdenaCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_CANCEL.writeId(packet); - - packet.writeC(0x00); // TODO: Find me + packet.writeC(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java index 6af912cebf..de4e955aba 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java @@ -46,9 +46,8 @@ public class ExDivideAdenaDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_DONE.writeId(packet); - - packet.writeC(_isPartyLeader ? 0x01 : 0x00); - packet.writeC(_isCCLeader ? 0x01 : 0x00); + packet.writeC(_isPartyLeader ? 1 : 0); + packet.writeC(_isCCLeader ? 1 : 0); packet.writeD(_memberCount); packet.writeQ(_distributedAdenaCount); packet.writeQ(_adenaCount); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index 549def456e..84b5fead76 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -43,7 +43,6 @@ public class ExChooseShapeShiftingItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_SHAPE_SHIFTING_ITEM.writeId(packet); - packet.writeD(_targetType != null ? _targetType.ordinal() : 0); packet.writeD(_type != null ? _type.ordinal() : 0); packet.writeD(_itemId); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java index 33fb439aa5..ba55887a1a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java @@ -45,7 +45,6 @@ public class ExCuriousHouseMemberUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_UPDATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_maxHp); packet.writeD(_maxCp); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java index 8ad3659725..be2d29d864 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPacket { - public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0x00); - public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(0x01); + public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0); + public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(1); private final int _result; @@ -39,7 +39,6 @@ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPa public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_EXTRACTION_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java index ec82cc14f3..e84d7a7255 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; public static final ExPutShapeShiftingTargetItemResult FAILED = new ExPutShapeShiftingTargetItemResult(RESULT_FAILED, 0); @@ -43,7 +43,6 @@ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_resultId); packet.writeQ(_price); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java index f4d3118cc4..038eae0042 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExShapeShiftingResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; - public static final int RESULT_CLOSE = 0x02; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; + public static final int RESULT_CLOSE = 2; public static final ExShapeShiftingResult FAILED = new ExShapeShiftingResult(RESULT_FAILED, 0, 0); public static final ExShapeShiftingResult CLOSE = new ExShapeShiftingResult(RESULT_CLOSE, 0, 0); @@ -47,7 +47,6 @@ public class ExShapeShiftingResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHAPE_SHIFTING_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_targetItemId); packet.writeD(_extractItemId); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java index eaf0d209fd..4b48b09002 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java @@ -38,7 +38,7 @@ public class ExConfirmVipAttendanceCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CONFIRM_VIP_ATTENDANCE_CHECK.writeId(packet); - packet.writeC(_available ? 0x01 : 0x00); // can receive reward today? 1 else 0 + packet.writeC(_available ? 1 : 0); // can receive reward today? 1 else 0 packet.writeC(_index); // active reward index packet.writeD(0); packet.writeD(0); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java index 9d61fe68d6..dd94df023f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java @@ -45,10 +45,10 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket OutgoingPackets.EX_VIP_ATTENDANCE_ITEM_LIST.writeId(packet); packet.writeC(_available ? _index + 1 : _index); // index to receive? packet.writeC(_index); // last received index? - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeC(0x01); - packet.writeC(_available ? 0x01 : 0x00); // player can receive reward today? + packet.writeD(0); + packet.writeD(0); + packet.writeC(1); + packet.writeC(_available ? 1 : 0); // player can receive reward today? packet.writeC(250); packet.writeC(AttendanceRewardData.getInstance().getRewardsCount()); // reward size int rewardCounter = 0; @@ -57,11 +57,11 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket rewardCounter++; packet.writeD(reward.getId()); packet.writeQ(reward.getCount()); - packet.writeC(0x01); // is unknown? - packet.writeC((rewardCounter % 7) == 0 ? 0x01 : 0x00); // is last in row? + packet.writeC(1); // is unknown? + packet.writeC((rewardCounter % 7) == 0 ? 1 : 0); // is last in row? } - packet.writeC(0x00); - packet.writeD(0x00); + packet.writeC(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java index 4c3ae253ea..c79b68becc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java @@ -39,7 +39,6 @@ public class ExResponseCommissionBuyInfo extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_INFO.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java index ddfa8b6db1..c1d29735b8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java @@ -40,7 +40,6 @@ public class ExResponseCommissionBuyItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_ITEM.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java index aa4bbbde24..01e4782408 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java @@ -39,7 +39,6 @@ public class ExResponseCommissionDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_DELETE.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java index e7e3c39816..b915574175 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java @@ -55,7 +55,6 @@ public class ExResponseCommissionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_INFO.writeId(packet); - packet.writeD(_result); packet.writeD(_itemId); packet.writeQ(_presetPricePerUnit); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java index 4963393b42..a012b3ab30 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java @@ -64,7 +64,6 @@ public class ExResponseCommissionList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_LIST.writeId(packet); - packet.writeD(_replyType.getClientId()); switch (_replyType) { @@ -73,13 +72,11 @@ public class ExResponseCommissionList extends AbstractItemPacket { packet.writeD((int) Instant.now().getEpochSecond()); packet.writeD(_chunkId); - int chunkSize = _items.size() - _listIndexStart; if (chunkSize > MAX_CHUNK_SIZE) { chunkSize = MAX_CHUNK_SIZE; } - packet.writeD(chunkSize); for (int i = _listIndexStart; i < (_listIndexStart + chunkSize); i++) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java index b1b0a97d7a..183547af06 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java @@ -39,7 +39,6 @@ public class ExResponseCommissionRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_REGISTER.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java index 74d8a95587..b68386e4ed 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java @@ -35,8 +35,7 @@ public class ExShowCommission implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_COMMISSION.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java index 0c267ecf34..11b1ff1e0a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExEnchantFail implements IClientOutgoingPacket { public static final ExEnchantFail STATIC_PACKET = new ExEnchantFail(0, 0); + private final int _itemOne; private final int _itemTwo; @@ -39,7 +40,6 @@ public class ExEnchantFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_FAIL.writeId(packet); - packet.writeD(_itemOne); packet.writeD(_itemTwo); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java index 71ba811ed5..87d29a8e7c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java @@ -36,7 +36,6 @@ public class ExEnchantSucess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SUCESS.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java index eb4eb8b26c..ec67d50fb6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java @@ -39,7 +39,6 @@ public class ExGetCrystalizingEstimation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - packet.writeD(_items.size()); for (ItemChanceHolder holder : _items) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java index ac16c14f5b..ebf5b64751 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java @@ -43,18 +43,18 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket } OutgoingPackets.EX_CONNECTED_TIME_AND_GETTABLE_REWARD.writeId(packet); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_oneDayRewardAvailableCount); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index a8f3304739..f11ae5f478 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -62,7 +62,6 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket } OutgoingPackets.EX_ONE_DAY_RECEIVE_REWARD_LIST.writeId(packet); - packet.writeD(_dayRemainTime); packet.writeD(_weekRemainTime); packet.writeD(_monthRemainTime); @@ -74,7 +73,7 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket { packet.writeH(reward.getId()); packet.writeC(reward.getStatus(_player)); - packet.writeC(reward.getRequiredCompletions() > 1 ? 0x01 : 0x00); + packet.writeC(reward.getRequiredCompletions() > 1 ? 1 : 0); packet.writeD(Math.min(reward.getProgress(_player), _player.getLevel())); packet.writeD(reward.getRequiredCompletions()); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java index fa605b548a..a99ad7f4e3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java @@ -52,7 +52,7 @@ public class ExFishingStart implements IClientOutgoingPacket packet.writeD(_baitLocation.getX()); packet.writeD(_baitLocation.getY()); packet.writeD(_baitLocation.getZ()); - packet.writeC(0x01); // 0 = newbie, 1 = normal, 2 = night + packet.writeC(1); // 0 = newbie, 1 = normal, 2 = night return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java index 046ad04cb6..74501fe7ff 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java @@ -49,7 +49,6 @@ public class ExUserInfoFishing implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_FISHING.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_isFishing ? 1 : 0); if (_baitLocation == null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index dc0e3e05bc..336a384bcc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -47,9 +47,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FRIEND_DETAIL_INFO.writeId(packet); - packet.writeD(_objectId); - if (_friend == null) { packet.writeS(_name); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java index 0d4bb47ff0..a90b7b6083 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java @@ -33,8 +33,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x00); + packet.writeC(0); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java index 9add9c9caa..d24139644c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java @@ -49,7 +49,6 @@ public class FriendAddRequestResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_charId); packet.writeS(_charName); @@ -57,7 +56,7 @@ public class FriendAddRequestResult implements IClientOutgoingPacket packet.writeD(_charObjectId); packet.writeD(_charLevel); packet.writeD(_charClassId); - packet.writeH(0x00); // Always 0 on retail + packet.writeH(0); // Always 0 on retail return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java index a135944662..13a7d01967 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java @@ -86,12 +86,10 @@ public class FriendList implements IClientOutgoingPacket } continue; } - if (player1.isOnline()) { online = true; } - classid = player1.getClassId().getId(); level = player1.getLevel(); _info.add(new FriendInfo(objId, name, online, classid, level)); @@ -102,14 +100,13 @@ public class FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._classid); packet.writeD(info._level); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java index 07c23f9fd2..1bb4142e34 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java @@ -38,7 +38,6 @@ public class FriendRemove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_REMOVE.writeId(packet); - packet.writeD(_responce); packet.writeS(_charName); return true; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java index e8dbddcd63..a3990c0879 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java @@ -52,7 +52,6 @@ public class FriendStatus implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_STATUS.writeId(packet); - packet.writeD(_type); packet.writeS(_name); switch (_type) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java index 8752104e06..78da5850b8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java @@ -50,7 +50,6 @@ public class L2Friend implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND.writeId(packet); - packet.writeD(_action ? 1 : 3); // 1-add 3-remove packet.writeD(_objid); packet.writeS(_name); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java index b69a253635..e50693cb11 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java @@ -81,17 +81,16 @@ public class L2FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._level); packet.writeD(info._classId); - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java index 677c09091f..706c179a9c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java @@ -37,7 +37,6 @@ public class ExMentorAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_ADD.writeId(packet); - packet.writeS(_mentor.getName()); packet.writeD(_mentor.getActiveClass()); packet.writeD(_mentor.getLevel()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java index 4722a9cab3..18c1cdeedf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java @@ -64,9 +64,8 @@ public class ExMentorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_LIST.writeId(packet); - packet.writeD(_type); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mentees.size()); for (Mentee mentee : _mentees) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java index d739dd94b7..2283920b98 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ListMenteeWaiting implements IClientOutgoingPacket { private static final int PLAYERS_PER_PAGE = 64; + private final List _possibleCandiates = new ArrayList<>(); private final int _page; @@ -51,18 +52,15 @@ public class ListMenteeWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_MENTEE_WAITING.writeId(packet); - - packet.writeD(0x01); // always 1 in retail + packet.writeD(1); // always 1 in retail if (_possibleCandiates.isEmpty()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } - packet.writeD(_possibleCandiates.size()); packet.writeD(_possibleCandiates.size() % PLAYERS_PER_PAGE); - for (Player player : _possibleCandiates) { if ((1 <= (PLAYERS_PER_PAGE * _page)) && (1 > (PLAYERS_PER_PAGE * (_page - 1)))) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java index fd8875aedd..c5a96dd099 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java @@ -34,12 +34,12 @@ public class ExPledgeBonusList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_BONUS_LIST.writeId(packet); - packet.writeC(0x00); // 140 + packet.writeC(0); // 140 ClanRewardData.getInstance().getClanRewardBonuses(ClanRewardType.MEMBERS_ONLINE).stream().sorted(Comparator.comparingInt(ClanRewardBonus::getLevel)).forEach(bonus -> { packet.writeD(bonus.getSkillReward().getSkillId()); }); - packet.writeC(0x01); // 140 + packet.writeC(1); // 140 ClanRewardData.getInstance().getClanRewardBonuses(ClanRewardType.HUNTING_MONSTERS).stream().sorted(Comparator.comparingInt(ClanRewardBonus::getLevel)).forEach(bonus -> { packet.writeD(bonus.getItemReward().getId()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java index 81fd4fe6aa..ac4f03e25c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java @@ -50,7 +50,6 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Player: " + _player + " attempting to write to a null clan!"); return false; } - final ClanRewardBonus highestMembersOnlineBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.MEMBERS_ONLINE); final ClanRewardBonus highestHuntingBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.HUNTING_MONSTERS); final ClanRewardBonus membersOnlineBonus = ClanRewardType.MEMBERS_ONLINE.getAvailableBonus(clan); @@ -75,25 +74,22 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Couldn't find item reward for highest available hunting bonus!!"); return false; } - // General OP Code OutgoingPackets.EX_PLEDGE_BONUS_OPEN.writeId(packet); - // Members online bonus packet.writeD(highestMembersOnlineBonus.getRequiredAmount()); packet.writeD(clan.getMaxOnlineMembers()); - packet.writeC(0x00); // 140 - packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0x00); - packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 0x01 : 0x00); - + packet.writeC(0); // 140 + packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0); + packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 1 : 0); // Hunting bonus packet.writeD(highestHuntingBonus.getRequiredAmount()); packet.writeD(clan.getHuntingPoints()); - packet.writeC(0x00); // 140 - packet.writeD(huntingBonus != null ? highestHuntingBonus.getItemReward().getId() : 0x00); - packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 0x01 : 0x00); + packet.writeC(0); // 140 + packet.writeD(huntingBonus != null ? highestHuntingBonus.getItemReward().getId() : 0); + packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index fb735b8925..e75426e598 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -69,7 +69,6 @@ public class ExBRBuyProduct implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUY_PRODUCT.writeId(packet); - packet.writeD(_reply); return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java index 742b3eba9d..91a186b81d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java @@ -39,10 +39,9 @@ public class ExBRGamePoint implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_GAME_POINT.writeId(packet); - packet.writeD(_charId); packet.writeQ(_charPoints); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java index 50f21df46a..e36f2ff502 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java @@ -45,7 +45,6 @@ public class ExBRProductInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_INFO.writeId(packet); - packet.writeD(_item.getBrId()); packet.writeD(_item.getPrice()); packet.writeD(_item.getItems().size()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java index dc851ffd43..0f042ba043 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java @@ -45,9 +45,8 @@ public class ExBRProductList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); // Adena - packet.writeQ(0x00); // Hero coins + packet.writeQ(0); // Hero coins packet.writeC(_type); // Type 0 - Home, 1 - History, 2 - Favorites packet.writeD(_primeList.size()); for (PrimeShopGroup brItem : _primeList) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java index b23e9fa8a9..f4406c1407 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java @@ -38,7 +38,6 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RAID_BOSS_SPAWN_INFO.writeId(packet); - packet.writeD(_bossIds.size()); // alive count for (int id : _bossIds) // alive ids { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java index 2463589c81..c09b3e899d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java @@ -47,18 +47,15 @@ public class ExFlyMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_mapId); - packet.writeD(_locations.size()); for (SayuneEntry loc : _locations) { packet.writeD(loc.getId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(loc.getX()); packet.writeD(loc.getY()); packet.writeD(loc.getZ()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java index 03fc6b580d..70b3fb25d2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java @@ -47,16 +47,13 @@ public class ExFlyMoveBroadcast implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE_BROADCAST.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); packet.writeD(_mapId); - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD(_currentLoc.getX()); packet.writeD(_currentLoc.getY()); packet.writeD(_currentLoc.getZ()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java index cfe11a27e0..49e5d86910 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java @@ -35,7 +35,6 @@ public class ExNotifyFlyMoveStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_FLY_MOVE_START.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java index d5640a47ef..0efa37ae8c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java @@ -51,7 +51,6 @@ public class ExMoveToLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_SUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_targetX); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java index 0cbe2c3e02..a0314c39aa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java @@ -46,7 +46,6 @@ public class ExShuttleGetOff implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_OFF.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java index 5211bef5ba..061bcafed9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java @@ -43,7 +43,6 @@ public class ExShuttleGetOn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_ON.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java index 97d54a9019..c8aee1fde7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java @@ -43,7 +43,6 @@ public class ExShuttleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHUTTLE_INFO.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD(_shuttle.getX()); packet.writeD(_shuttle.getY()); @@ -60,8 +59,8 @@ public class ExShuttleInfo implements IClientOutgoingPacket packet.writeD(loc.getY()); packet.writeD(loc.getZ()); } - packet.writeD(stop.isDoorOpen() ? 0x01 : 0x00); - packet.writeD(stop.hasDoorChanged() ? 0x01 : 0x00); + packet.writeD(stop.isDoorOpen() ? 1 : 0); + packet.writeD(stop.hasDoorChanged() ? 1 : 0); } return true; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java index 6ba38f29a1..28b33b998e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java @@ -43,7 +43,6 @@ public class ExShuttleMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_MOVE.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD((int) _shuttle.getStat().getMoveSpeed()); packet.writeD((int) _shuttle.getStat().getRotationSpeed()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java index bf2b6ea6eb..6c31189d6a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java @@ -44,7 +44,6 @@ public class ExStopMoveInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_SHUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java index f7f6849732..8492f42a6e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java @@ -44,7 +44,6 @@ public class ExValidateLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_SHUTTLE.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipProductList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipProductList.java index e2ced450b3..562f88d22b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipProductList.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipProductList.java @@ -45,13 +45,11 @@ public class ReceiveVipProductList implements IClientOutgoingPacket } final Collection products = PrimeShopData.getInstance().getPrimeItems().values(); final PrimeShopGroup gift = PrimeShopData.getInstance().getVipGiftOfTier(_player.getVipTier()); - OutgoingPackets.RECIVE_VIP_PRODUCT_LIST.writeId(packet); packet.writeQ(_player.getAdena()); packet.writeQ(_player.getGoldCoin()); // Gold Coin Amount packet.writeQ(_player.getSilverCoin()); // Silver Coin Amount packet.writeC(1); // Show Reward tab - if (gift != null) { packet.writeD(products.size() + 1); @@ -61,7 +59,6 @@ public class ReceiveVipProductList implements IClientOutgoingPacket { packet.writeD(products.size()); } - for (PrimeShopGroup product : products) { writeProduct(product, packet); @@ -79,7 +76,6 @@ public class ReceiveVipProductList implements IClientOutgoingPacket buffer.writeC(product.getPanelType()); // NEW - 6; HOT - 5 ... Unk buffer.writeC(product.getVipTier()); buffer.writeC(10); - buffer.writeC(product.getItems().size()); for (PrimeShopItem item : product.getItems()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java index 1d59c6d002..e7654ed911 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java @@ -60,7 +60,7 @@ public class AccountKicked implements IOutgoingPacket { OutgoingPackets.ACCOUNT_KICKED.writeId(packet); packet.writeD(_reason.getCode()); - return true; } } + diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 2e3a1f6163..1fe813e393 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: response + * Format: d d: response */ public class GGAuth implements IOutgoingPacket { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/network/serverpackets/Init.java index 4b3f71f30e..d725f45ca2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/network/serverpackets/Init.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/network/serverpackets/Init.java @@ -52,7 +52,6 @@ public class Init implements IOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.INIT.writeId(packet); - packet.writeD(_sessionId); // session id packet.writeD(0x0000c621); // protocol revision diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index 8c534554a8..f4dcd22b00 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: the failure reason + * Format: d d: the failure reason */ public class LoginFail implements IOutgoingPacket { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/network/BaseRecievePacket.java index c682cb741d..a6ed15ce32 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/network/BaseRecievePacket.java @@ -73,7 +73,7 @@ public abstract class BaseRecievePacket try { result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE); - result = result.substring(0, result.indexOf(0x00)); + result = result.substring(0, result.indexOf(0)); _off += (result.length() * 2) + 2; } catch (Exception e) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/network/BaseSendablePacket.java index a9d918de4c..8fa8491cbf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/network/BaseSendablePacket.java @@ -117,16 +117,16 @@ public abstract class BaseSendablePacket public byte[] getBytes() { // if (this instanceof Init) - // writeD(0x00); // reserve for XOR initial key + // writeD(0); // reserve for XOR initial key - writeD(0x00); // reserve for checksum + writeD(0); // reserve for checksum final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++) { - writeC(0x00); + writeC(0); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/AttackType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/AttackType.java index 6064b10ed7..e9983f15e3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/AttackType.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/AttackType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum AttackType { - MISSED(0x01), - BLOCKED(0x02), - CRITICAL(0x04), - SHOT_USED(0x08); + MISSED(1), + BLOCKED(2), + CRITICAL(4), + SHOT_USED(8); private final int _mask; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/GroupType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/GroupType.java index 954aaace8b..916a14fd05 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/GroupType.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/GroupType.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum GroupType implements IUpdateTypeComponent { - NONE(0x01), - PARTY(0x02), - COMMAND_CHANNEL(0x04); + NONE(1), + PARTY(2), + COMMAND_CHANNEL(4); private int _mask; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/ItemListType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/ItemListType.java index 2d38c8f5b1..c80234439f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/ItemListType.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/ItemListType.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum ItemListType implements IUpdateTypeComponent { - AUGMENT_BONUS(0x01), - ELEMENTAL_ATTRIBUTE(0x02), - ENCHANT_EFFECT(0x04), - VISUAL_ID(0x08), - SOUL_CRYSTAL(0x10); + AUGMENT_BONUS(1), + ELEMENTAL_ATTRIBUTE(2), + ENCHANT_EFFECT(4), + VISUAL_ID(8), + SOUL_CRYSTAL(16); private final int _mask; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java index b3d08596c6..29403b783d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum MacroUpdateType { - ADD(0x01), - LIST(0x01), - MODIFY(0x02), - DELETE(0x00); + ADD(1), + LIST(1), + MODIFY(2), + DELETE(0); private final int _id; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java index 86c6159869..7776721c0f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java @@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum PartySmallWindowUpdateType implements IUpdateTypeComponent { - CURRENT_CP(0x01), - MAX_CP(0x02), - CURRENT_HP(0x04), - MAX_HP(0x08), - CURRENT_MP(0x10), - MAX_MP(0x20), - LEVEL(0x40), - CLASS_ID(0x80), - PARTY_SUBSTITUTE(0x100), - VITALITY_POINTS(0x200); + CURRENT_CP(1), + MAX_CP(2), + CURRENT_HP(4), + MAX_HP(8), + CURRENT_MP(16), + MAX_MP(32), + LEVEL(64), + CLASS_ID(128), + PARTY_SUBSTITUTE(256), + VITALITY_POINTS(512); private final int _mask; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 00bb331778..667ce7f17c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.Broadcast; import org.l2jmobius.gameserver.util.Util; /** - * Fromat:(ch) dddddc + * Format:(ch) dddddc * @author -Wooden- */ public class RequestExMagicSkillUseGround implements IClientIncomingPacket diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java index 8744393432..033095e74d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java @@ -39,7 +39,6 @@ public class AbnormalStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ABNORMAL_STATUS_UPDATE.writeId(packet); - packet.writeH(_effects.size()); for (BuffInfo info : _effects) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 1b8ddb2042..bec794bef3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -44,7 +44,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; } @@ -60,7 +59,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; setHtml(html); } @@ -77,13 +75,11 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } - if (!html.contains(""; return; } - _html = html; } @@ -96,7 +92,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } - setHtml(content); return true; } @@ -138,12 +133,10 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { player.clearHtmlActions(getScope()); } - if (_disabledValidation) { return; } - if (player != null) { Util.buildHtmlActionCache(player, getScope(), _npcObjId, _html); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index e9cd6a88b8..b99d4d3348 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -86,8 +86,8 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket= 0) || (item.getAttributeDefence(AttributeType.FIRE) > 0) || (item.getAttributeDefence(AttributeType.WATER) > 0) || (item.getAttributeDefence(AttributeType.WIND) > 0) || (item.getAttributeDefence(AttributeType.EARTH) > 0) || (item.getAttributeDefence(AttributeType.HOLY) > 0) || (item.getAttributeDefence(AttributeType.DARK) > 0)) { mask |= ItemListType.ELEMENTAL_ATTRIBUTE.getMask(); } - if (item.getEnchantOptions() != null) { for (int id : item.getEnchantOptions()) @@ -184,17 +182,14 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket 0) { mask |= ItemListType.VISUAL_ID.getMask(); } - if (((item.getSoulCrystalOptions() != null) && !item.getSoulCrystalOptions().isEmpty()) || ((item.getSoulCrystalSpecialOptions() != null) && !item.getSoulCrystalSpecialOptions().isEmpty())) { mask |= ItemListType.SOUL_CRYSTAL.getMask(); } - return mask; } @@ -262,7 +257,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); packet.writeC(removeSkills.size()); for (Skill removed : removeSkills) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java index 8fa6259f64..6451dffd02 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ActionFailed implements IClientOutgoingPacket { public static final ActionFailed STATIC_PACKET = new ActionFailed(); - private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); + private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); static { for (SkillCastingType castingType : SkillCastingType.values()) @@ -57,7 +57,6 @@ public class ActionFailed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ACTION_FAIL.writeId(packet); - packet.writeD(_castingType); // MagicSkillUse castingType return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java index 6e868368c9..30ce58da60 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java @@ -44,9 +44,8 @@ public class AgitDecoInfo implements IClientOutgoingPacket { continue; } - packet.writeC(_residense.hasFunction(type) ? 0x01 : 0x00); + packet.writeC(_residense.hasFunction(type) ? 1 : 0); } - // Unknown packet.writeD(0); // TODO: Find me! packet.writeD(0); // TODO: Find me! diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java index 6cb71fc985..4683fb30f0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java @@ -44,7 +44,6 @@ public class AllianceInfo implements IClientOutgoingPacket _name = leader.getAllyName(); _leaderC = leader.getName(); _leaderP = leader.getLeaderName(); - final Collection allies = ClanTable.getInstance().getClanAllies(allianceId); _allies = new ClanInfo[allies.size()]; int idx = 0; @@ -57,7 +56,6 @@ public class AllianceInfo implements IClientOutgoingPacket total += ci.getTotal(); online += ci.getOnline(); } - _total = total; _online = online; } @@ -66,18 +64,16 @@ public class AllianceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_INFO.writeId(packet); - packet.writeS(_name); packet.writeD(_total); packet.writeD(_online); packet.writeS(_leaderC); packet.writeS(_leaderP); - packet.writeD(_allies.length); for (ClanInfo aci : _allies) { packet.writeS(aci.getClan().getName()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(aci.getClan().getLevel()); packet.writeS(aci.getClan().getLeaderName()); packet.writeD(aci.getTotal()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java index f9d08f6600..186fd12e81 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java @@ -44,7 +44,6 @@ public class AllyCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java index 6218f1717f..1ae4653f91 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java @@ -38,7 +38,6 @@ public class AskJoinAlly implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_ALLIANCE.writeId(packet); - packet.writeD(_requestorObjId); packet.writeS(null); // Ally Name ? packet.writeS(null); // TODO: Find me! diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java index a66bb3cd33..b9cfbe81b9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java @@ -39,7 +39,6 @@ public class AskJoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_PARTY.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 05c420ff59..227ab571be 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -45,7 +45,6 @@ public class Attack implements IClientOutgoingPacket _attackerObjId = attacker.getObjectId(); _attackerLoc = new Location(attacker); _targetLoc = new Location(target); - final Player player = attacker.getActingPlayer(); if (player == null) { @@ -111,7 +110,6 @@ public class Attack implements IClientOutgoingPacket final Iterator it = _hits.iterator(); final Hit firstHit = it.next(); OutgoingPackets.ATTACK.writeId(packet); - packet.writeD(_attackerObjId); packet.writeD(firstHit.getTargetId()); packet.writeD(_soulshotVisualSubstitute); // Ertheia @@ -121,13 +119,11 @@ public class Attack implements IClientOutgoingPacket packet.writeD(_attackerLoc.getX()); packet.writeD(_attackerLoc.getY()); packet.writeD(_attackerLoc.getZ()); - packet.writeH(_hits.size() - 1); while (it.hasNext()) { writeHit(packet, it.next()); } - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java index bd6878eb42..8b85fe85e3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java @@ -35,7 +35,6 @@ public class AutoAttackStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_START.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java index e767d1877a..a294b1e212 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java @@ -35,7 +35,6 @@ public class AutoAttackStop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_STOP.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java index 3f329415df..0c79677eae 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java @@ -38,7 +38,6 @@ public class BlockListPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BLOCK_LIST.writeId(packet); - packet.writeD(_playersId.size()); for (int playerId : _playersId) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index f610cdc6aa..d95f0543b9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -45,8 +45,7 @@ public class BuyList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x00); // Type BUY + packet.writeD(0); // Type BUY packet.writeQ(_money); // current money packet.writeD(_listId); packet.writeD(_inventorySlots); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index cd25af908d..7cb2bf4425 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -50,36 +50,34 @@ public class BuyListSeed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BUY_LIST_SEED.writeId(packet); - packet.writeQ(_money); // current money - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeD(_manorId); // manor id - if (!_list.isEmpty()) { packet.writeH(_list.size()); // list length for (SeedProduction s : _list) { - packet.writeC(0x00); // mask item 0 to print minimal item information + packet.writeC(0); // mask item 0 to print minimal item information packet.writeD(s.getId()); // ObjectId packet.writeD(s.getId()); // ItemId packet.writeC(0xFF); // T1 packet.writeQ(s.getAmount()); // Quantity - packet.writeC(0x05); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item - packet.writeC(0x00); // Filler (always 0) - packet.writeH(0x00); // Equipped : 00-No, 01-yes - packet.writeQ(0x00); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand - packet.writeH(0x00); // Enchant level (pet level shown in control item) + packet.writeC(5); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item + packet.writeC(0); // Filler (always 0) + packet.writeH(0); // Equipped : 00-No, 01-yes + packet.writeQ(0); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand + packet.writeH(0); // Enchant level (pet level shown in control item) packet.writeD(-1); packet.writeD(-9999); - packet.writeC(0x01); // GOD Item enabled = 1 disabled (red) = 0 + packet.writeC(1); // GOD Item enabled = 1 disabled (red) = 0 packet.writeQ(s.getPrice()); // price } _list.clear(); } else { - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java index 3a7b67af23..f3dc872dca 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java @@ -32,8 +32,7 @@ public class CSShowComBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - - packet.writeC(0x01); // c4 1 to show community 00 to hide + packet.writeC(1); // c4 1 to show community 00 to hide packet.writeB(_html); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java index eacc27aa07..b18dac4cc3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java @@ -36,7 +36,6 @@ public class CameraMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CAMERA_MODE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java index 1682f5bc62..adea754676 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java @@ -39,7 +39,6 @@ public class ChairSit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAIR_SIT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_staticObjectId); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java index 2bc31a285a..de141fa067 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java @@ -38,7 +38,6 @@ public class ChangeMoveType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_MOVE_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_running ? RUN : WALK); packet.writeD(0); // c2 diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index 73277d923d..fbe5e39e2e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -22,17 +22,17 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ChangeWaitType implements IClientOutgoingPacket { + public static final int WT_SITTING = 0; + public static final int WT_STANDING = 1; + public static final int WT_START_FAKEDEATH = 2; + public static final int WT_STOP_FAKEDEATH = 3; + private final int _objectId; private final int _moveType; private final int _x; private final int _y; private final int _z; - public static final int WT_SITTING = 0; - public static final int WT_STANDING = 1; - public static final int WT_START_FAKEDEATH = 2; - public static final int WT_STOP_FAKEDEATH = 3; - public ChangeWaitType(Creature creature, int newMoveType) { _objectId = creature.getObjectId(); @@ -46,7 +46,6 @@ public class ChangeWaitType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_WAIT_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_moveType); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index 41180bac50..aa2e7b2eaa 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -30,7 +30,6 @@ public class CharCreateFail implements IClientOutgoingPacket public static final int REASON_CREATE_NOT_ALLOWED = 0x05; // "Characters cannot be created from this server." public static final int REASON_CHOOSE_ANOTHER_SVR = 0x06; // "Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please // choose another server." - private final int _error; public CharCreateFail(int errorCode) @@ -42,7 +41,6 @@ public class CharCreateFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index f0e99885ad..768617e558 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -31,8 +31,7 @@ public class CharCreateOk implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_SUCCESS.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index bed289ca0a..1674eef343 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -33,7 +33,6 @@ public class CharDeleteFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_DELETE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index b6769d53f9..41342219f0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -33,6 +33,22 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { + private static final int[] PAPERDOLL_ORDER = new int[] + { + Inventory.PAPERDOLL_UNDER, + Inventory.PAPERDOLL_HEAD, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_LHAND, + Inventory.PAPERDOLL_GLOVES, + Inventory.PAPERDOLL_CHEST, + Inventory.PAPERDOLL_LEGS, + Inventory.PAPERDOLL_FEET, + Inventory.PAPERDOLL_CLOAK, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_HAIR, + Inventory.PAPERDOLL_HAIR2 + }; + private final Player _player; private final Clan _clan; private int _objId; @@ -55,22 +71,6 @@ public class CharInfo implements IClientOutgoingPacket private int _vehicleId = 0; private final boolean _gmSeeInvis; - private static final int[] PAPERDOLL_ORDER = new int[] - { - Inventory.PAPERDOLL_UNDER, - Inventory.PAPERDOLL_HEAD, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_LHAND, - Inventory.PAPERDOLL_GLOVES, - Inventory.PAPERDOLL_CHEST, - Inventory.PAPERDOLL_LEGS, - Inventory.PAPERDOLL_FEET, - Inventory.PAPERDOLL_CLOAK, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_HAIR, - Inventory.PAPERDOLL_HAIR2 - }; - public CharInfo(Player player, boolean gmSeeInvis) { _player = player; @@ -119,16 +119,15 @@ public class CharInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); // Confirmed packet.writeD(_y); // Confirmed packet.writeD(_z); // Confirmed packet.writeD(_vehicleId); // Confirmed packet.writeD(_objId); // Confirmed packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed - packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) @@ -152,10 +151,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.getPvpFlag()); packet.writeD(_player.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -166,53 +163,40 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); - packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeS(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle()); - packet.writeD(_player.getAppearance().getVisibleClanId()); packet.writeD(_player.getAppearance().getVisibleClanCrestId()); packet.writeD(_player.getAppearance().getVisibleAllyId()); packet.writeD(_player.getAppearance().getVisibleAllyCrestId()); - - packet.writeC(_player.isSitting() ? 0x00 : 0x01); // Confirmed - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // Confirmed - packet.writeC(_player.isInCombat() ? 0x01 : 0x00); // Confirmed - - packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 0x01 : 0x00); // Confirmed - - packet.writeC(_player.isInvisible() ? 0x01 : 0x00); - + packet.writeC(_player.isSitting() ? 0 : 1); // Confirmed + packet.writeC(_player.isRunning() ? 1 : 0); // Confirmed + packet.writeC(_player.isInCombat() ? 1 : 0); // Confirmed + packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 1 : 0); // Confirmed + packet.writeC(_player.isInvisible() ? 1 : 0); packet.writeC(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount packet.writeC(_player.getPrivateStoreType().getId()); // Confirmed packet.writeH(_player.getCubics().size()); // Confirmed _player.getCubics().keySet().forEach(packet::writeH); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); // Confirmed packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); packet.writeH(_player.getRecomHave()); // Confirmed packet.writeD(_player.getMountNpcId() == 0 ? 0 : _player.getMountNpcId() + 1000000); - packet.writeD(_player.getClassId().getId()); // Confirmed - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeC(_player.isMounted() ? 0 : _enchantLevel); // Confirmed - packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeD(_player.getClanCrestLargeId()); packet.writeC(_player.isNoble() ? 1 : 0); // Confirmed packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 2 : 0); // 152 - Value for enabled changed to 2? packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed - final ILocational baitLocation = _player.getFishing().getBaitLocation(); if (baitLocation != null) { @@ -228,29 +212,21 @@ public class CharInfo implements IClientOutgoingPacket } packet.writeD(_player.getAppearance().getNameColor()); // Confirmed - packet.writeD(_heading); // Confirmed - packet.writeC(_player.getPledgeClass()); packet.writeH(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); // Confirmed - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - - packet.writeC(0x00); // nPvPRestrainStatus - + packet.writeC(0); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentHp())); // Confirmed packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - - packet.writeC(0x00); // cBRLectureMark + packet.writeC(0); // cBRLectureMark final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed @@ -262,8 +238,9 @@ public class CharInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } + packet.writeC(_player.isTrueHero() ? 100 : 0); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); // Hair accessory + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); // Hair accessory packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 7187b73184..11f5f4df52 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -40,17 +40,16 @@ public class CharSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTED.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getTitle()); packet.writeD(_sessionId); packet.writeD(_player.getClanId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x01); // active ?? + packet.writeD(1); // active ?? packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -62,25 +61,20 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_player.getReputation()); packet.writeD(_player.getPkKills()); packet.writeD(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_player.getClassId().getId()); - packet.writeB(new byte[16]); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeB(new byte[28]); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 9590634dc2..bf6e2d3b99 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -44,10 +44,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { private static final Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); - private final String _loginName; - private final int _sessionId; - private int _activeId; - private final List _characterPackages; private static final int[] PAPERDOLL_ORDER = new int[] { @@ -112,7 +108,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_ARTIFACT20, // 152 Inventory.PAPERDOLL_ARTIFACT21 // 152 }; - private static final int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, @@ -126,6 +121,11 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_HAIR2, }; + private final String _loginName; + private final int _sessionId; + private int _activeId; + private final List _characterPackages; + /** * Constructor for CharSelectionInfo. * @param loginName @@ -156,17 +156,14 @@ public class CharSelectionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.size(); packet.writeD(size); // Created character count - packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) - packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 0x01 : 0x00); // if 1 can't create new char - packet.writeC(0x01); // 0=can't play, 1=can play free until level 85, 2=100% free play - packet.writeD(0x02); // if 1, Korean client - packet.writeC(0x00); // Gift message for inactive accounts // 152 - packet.writeC(0x00); // Balthus Knights, if 1 suggests premium account - + packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 1 : 0); // if 1 can't create new char + packet.writeC(1); // 0=can't play, 1=can play free until level 85, 2=100% free play + packet.writeD(2); // if 1, Korean client + packet.writeC(0); // Gift message for inactive accounts // 152 + packet.writeC(0); // Balthus Knights, if 1 suggests premium account long lastAccess = 0; if (_activeId == -1) { @@ -179,7 +176,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - for (int i = 0; i < size; i++) { final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); @@ -187,90 +183,73 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name packet.writeD(_sessionId); // Account ID - packet.writeD(0x00); // Clan ID - packet.writeD(0x00); // Builder level - + packet.writeD(0); // Clan ID + packet.writeD(0); // Builder level packet.writeD(charInfoPackage.getSex()); // Sex packet.writeD(charInfoPackage.getRace()); // Race packet.writeD(charInfoPackage.getBaseClassId()); - - packet.writeD(0x01); // GameServerName - + packet.writeD(1); // GameServerName packet.writeD(charInfoPackage.getX()); packet.writeD(charInfoPackage.getY()); packet.writeD(charInfoPackage.getZ()); packet.writeF(charInfoPackage.getCurrentHp()); packet.writeF(charInfoPackage.getCurrentMp()); - packet.writeQ(charInfoPackage.getSp()); packet.writeQ(charInfoPackage.getExp()); packet.writeF((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel()))); // High // Five packet.writeD(charInfoPackage.getLevel()); - packet.writeD(charInfoPackage.getReputation()); packet.writeD(charInfoPackage.getPkKills()); packet.writeD(charInfoPackage.getPvPKills()); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); // Ertheia - packet.writeD(0x00); // Ertheia - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); // Ertheia + packet.writeD(0); // Ertheia for (int slot : getPaperdollOrder()) { packet.writeD(charInfoPackage.getPaperdollItemId(slot)); } - for (int slot : getPaperdollOrderVisualId()) { packet.writeD(charInfoPackage.getPaperdollItemVisualId(slot)); } - packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_CHEST)); // Upper Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_LEGS)); // Lower Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_HEAD)); // Headgear enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_GLOVES)); // Gloves enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_FEET)); // Boots enchant level - packet.writeD(charInfoPackage.getHairStyle()); packet.writeD(charInfoPackage.getHairColor()); packet.writeD(charInfoPackage.getFace()); - packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); - packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption1Id() : 0); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption2Id() : 0); - // packet.writeD(charInfoPackage.getTransformId()); // Used to display Transformations - packet.writeD(0x00); // Currently on retail when you are on character select you don't see your transformation. - - packet.writeD(0x00); // Pet NpcId - packet.writeD(0x00); // Pet level - packet.writeD(0x00); // Pet Food - packet.writeD(0x00); // Pet Food Level - packet.writeF(0x00); // Current pet HP - packet.writeF(0x00); // Current pet MP - + packet.writeD(0); // Currently on retail when you are on character select you don't see your transformation. + packet.writeD(0); // Pet NpcId + packet.writeD(0); // Pet level + packet.writeD(0); // Pet Food + packet.writeD(0); // Pet Food Level + packet.writeF(0); // Current pet HP + packet.writeF(0); // Current pet MP packet.writeD(charInfoPackage.getVitalityPoints()); // Vitality packet.writeD((int) Config.RATE_VITALITY_EXP_MULTIPLIER * 100); // Vitality Percent packet.writeD(charInfoPackage.getVitalityItemsUsed()); // Remaining vitality item uses - packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0x00 : 0x01); // Char is active or not - packet.writeC(charInfoPackage.isNoble() ? 0x01 : 0x00); - packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 0x02 : 0x00); // Hero glow - packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 0x01 : 0x00); // Show hair accessory if enabled + packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0 : 1); // Char is active or not + packet.writeC(charInfoPackage.isNoble() ? 1 : 0); + packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 2 : 0); // Hero glow + packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 1 : 0); // Show hair accessory if enabled } return true; } @@ -279,7 +258,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); - try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate")) { @@ -292,7 +270,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (charInfopackage != null) { characterList.add(charInfopackage); - final Player player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { @@ -306,7 +283,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return characterList; } @@ -348,7 +324,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { clan.removeClanMember(objectId, 0); } - GameClient.deleteCharByObjId(objectId); return null; } @@ -367,20 +342,16 @@ public class CharSelectionInfo implements IClientOutgoingPacket charInfopackage.setHairStyle(chardata.getInt("hairstyle")); charInfopackage.setHairColor(chardata.getInt("haircolor")); charInfopackage.setSex(chardata.getInt("sex")); - charInfopackage.setExp(chardata.getLong("exp")); charInfopackage.setSp(chardata.getLong("sp")); charInfopackage.setVitalityPoints(chardata.getInt("vitality_points")); charInfopackage.setClanId(chardata.getInt("clanid")); - charInfopackage.setRace(chardata.getInt("race")); - final int baseClassId = chardata.getInt("base_class"); final int activeClassId = chardata.getInt("classid"); charInfopackage.setX(chardata.getInt("x")); charInfopackage.setY(chardata.getInt("y")); charInfopackage.setZ(chardata.getInt("z")); - final int faction = chardata.getInt("faction"); if (faction == 1) { @@ -390,7 +361,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setEvil(); } - if (Config.MULTILANG_ENABLE) { String lang = chardata.getString("language"); @@ -400,22 +370,18 @@ public class CharSelectionInfo implements IClientOutgoingPacket } charInfopackage.setHtmlPrefix("data/lang/" + lang + "/"); } - // if is in subclass, load subclass exp, sp, level info if (baseClassId != activeClassId) { loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId); } - charInfopackage.setClassId(activeClassId); - // Get the augmentation id for equipped weapon int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); if (weaponObjId < 1) { weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); } - if (weaponObjId > 0) { try (Connection con = DatabaseFactory.getConnection(); @@ -441,7 +407,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } - // Check if the base class is set to zero and also doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly. if ((baseClassId == 0) && (activeClassId > 0)) { @@ -451,7 +416,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setBaseClassId(baseClassId); } - charInfopackage.setDeleteTimer(deletetime); charInfopackage.setLastAccess(chardata.getLong("lastAccess")); charInfopackage.setNoble(chardata.getInt("nobless") == 1); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java index 847e24db87..d59df7911a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java @@ -32,7 +32,6 @@ public class ChooseInventoryItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHOOSE_INVENTORY_ITEM.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java index 12a3940521..ac66c2fa0f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java @@ -32,7 +32,6 @@ public class ClientSetTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CLIENT_SET_TIME.writeId(packet); - packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // time in client minutes packet.writeD(6); // constant to match the server time( this determines the speed of the client clock) return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java index 43732f74fa..66a1f5e20d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java @@ -68,7 +68,6 @@ public class ConfirmDlg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CONFIRM_DLG.writeId(packet); - final SMParam[] params = _systemMessage.getParams(); packet.writeD(_systemMessage.getId()); packet.writeD(params.length); @@ -131,7 +130,6 @@ public class ConfirmDlg implements IClientOutgoingPacket } } } - packet.writeD(_time); packet.writeD(_requesterId); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 2a98428740..85d5630327 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -71,7 +71,6 @@ public class CreatureSay implements IClientOutgoingPacket _mask |= 0x08; } } - // Does not shows level if (sender.isGM()) { @@ -123,7 +122,6 @@ public class CreatureSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_sender == null ? 0 : _sender.getObjectId()); packet.writeD(_chatType.getClientId()); if (_senderName != null) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index dfc40d995f..a307b06e4b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -38,9 +38,8 @@ public class DeleteObject implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DELETE_OBJECT.writeId(packet); - packet.writeD(_objectId); - packet.writeC(0x00); // c2 + packet.writeC(0); // c2 return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java index 982c8f3311..3b5917e55b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java @@ -50,7 +50,6 @@ public class Dice implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DICE.writeId(packet); - packet.writeD(_objectId); // object id of player packet.writeD(_itemId); // item id of dice (spade) 4625,4626,4627,4628 packet.writeD(_number); // number rolled diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 3d741a86a6..ebc93d0fc4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -68,7 +68,6 @@ public class Die implements IClientOutgoingPacket siegeClan = fort.getSiege().getAttackerClan(clan); isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan); } - _toVillage = creature.canRevive() && !creature.isPendingRevive(); _toClanHall = (clan != null) && (clan.getHideoutId() > 0); _toCastle = ((clan != null) && (clan.getCastleId() > 0)) || isInCastleDefense; @@ -76,7 +75,6 @@ public class Die implements IClientOutgoingPacket _useFeather = creature.getAccessLevel().allowFixedRes() || creature.getInventory().haveItemForSelfResurrection(); _toFortress = ((clan != null) && (clan.getFortId() > 0)) || isInFortDefense; } - _isSweepable = creature.isAttackable() && creature.isSweepActive(); } @@ -91,7 +89,6 @@ public class Die implements IClientOutgoingPacket { _items = new ArrayList<>(8); } - if (_items.size() < 8) { _items.add(itemId); @@ -116,20 +113,18 @@ public class Die implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DIE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_toVillage ? 0x01 : 0x00); - packet.writeD(_toClanHall ? 0x01 : 0x00); - packet.writeD(_toCastle ? 0x01 : 0x00); - packet.writeD(_toOutpost ? 0x01 : 0x00); - packet.writeD(_isSweepable ? 0x01 : 0x00); - packet.writeD(_useFeather ? 0x01 : 0x00); - packet.writeD(_toFortress ? 0x01 : 0x00); - packet.writeD(0x00); // Disables use Feather button for X seconds - packet.writeD(0x00); // Adventure's Song - packet.writeC(_hideAnimation ? 0x01 : 0x00); - - packet.writeD(_itemsEnabled ? 0x01 : 0x00); + packet.writeD(_toVillage ? 1 : 0); + packet.writeD(_toClanHall ? 1 : 0); + packet.writeD(_toCastle ? 1 : 0); + packet.writeD(_toOutpost ? 1 : 0); + packet.writeD(_isSweepable ? 1 : 0); + packet.writeD(_useFeather ? 1 : 0); + packet.writeD(_toFortress ? 1 : 0); + packet.writeD(0); // Disables use Feather button for X seconds + packet.writeD(0); // Adventure's Song + packet.writeC(_hideAnimation ? 1 : 0); + packet.writeD(_itemsEnabled ? 1 : 0); packet.writeD(getItems().size()); getItems().forEach(packet::writeD); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java index 15404f9dee..5837faec19 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java @@ -33,7 +33,6 @@ public class DoorInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_INFO.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.getId()); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java index 54f8742a73..14d41afee7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java @@ -33,7 +33,6 @@ public class DoorStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_STATUS_UPDATE.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.isOpen() ? 0 : 1); packet.writeD(_door.getDamage()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index b12458e719..3035890956 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -40,20 +40,17 @@ public class DropItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DROP_ITEM.writeId(packet); - packet.writeD(_objectId); packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeC(_item.isStackable() ? 0x01 : 0x00); + packet.writeC(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - - packet.writeC(0x00); - // packet.writeD(0x01); if above C == true (1) then packet.readD() + packet.writeC(0); + // packet.writeD(1); if above C == true (1) then packet.readD() packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java index 631c43ba0c..99bd80d97e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java @@ -62,13 +62,12 @@ public class Earthquake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EARTHQUAKE.writeId(packet); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_intensity); packet.writeD(_duration); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index db168592f1..335ea9dced 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -58,7 +58,6 @@ public class EnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_crystal); packet.writeQ(_count); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java index 837be1f5e3..169410245b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java @@ -41,7 +41,6 @@ public class EtcStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ETC_STATUS_UPDATE.writeId(packet); - packet.writeC(_player.getCharges()); // 1-7 increase force, level packet.writeD(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%) packet.writeC(_player.getExpertiseWeaponPenalty()); // Weapon Grade Penalty [1-4] diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java index 5dca90f960..9f8d576148 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java @@ -24,13 +24,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class Ex2ndPasswordAck implements IClientOutgoingPacket { + // TODO: Enum + public static final int SUCCESS = 0; + public static final int WRONG_PATTERN = 1; + private final int _status; private final int _response; - // TODO: Enum - public static final int SUCCESS = 0x00; - public static final int WRONG_PATTERN = 0x01; - public Ex2ndPasswordAck(int status, int response) { _status = status; @@ -41,10 +41,9 @@ public class Ex2ndPasswordAck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_ACK.writeId(packet); - packet.writeC(_status); - packet.writeD(_response == WRONG_PATTERN ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(_response == WRONG_PATTERN ? 1 : 0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java index 48bde5161d..c86b5185d0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordCheck implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_NEW = 0x00; - public static final int PASSWORD_PROMPT = 0x01; - public static final int PASSWORD_OK = 0x02; + public static final int PASSWORD_NEW = 0; + public static final int PASSWORD_PROMPT = 1; + public static final int PASSWORD_OK = 2; private final int _windowType; @@ -40,9 +40,8 @@ public class Ex2ndPasswordCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_CHECK.writeId(packet); - packet.writeD(_windowType); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java index 1abf50ab01..f6731bf18f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordVerify implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_OK = 0x00; - public static final int PASSWORD_WRONG = 0x01; - public static final int PASSWORD_BAN = 0x02; + public static final int PASSWORD_OK = 0; + public static final int PASSWORD_WRONG = 1; + public static final int PASSWORD_BAN = 2; private final int _wrongTentatives; private final int _mode; @@ -42,7 +42,6 @@ public class Ex2ndPasswordVerify implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_VERIFY.writeId(packet); - packet.writeD(_mode); packet.writeD(_wrongTentatives); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java index 55abf718c5..db551344ef 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java @@ -45,10 +45,8 @@ public class ExAbnormalStatusUpdateFromTarget implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ABNORMAL_STATUS_UPDATE_FROM_TARGET.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeH(_effects.size()); - for (BuffInfo info : _effects) { packet.writeD(info.getSkill().getDisplayId()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java index c4b9cd8356..f3abd6ec5c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java @@ -41,7 +41,6 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRABLE_SKILL_LIST_BY_CLASS.writeId(packet); - packet.writeH(_type.getId()); packet.writeH(_learnable.size()); for (SkillLearn skill : _learnable) @@ -54,7 +53,7 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket packet.writeC(skill.getRequiredItems().size()); if (_type == AcquireSkillType.SUBPLEDGE) { - packet.writeH(0x00); + packet.writeH(0); } } return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java index fd0e2fc97c..8555bb6e86 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java @@ -61,7 +61,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_SKILL_INFO.writeId(packet); - packet.writeD(_id); packet.writeD(_level); packet.writeQ(_spCost); @@ -73,7 +72,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket packet.writeD(holder.getId()); packet.writeQ(holder.getCount()); } - packet.writeD(_skillRem.size()); for (Skill skill : _skillRem) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java index 29793f4d6c..ff8c526ec4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java @@ -36,7 +36,6 @@ public class ExAdenaInvenCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ADENA_INVEN_COUNT.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeH(_player.getInventory().getSize()); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java index 2aa2d85bc5..5ef11e0f1e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java @@ -50,13 +50,11 @@ public class ExAirShipInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_INFO.writeId(packet); - packet.writeD(_ship.getObjectId()); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(_captain); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); @@ -73,14 +71,13 @@ public class ExAirShipInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - packet.writeD(_ship.getFuel()); packet.writeD(_ship.getMaxFuel()); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java index 4cfc76bfba..8b37f4fc0a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java @@ -42,7 +42,6 @@ public class ExAirShipStopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_airShipId); packet.writeD(_playerId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java index 33c57712da..52958f931b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java @@ -37,12 +37,10 @@ public class ExAirShipTeleportList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_TELEPORT_LIST.writeId(packet); - packet.writeD(_dockId); if (_teleports != null) { packet.writeD(_teleports.length); - for (int i = 0; i < _teleports.length; i++) { packet.writeD(i - 1); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java index 392b228f0d..7918022c72 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java @@ -50,13 +50,12 @@ public class ExAlchemySkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_SKILL_LIST.writeId(packet); - packet.writeD(_skills.size()); for (Skill skill : _skills) { packet.writeD(skill.getId()); packet.writeD(skill.getLevel()); - packet.writeQ(0x00); // Always 0 on Naia, SP i guess? + packet.writeQ(0); // Always 0 on Naia, SP i guess? packet.writeC(skill.getId() == CommonSkill.ALCHEMY_CUBE.getId() ? 0 : 1); // This is type in flash, visible or not } return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java index 3d7ee12a81..1990e1e701 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java @@ -37,7 +37,6 @@ public class ExAskCoupleAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_COUPLE_ACTION.writeId(packet); - packet.writeD(_actionId); packet.writeD(_objectId); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java index 61cabedd98..45615daf5a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java @@ -39,9 +39,8 @@ public class ExAskJoinMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_MPCC.writeId(packet); - packet.writeS(_requestorName); // name of CCLeader - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java index 17fa9d028f..908022ff7e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java @@ -38,7 +38,6 @@ public class ExAskJoinPartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_PARTY_ROOM.writeId(packet); - packet.writeS(_charName); packet.writeS(_roomName); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java index 2a6b958dc9..1551840013 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java @@ -38,7 +38,6 @@ public class ExAskModifyPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_MODIFY_PARTY_LOOTING.writeId(packet); - packet.writeS(_requestor); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java index 958e7c3d06..fa62c8a207 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java @@ -45,7 +45,6 @@ public class ExAttributeEnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ATTRIBUTE_ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeC(_isWeapon); packet.writeH(_type); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java index 1a3a1ef3fe..3d65055b3c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java @@ -41,9 +41,8 @@ public class ExAutoSoulShot implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AUTO_SOUL_SHOT.writeId(packet); - packet.writeD(_itemId); - packet.writeD(_enable ? 0x01 : 0x00); + packet.writeD(_enable ? 1 : 0); packet.writeD(_type); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java index 8680c6bd7a..a8137347ec 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java @@ -37,8 +37,7 @@ public class ExBaseAttributeCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASE_ATTRIBUTE_CANCEL_RESULT.writeId(packet); - - packet.writeD(0x01); // result + packet.writeD(1); // result packet.writeD(_objId); packet.writeD(_attribute); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java index acbad69599..27f7fb5a63 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java @@ -75,7 +75,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 1149, 1150, 1151, 1152, 1153, 1154, 1155 }; - public static final int[] DEFAULT_ACTION_LIST = { 0, 1, 2, 3, @@ -145,7 +144,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 5012, 5013, 5014, 5015 }; //@formatter:on - public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST); private final int[] _actionIds; @@ -159,7 +157,6 @@ public class ExBasicActionList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASIC_ACTION_LIST.writeId(packet); - packet.writeD(_actionIds.length); for (int _actionId : _actionIds) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java index 4c4fac8c91..d32dca4d21 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java @@ -34,13 +34,14 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBeautyItemList implements IClientOutgoingPacket { - private int _colorCount; - private final BeautyData _beautyData; - private final Map> _colorData = new HashMap<>(); private static final int HAIR_TYPE = 0; private static final int FACE_TYPE = 1; private static final int COLOR_TYPE = 2; + private int _colorCount; + private final BeautyData _beautyData; + private final Map> _colorData = new HashMap<>(); + public ExBeautyItemList(Player player) { _beautyData = BeautyShopData.getInstance().getBeautyData(player.getRace(), player.getAppearance().getSexType()); @@ -60,7 +61,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BEAUTY_ITEM_LIST.writeId(packet); - packet.writeD(HAIR_TYPE); packet.writeD(_beautyData.getHairList().size()); for (BeautyItem hair : _beautyData.getHairList().values()) @@ -72,7 +72,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(hair.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(FACE_TYPE); packet.writeD(_beautyData.getFaceList().size()); for (BeautyItem face : _beautyData.getFaceList().values()) @@ -84,7 +83,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(face.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(COLOR_TYPE); packet.writeD(_colorCount); for (Entry> entry : _colorData.entrySet()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java index 1825236886..6d4c45cb2b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java @@ -34,7 +34,6 @@ public class ExBirthdayPopup implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_BIRTH_DAY.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java index 7d2f17e697..43e525f05f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java @@ -26,6 +26,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBrBroadcastEventState implements IClientOutgoingPacket { + public static final int APRIL_FOOLS = 20090401; + public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) + public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) + public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) + public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) + private final int _eventId; private final int _eventState; private int _param0; @@ -36,12 +42,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket private String _param5; private String _param6; - public static final int APRIL_FOOLS = 20090401; - public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) - public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) - public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) - public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) - public ExBrBroadcastEventState(int eventId, int eventState) { _eventId = eventId; @@ -65,7 +65,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BROADCAST_EVENT_STATE.writeId(packet); - packet.writeD(_eventId); packet.writeD(_eventState); packet.writeD(_param0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java index 1fd7ec663a..c0683c8797 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java @@ -44,7 +44,6 @@ public class ExBrBuffEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUFF_EVENT_STATE.writeId(packet); - packet.writeD(_type); packet.writeD(_value); packet.writeD(_state); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java index 943aae8a62..8e009d7b09 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java @@ -43,7 +43,6 @@ public class ExBrLoadEventTopRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_LOAD_EVENT_TOP_RANKERS.writeId(packet); - packet.writeD(_eventId); packet.writeD(_day); packet.writeD(_count); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java index 0a0ddf31b8..291f7a6b55 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java @@ -36,9 +36,8 @@ public class ExBrPremiumState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PREMIUM_STATE.writeId(packet); - packet.writeD(_player.getObjectId()); - packet.writeC(_player.hasPremiumStatus() || (_player.getVipTier() > 0) ? 0x01 : 0x00); + packet.writeC(_player.hasPremiumStatus() || (_player.getVipTier() > 0) ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 381dd859ad..567cfc70f9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -59,10 +59,8 @@ public class ExBuySellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x01); // Type SELL + packet.writeD(1); // Type SELL packet.writeD(_inventorySlots); - if ((_sellList != null)) { packet.writeH(_sellList.size()); @@ -74,9 +72,8 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - if ((_refundList != null) && !_refundList.isEmpty()) { packet.writeH(_refundList.size()); @@ -90,10 +87,9 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - - packet.writeC(_done ? 0x01 : 0x00); + packet.writeC(_done ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java index 2b43c0ce4b..e0ec81e0e7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java @@ -39,7 +39,6 @@ public class ExCastleState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CASTLE_STATE.writeId(packet); - packet.writeD(_castleId); packet.writeD(_castleSide.ordinal()); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java index b7f90d261b..a8196c7a83 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java @@ -52,7 +52,6 @@ public class ExChangeClientEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_CLIENT_EFFECT_INFO.writeId(packet); - packet.writeD(_type); packet.writeD(_key); packet.writeD(_value); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java index 472abc88df..eea59162ee 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java @@ -37,7 +37,6 @@ public class ExChangeNpcState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NPC_STATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java index 8cdcb4460d..45f2805517 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java @@ -49,7 +49,6 @@ public class ExChangePostState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_POST_STATE.writeId(packet); - packet.writeD(_receivedBoard ? 1 : 0); packet.writeD(_changedMsgIds.length); for (int postId : _changedMsgIds) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java index fc58ec9a2e..d765ab54e0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java @@ -35,7 +35,6 @@ public class ExChangeToAwakenedClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_TO_AWAKENED_CLASS.writeId(packet); - packet.writeD(_classId); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index f51a3eb3ae..1e9b8e9dc8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -47,7 +47,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket throw new IllegalArgumentException("Undefined Atribute item: " + stone); } _level = ElementalAttributeData.getInstance().getMaxElementLevel(_itemId); - // Register only items that can be put an attribute stone/crystal for (Item item : player.getInventory().getItems()) { @@ -62,7 +61,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_INVENTORY_ATTRIBUTE_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeQ(_count); packet.writeD(_atribute == AttributeType.FIRE ? 1 : 0); // Fire diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java index a272d85469..238882cd11 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java @@ -35,7 +35,6 @@ public class ExCloseMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java index d2ecd70952..877bca760a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java @@ -34,7 +34,6 @@ public class ExClosePartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_PARTY_ROOM.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java index 27c112776b..1d02c972b5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java @@ -54,7 +54,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLOSSEUM_FENCE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_clientState); packet.writeD(_x); @@ -62,7 +61,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_width); packet.writeD(_length); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java index 766d3619ad..b72bef93e8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java @@ -37,9 +37,8 @@ public class ExConfirmAddingContact implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AGIT_AUCTION_CMD.writeId(packet); - packet.writeS(_charName); - packet.writeD(_added ? 0x01 : 0x00); + packet.writeD(_added ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java index beded32254..c832d507ed 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameAddPlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x01); - + packet.writeD(1); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java index 5f36f730d0..847ea93e6a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java @@ -45,9 +45,7 @@ public class ExCubeGameChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java index 66abbf4b75..a2f2e61ded 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java @@ -43,12 +43,10 @@ public class ExCubeGameChangeTeam implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x05); - + packet.writeD(5); packet.writeD(_player.getObjectId()); - packet.writeD(_fromRedTeam ? 0x01 : 0x00); - packet.writeD(_fromRedTeam ? 0x00 : 0x01); + packet.writeD(_fromRedTeam ? 1 : 0); + packet.writeD(_fromRedTeam ? 0 : 1); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java index 5273b2099a..136b439283 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java @@ -39,9 +39,7 @@ public class ExCubeGameChangeTimeToStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x03); - + packet.writeD(3); packet.writeD(_seconds); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java index f81a302941..9bdba49029 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java @@ -35,7 +35,6 @@ public class ExCubeGameCloseUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0xffffffff); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java index 259a0e9407..3177e7a488 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java @@ -40,11 +40,9 @@ public class ExCubeGameEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x01); - - packet.writeD(_isRedTeamWin ? 0x01 : 0x00); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(1); + packet.writeD(_isRedTeamWin ? 1 : 0); + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java index 4d89e621ce..8b96bb545f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java @@ -55,14 +55,11 @@ public class ExCubeGameExtendedChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeD(_playerPoints); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java index e5a00f1ab7..c084789f13 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameRemovePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java index 00be884d2f..35a3f289d1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java @@ -35,8 +35,7 @@ public class ExCubeGameRequestReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x04); + packet.writeD(4); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java index 1bc89e0c32..8b755dd3cc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java @@ -30,7 +30,6 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket // Players Lists private final List _bluePlayers; private final List _redPlayers; - // Common Values private final int _roomNumber; @@ -51,12 +50,9 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_roomNumber); packet.writeD(0xffffffff); - packet.writeD(_bluePlayers.size()); for (Player player : _bluePlayers) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java index 2f2c092c08..d000112787 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java @@ -31,7 +31,6 @@ public class ExCursedWeaponList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet); - final Set ids = CursedWeaponsManager.getInstance().getCursedWeaponsIds(); packet.writeD(ids.size()); ids.forEach(packet::writeD); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java index 2f60a1b80c..5bc7ff3238 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java @@ -39,7 +39,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet); - if (!_cursedWeaponInfo.isEmpty()) { packet.writeD(_cursedWeaponInfo.size()); @@ -47,7 +46,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { packet.writeD(w.id); packet.writeD(w.activated); - packet.writeD(w.pos.getX()); packet.writeD(w.pos.getY()); packet.writeD(w.pos.getZ()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java index f475a02b28..0456fb9dae 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java @@ -34,7 +34,6 @@ public class ExDissmissMPCCRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DISSMISS_MPCC_ROOM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java index 258010f717..c731b7c7a9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java @@ -37,7 +37,6 @@ public class ExDuelAskStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_ASK_START.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDuel); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java index 043c82c0db..e9a31bee57 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java @@ -38,7 +38,6 @@ public class ExDuelEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_END.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java index 264409b3d6..e1fa1cea88 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java @@ -38,7 +38,6 @@ public class ExDuelReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_READY.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java index 488aafcb7d..ecdd528a16 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java @@ -38,7 +38,6 @@ public class ExDuelStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_START.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java index 7df040c5e7..5ed0c09675 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java @@ -36,7 +36,6 @@ public class ExDuelUpdateUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_UPDATE_USER_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeD(_player.getClassId().getId()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 7ab055a3d8..f58c0573a8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExEnchantSkillInfo implements IClientOutgoingPacket { private final Set _routes; - private final int _skillId; private final int _skillLevel; private final int _skillSubLevel; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 41368a8efb..e4ee350e64 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -50,7 +50,6 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_INFO_DETAIL.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java index 5cedcd6284..1d32f0d725 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java @@ -43,7 +43,6 @@ public class ExEnchantSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_LIST.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skills.size()); for (Skill skill : _skills) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java index 6ab5e869f2..853d74039f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java @@ -38,7 +38,6 @@ public class ExEnchantSkillResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_RESULT.writeId(packet); - packet.writeD(_enchanted ? 1 : 0); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java index 7b7d2d008d..410bf16510 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java @@ -42,7 +42,6 @@ public class ExEventMatchMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_EVENT_MATCH_MESSAGE.writeId(packet); - packet.writeC(_type); packet.writeS(_message); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java index 7264e90233..1946758bf5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java @@ -37,11 +37,9 @@ public class ExGetBookMarkInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOOK_MARK_INFO.writeId(packet); - - packet.writeD(0x00); // Dummy + packet.writeD(0); // Dummy packet.writeD(_player.getBookMarkSlot()); packet.writeD(_player.getTeleportBookmarks().size()); - for (TeleportBookmark tpbm : _player.getTeleportBookmarks()) { packet.writeD(tpbm.getId()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java index 36e7bb81af..201e8eb49b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java @@ -42,15 +42,14 @@ public class ExGetBossRecord implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOSS_RECORD.writeId(packet); - packet.writeD(_ranking); packet.writeD(_totalPoints); if (_bossRecordInfo == null) { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } else { @@ -59,7 +58,7 @@ public class ExGetBossRecord implements IClientOutgoingPacket { packet.writeD(entry.getKey()); packet.writeD(entry.getValue()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? } } return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java index ea0a5f8b18..85ccad0758 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java @@ -41,7 +41,6 @@ public class ExGetOffAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_OFF_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java index f8e16a4191..9a02e49223 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java @@ -39,7 +39,6 @@ public class ExGetOnAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_ON_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java index 51197344a5..704b3212a1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExGetPremiumItemList implements IClientOutgoingPacket { private final Player _player; - private final Map _map; public ExGetPremiumItemList(Player player) @@ -43,7 +42,6 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_PREMIUM_ITEM_LIST.writeId(packet); - packet.writeD(_map.size()); for (Entry entry : _map.entrySet()) { @@ -51,7 +49,7 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket packet.writeQ(entry.getKey()); packet.writeD(item.getItemId()); packet.writeQ(item.getCount()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeS(item.getSender()); } return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index a005fa8ad8..0200bdee08 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -40,7 +40,6 @@ public class ExHeroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HERO_LIST.writeId(packet); - packet.writeD(_heroList.size()); for (StatSet hero : _heroList.values()) { @@ -51,7 +50,7 @@ public class ExHeroList implements IClientOutgoingPacket packet.writeS(hero.getString(Hero.ALLY_NAME, "")); packet.writeD(hero.getInt(Hero.ALLY_CREST, 0)); packet.writeD(hero.getInt(Hero.COUNT)); - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index d5b5430142..0baca7cd86 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -48,8 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); - - packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade + packet.writeC(_hide ? 0 : 1); // Grand Crusade packet.writeD(_currentTemplateId); packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java index 81db66b88f..323c0cdf1e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java @@ -35,7 +35,6 @@ public class ExIsCharNameCreatable implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_IS_CHAR_NAME_CREATABLE.writeId(packet); - packet.writeD(_allowed); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java index ecc751eab3..45def9e0be 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java @@ -38,7 +38,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { throw new NullPointerException(); } - if (currentAuction.getAuctionState() != ItemAuctionState.STARTED) { _timeRemaining = 0; @@ -47,7 +46,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { _timeRemaining = (int) (currentAuction.getFinishingTimeRemaining() / 1000); // in seconds } - _refresh = refresh; _currentAuction = currentAuction; _nextAuction = nextAuction; @@ -57,16 +55,12 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_AUCTION_INFO.writeId(packet); - - packet.writeC(_refresh ? 0x00 : 0x01); + packet.writeC(_refresh ? 0 : 1); packet.writeD(_currentAuction.getInstanceId()); - final ItemAuctionBid highestBid = _currentAuction.getHighestBid(); packet.writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid()); - packet.writeD(_timeRemaining); writeItem(packet, _currentAuction.getItemInfo()); - if (_nextAuction != null) { packet.writeQ(_nextAuction.getAuctionInitBid()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java index 53ad8abd58..1c5e38cbab 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListMpccWaiting implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _rooms = new LinkedList<>(); @@ -53,7 +54,6 @@ public class ExListMpccWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_MPCC_WAITING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 78f2fec636..eafea24fa6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _players = new LinkedList<>(); @@ -60,7 +61,6 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(packet); - packet.writeD(_size); packet.writeD(_players.size()); for (Player player : _players) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java index 786c616875..c8723a9fc0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java @@ -46,7 +46,6 @@ public class ExMPCCPartyInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCPARTY_INFO_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_LeaderOID); packet.writeD(_memberCount); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java index 4bf07f0133..08259e4e6c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java @@ -37,7 +37,6 @@ public class ExMPCCPartymasterList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_PARTYMASTER_LIST.writeId(packet); - packet.writeD(_leadersName.size()); _leadersName.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java index abbdc8fe76..f021ef5f1f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java @@ -36,7 +36,6 @@ public class ExMPCCRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java index 154e156270..2eec590cb4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java @@ -41,7 +41,6 @@ public class ExMPCCRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java index 06e3027bfc..a0e9d0a4b0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java @@ -37,7 +37,6 @@ public class ExMPCCShowPartyMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCSHOW_PARTY_MEMBER_INFO.writeId(packet); - packet.writeD(_party.getMemberCount()); for (Player pc : _party.getMembers()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java index e454a746f3..771b2f22cb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java @@ -49,7 +49,6 @@ public class ExMagicAttackInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAGIC_ATTACK_INFO.writeId(packet); - packet.writeD(_caster); packet.writeD(_target); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java index 9cfbeb5aee..1aaa5b6520 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java @@ -35,7 +35,6 @@ public class ExMailArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAIL_ARRIVED.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java index 983ff22b92..48156c0600 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java @@ -44,7 +44,6 @@ public class ExManageMpccRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MANAGE_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java index f710c006e8..9d7d14211e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java @@ -45,7 +45,6 @@ public class ExMoveToLocationAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_objId); packet.writeD(_tx); packet.writeD(_ty); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java index 3e3bdc9fed..87e44b51cd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java @@ -43,7 +43,6 @@ public class ExMoveToLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java index 7ab0d1c7da..3c1902892a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java @@ -40,11 +40,9 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet); - packet.writeS(_channel.getLeader().getName()); - packet.writeD(0x00); // Channel loot 0 or 1 + packet.writeD(0); // Channel loot 0 or 1 packet.writeD(_channel.getMemberCount()); - packet.writeD(_channel.getParties().size()); for (Party p : _channel.getParties()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java index 1536bd5f9b..f2a32bb6e8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java @@ -43,7 +43,6 @@ public class ExNeedToChangeName implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEED_TO_CHANGE_NAME.writeId(packet); - packet.writeD(_type); packet.writeD(_subType); packet.writeS(_name); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java index be9bec8559..d18b4606b3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java @@ -35,7 +35,6 @@ public class ExNevitAdventEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CHANNELING_EFFECT.writeId(packet); - packet.writeD(_timeLeft); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java index 3a0367c178..09f6250f51 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java @@ -35,7 +35,6 @@ public class ExNevitAdventPointInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_AGATHION_ENERGY_INFO.writeId(packet); - packet.writeD(_points); // 72 = 1%, max 7200 = 100% return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java index 88fdaae499..ef220d86de 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java @@ -37,9 +37,8 @@ public class ExNevitAdventTimeChange implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - // state 0 - pause 1 - started - packet.writeC(_paused ? 0x00 : 0x01); + packet.writeC(_paused ? 0 : 1); // left time in ms max is 16000 its 4m and state is automatically changed to quit packet.writeD(_time); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java index fccdf510cc..4025bf78fa 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java @@ -34,7 +34,6 @@ public class ExNewSkillToLearnByLevelUp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEW_SKILL_TO_LEARN_BY_LEVEL_UP.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java index 324c18a517..f2ce8614dc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java @@ -43,8 +43,7 @@ public class ExNoticePostArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTICE_POST_ARRIVED.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java index afe3719d9b..050c7ccea5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java @@ -43,8 +43,7 @@ public class ExNoticePostSent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_WRITE_POST.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java index 5d98c20b09..e0bd08d39a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java @@ -30,7 +30,6 @@ public class ExNotifyPremiumItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_PREMIUM_ITEM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java index 6cb3724448..ba3c0cfeaa 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java @@ -34,7 +34,6 @@ public class ExOlympiadMatchEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MATCH_END.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java index 264d5aa484..7ffd5ed3bd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java @@ -55,19 +55,15 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x00); // Type 0 = Match List, 1 = Match Result - + packet.writeD(0); // Type 0 = Match List, 1 = Match Result packet.writeD(_games.size()); - packet.writeD(0x00); - + packet.writeD(0); for (OlympiadGameTask curGame : _games) { final AbstractOlympiadGame game = curGame.getGame(); if (game != null) { packet.writeD(game.getStadiumId()); // Stadium Id (Arena 1 = 0) - if (game instanceof OlympiadGameNonClassed) { packet.writeD(1); @@ -80,8 +76,7 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket { packet.writeD(0); } - - packet.writeD(curGame.isRunning() ? 0x02 : 0x01); // (1 = Standby, 2 = Playing) + packet.writeD(curGame.isRunning() ? 2 : 1); // (1 = Standby, 2 = Playing) packet.writeS(game.getPlayerNames()[0]); // Player 1 Name packet.writeS(game.getPlayerNames()[1]); // Player 2 Name } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java index 712651603d..b387271fba 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java @@ -53,9 +53,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x01); // Type 0 = Match List, 1 = Match Result - + packet.writeD(1); // Type 0 = Match List, 1 = Match Result packet.writeD(_tie ? 1 : 0); // 0 - win, 1 - tie packet.writeS(_winnerList.get(0).getName()); packet.writeD(_winTeam); @@ -69,9 +67,8 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } - packet.writeD(_loseTeam); packet.writeD(_loserList.size()); for (OlympiadInfo info : _loserList) @@ -83,7 +80,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java index 34d81d1f53..712b9e06c6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java @@ -38,7 +38,6 @@ public class ExOlympiadMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MODE.writeId(packet); - packet.writeC(_mode); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java index ebea6c56f3..5b4f2c2523 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java @@ -53,7 +53,6 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_SPELLED_INFO.writeId(packet); - packet.writeD(_playerId); packet.writeD(_effects.size() + _effects2.size()); for (BuffInfo info : _effects) @@ -62,7 +61,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(info.getSkill().getDisplayId()); packet.writeH(info.getSkill().getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(info.getSkill().getAbnormalType().getClientId()); writeOptionalD(packet, info.getSkill().isAura() ? -1 : info.getTime()); } @@ -73,7 +72,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(skill.getDisplayId()); packet.writeH(skill.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(skill.getAbnormalType().getClientId()); packet.writeH(-1); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java index 18c34fe9de..ca473edfcf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java @@ -76,7 +76,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_USER_INFO.writeId(packet); - if (_player != null) { packet.writeC(_player.getOlympiadSide()); @@ -91,7 +90,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket packet.writeS(_par.getName()); packet.writeD(_par.getBaseClass()); } - packet.writeD(_curHp); packet.writeD(_maxHp); packet.writeD(_curCp); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java index e84d0251bd..7ec64cc8c3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java @@ -35,7 +35,6 @@ public class ExOpenMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OPEN_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java index 90349cc1a2..5661dc9f57 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java @@ -56,7 +56,6 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PCCAFE_POINT_INFO.writeId(packet); - packet.writeD(_points); // num points packet.writeD(_mAddPoint); // points inc display packet.writeC(_mPeriodType); // period(0=don't show window,1=acquisition,2=use points) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java index f7e8b4a99a..248a2f7d98 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_ADD.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java index 832bee0012..1f452f4bae 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_DELETE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_summon.getSummonType()); packet.writeD(_summon.getOwner().getObjectId()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java index 0646a67001..703694fa2f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_UPDATE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 0e3edb3ea7..e4c6b79ae0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -47,7 +47,6 @@ public class ExPartyRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2bffdec368..2ebf1dc7f0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -43,10 +43,8 @@ public class ExPetInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class ExPetInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class ExPetInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,9 +154,8 @@ public class ExPetInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -227,28 +205,24 @@ public class ExPetInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PET_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -267,7 +241,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -283,19 +257,19 @@ public class ExPetInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -307,20 +281,20 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -344,12 +318,12 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -379,12 +353,10 @@ public class ExPetInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java index 082f4c7662..0f72c05a3a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java @@ -34,7 +34,6 @@ public class ExPlayScene implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLAY_SCENE.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java index e98d317e14..7e3803bdaa 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java @@ -36,7 +36,6 @@ public class ExPledgeCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_COUNT.writeId(packet); - packet.writeD(_count); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java index 838029e284..4084de3481 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java @@ -38,7 +38,6 @@ public class ExPledgeDraftListSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_DRAFT_LIST_SEARCH.writeId(packet); - packet.writeD(_pledgeRecruitList.size()); for (PledgeWaitingInfo prl : _pledgeRecruitList) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java index fb956e9996..44e34004ea 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java @@ -25,11 +25,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExPledgeEmblem implements IClientOutgoingPacket { + private static final int TOTAL_SIZE = 65664; + private final int _crestId; private final int _clanId; private final byte[] _data; private final int _chunkId; - private static final int TOTAL_SIZE = 65664; public ExPledgeEmblem(int crestId, byte[] chunkedData, int clanId, int chunkId) { @@ -43,7 +44,6 @@ public class ExPledgeEmblem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clanId); packet.writeD(_crestId); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java index ed19bf976b..b32f8c0645 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitApplyInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_APPLY_INFO.writeId(packet); - packet.writeD(_status.ordinal()); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java index fc98b7b6f7..af4af9c9c1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitBoardDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_DETAIL.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClanId()); packet.writeD(_pledgeRecruitInfo.getKarma()); packet.writeS(_pledgeRecruitInfo.getInformation()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index b4d48373a6..eda808e754 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -34,7 +34,6 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket private final int _clanOnCurrentPage; private final int _startIndex; private final int _endIndex; - static final int CLAN_PER_PAGE = 12; public ExPledgeRecruitBoardSearch(List clanList, int currentPage) @@ -51,11 +50,9 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_SEARCH.writeId(packet); - packet.writeD(_currentPage); packet.writeD(_totalNumberOfPage); packet.writeD(_clanOnCurrentPage); - for (int i = _startIndex; i < _endIndex; i++) { packet.writeD(_clanList.get(i).getClanId()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 4ae5ffe316..b1f139226d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -40,7 +40,6 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java index 77080a3820..5844f220ec 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java @@ -39,7 +39,6 @@ public class ExPledgeWaitingList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST.writeId(packet); - packet.writeD(pledgePlayerRecruitInfos.size()); for (PledgeApplicantInfo recruitInfo : pledgePlayerRecruitInfos.values()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java index a9245c1309..6b88572057 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java @@ -30,7 +30,6 @@ public class ExPledgeWaitingListAlarm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_ALARM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java index 60997b3da0..28c3967119 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java @@ -40,7 +40,6 @@ public class ExPledgeWaitingListApplied implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_APPLIED.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClan().getId()); packet.writeS(_pledgeRecruitInfo.getClan().getName()); packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java index 66a06892c2..1f53d1bb38 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java @@ -36,7 +36,6 @@ public class ExPledgeWaitingUser implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_USER.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getPlayerId()); packet.writeS(_pledgeRecruitInfo.getMessage()); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java index 49bc9b0995..5f404779f5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java @@ -43,7 +43,6 @@ public class ExPrivateStoreSetWholeMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_objectId); packet.writeS(_msg); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java index cb5e8fbce9..ff996b5d0c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutCommissionResultForVariationMake implements IClientOutgoingPac public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_COMMISSION_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_gemstoneObjId); packet.writeD(_itemId); packet.writeQ(_gemstoneCount); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java index 81721e921f..098472b7ae 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantScrollItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SCROLL_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java index 871f377db2..ffea182a49 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java index c47a4bcff4..8016e128f4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java index c8b46be499..95c0c0e4e1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_INTENSIVE_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_refinerItemObjId); packet.writeD(_lifestoneItemId); packet.writeD(_gemstoneItemId); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 2128b2b19f..2970ca00a2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -41,13 +41,12 @@ public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_CANCEL.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); packet.writeD(_itemAug1); packet.writeD(_itemAug2); packet.writeQ(_price); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java index 80541e65cd..c25dd16b01 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java @@ -34,10 +34,9 @@ public class ExPutItemResultForVariationMake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java index fe5eb74eb0..bc8896164d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java @@ -56,13 +56,12 @@ public class ExQuestNpcLogList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_NPC_LOG_LIST.writeId(packet); - packet.writeD(_questId); packet.writeC(_npcLogList.size()); for (NpcLogListHolder holder : _npcLogList) { packet.writeD(holder.isNpcString() ? holder.getId() : holder.getId() + 1000000); - packet.writeC(holder.isNpcString() ? 0x01 : 0x00); + packet.writeC(holder.isNpcString() ? 1 : 0); packet.writeD(holder.getCount()); } return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java index 62d622caff..60616b256d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java @@ -35,7 +35,6 @@ public class ExRedSky implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RED_SKY.writeId(packet); - packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java index ce40b1a792..163faff855 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java @@ -36,7 +36,6 @@ public class ExRegenMax implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REGEN_MAX.writeId(packet); - packet.writeD(1); packet.writeD(_time); packet.writeD(_tickInterval); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java index d864795cd6..a17525576b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java @@ -34,7 +34,6 @@ public class ExRemoveEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REMOVE_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 57ed88ac29..4e479e75a6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -56,7 +56,6 @@ public class ExReplyReceivedPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_RECEIVED_POST.writeId(packet); - packet.writeD(_msg.getMailType().ordinal()); // GOD if (_msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED) { @@ -76,11 +75,10 @@ public class ExReplyReceivedPost extends AbstractItemPacket } packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown packet.writeS(_msg.getSenderName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -92,9 +90,8 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeQ(_msg.getReqAdena()); packet.writeD(_msg.hasAttachments() ? 1 : 0); packet.writeD(_msg.isReturned() ? 1 : 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 75f6596194..ed490eae91 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -54,14 +54,12 @@ public class ExReplySentPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_SENT_POST.writeId(packet); - - packet.writeD(0x00); // GOD + packet.writeD(0); // GOD packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); packet.writeS(_msg.getReceiverName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -73,11 +71,11 @@ public class ExReplySentPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeQ(_msg.getReqAdena()); - packet.writeD(_msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(_msg.isReturned() ? 0x01 : 00); + packet.writeD(_msg.hasAttachments() ? 1 : 0); + packet.writeD(_msg.isReturned() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index cc4f7ce1d8..e6a3f9bca2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -35,7 +35,6 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java index 2634aa1cdd..60201b177f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java @@ -35,7 +35,6 @@ public class ExRequestHackShield implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REQUEST_HACK_SHIELD.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java index c51ff31d0b..75e3b3a945 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java @@ -29,13 +29,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyList implements IClientOutgoingPacket { + public static final int SHOW_FACESHAPE = 1; + public static final int SHOW_HAIRSTYLE = 0; + private final Player _player; private final int _type; private final Map _beautyItem; - public static final int SHOW_FACESHAPE = 1; - public static final int SHOW_HAIRSTYLE = 0; - public ExResponseBeautyList(Player player, int type) { _player = player; @@ -54,7 +54,6 @@ public class ExResponseBeautyList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java index ca2ed360ab..4b19201833 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java @@ -25,16 +25,15 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket { + public static final int FAILURE = 0; + public static final int SUCCESS = 1; + public static final int CHANGE = 0; + public static final int RESTORE = 1; + private final Player _player; private final int _type; private final int _result; - public static final int FAILURE = 0; - public static final int SUCCESS = 1; - - public static final int CHANGE = 0; - public static final int RESTORE = 1; - public ExResponseBeautyRegistReset(Player player, int type, int result) { _player = player; @@ -46,7 +45,6 @@ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_REGIST_RESET.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java index 0e313ef3b7..c0922cfb04 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java @@ -36,10 +36,8 @@ public class ExResponseResetList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_RESET_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); - packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java index 01fe1945ef..a230033d67 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java @@ -37,7 +37,6 @@ public class ExRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ROTATION.writeId(packet); - packet.writeD(_charId); packet.writeD(_heading); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index c58ccfc233..2646a71e77 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -36,7 +36,6 @@ public class ExRpItemLink extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RP_ITEM_LINK.writeId(packet); - writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java index 04556bbed2..f0c6eba8e9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java @@ -34,7 +34,6 @@ public class ExSearchOrc implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEARCH_ORC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index 1e06cc2a3f..7a4dced122 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -38,7 +38,6 @@ public class ExSendManorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_MANOR_LIST.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java index b63c69f37e..2c25cc8bfc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java @@ -124,7 +124,6 @@ public class ExSendUIEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_UIEVENT.writeId(packet); - packet.writeD(_objectId); packet.writeD(_type); // 0 = show, 1 = hide (there is 2 = pause and 3 = resume also but they don't work well you can only pause count down and you cannot resume it because resume hides the counter). packet.writeD(0); // unknown diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java index 4378479707..716a3e8623 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java @@ -385,16 +385,13 @@ public class ExServerPrimitive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SERVER_PRIMITIVE.writeId(packet); - packet.writeS(_name); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(65535); // has to do something with display range and angle packet.writeD(65535); // has to do something with display range and angle - packet.writeD(_points.size() + _lines.size()); - for (Point point : _points) { packet.writeC(1); // Its the type in this case Point @@ -408,7 +405,6 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(point.getY()); packet.writeD(point.getZ()); } - for (Line line : _lines) { packet.writeC(2); // Its the type in this case Line diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java index fb32e199b2..51fb91b643 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java @@ -46,7 +46,6 @@ public class ExSetCompassZoneCode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_COMPASS_ZONE_CODE.writeId(packet); - packet.writeD(_zoneType); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java index 1d0fbae3a4..34dee8bda0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java @@ -38,7 +38,6 @@ public class ExSetPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_PARTY_LOOTING.writeId(packet); - packet.writeD(_result); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java index 7b14ec8412..4e491af9d1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java @@ -34,7 +34,6 @@ public class ExShowAdventurerGuideBook implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_ADVENTURER_GUIDE_BOOK.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index 82554fdc5f..1f8df76083 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -39,7 +39,6 @@ public class ExShowAgitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AGIT_INFO.writeId(packet); - final Collection clanHalls = ClanHallData.getInstance().getClanHalls(); packet.writeD(clanHalls.size()); clanHalls.forEach(clanHall -> diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index dd11ee0150..51e6646ff5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -44,7 +44,6 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BASE_ATTRIBUTE_CANCEL_WINDOW.writeId(packet); - packet.writeD(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java index 14e55d39f3..e22345c4fd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java @@ -25,13 +25,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExShowBeautyMenu implements IClientOutgoingPacket { - private final Player _player; - private final int _type; - // TODO: Enum public static final int MODIFY_APPEARANCE = 0; public static final int RESTORE_APPEARANCE = 1; + private final Player _player; + private final int _type; + public ExShowBeautyMenu(Player player, int type) { _player = player; @@ -42,7 +42,6 @@ public class ExShowBeautyMenu implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BEAUTY_MENU.writeId(packet); - packet.writeD(_type); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 15d011befc..b0d2b90494 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -41,7 +41,6 @@ public class ExShowCastleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CASTLE_INFO.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) @@ -65,8 +64,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } packet.writeD(castle.getTaxPercent(TaxType.BUY)); packet.writeD((int) (castle.getSiege().getSiegeDate().getTimeInMillis() / 1000)); - - packet.writeC(castle.getSiege().isInProgress() ? 0x01 : 0x00); // Grand Crusade + packet.writeC(castle.getSiege().isInProgress() ? 1 : 0); // Grand Crusade packet.writeC(castle.getSide().ordinal()); // Grand Crusade } return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java index aeb4079f3a..f9a6ebe0e7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java @@ -38,7 +38,6 @@ public class ExShowContactList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_SHOW_POST_FRIEND.writeId(packet); - packet.writeD(_contacts.size()); _contacts.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index a079ea3129..94b989b583 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -37,7 +37,6 @@ public class ExShowCropInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _crops = (nextPeriod && !manor.isManorApproved()) ? null : manor.getCropProcure(manorId, nextPeriod); } @@ -46,10 +45,9 @@ public class ExShowCropInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Crop Sales" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Crop Sales" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); + packet.writeD(0); if (_crops != null) { packet.writeD(_crops.size()); @@ -64,17 +62,17 @@ public class ExShowCropInfo implements IClientOutgoingPacket if (seed == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(seed.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(seed.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(seed.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index ebffd775d8..1f01ee7b87 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -62,10 +62,8 @@ public class ExShowCropSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getCropId()); // crop id diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index ee9fa9fd37..b625a1e4e7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -39,7 +39,6 @@ public class ExShowFortressInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_INFO.writeId(packet); - final Collection forts = FortManager.getInstance().getForts(); packet.writeD(forts.size()); for (Fort fort : forts) @@ -47,7 +46,7 @@ public class ExShowFortressInfo implements IClientOutgoingPacket final Clan clan = fort.getOwnerClan(); packet.writeD(fort.getResidenceId()); packet.writeS(clan != null ? clan.getName() : ""); - packet.writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00); + packet.writeD(fort.getSiege().isInProgress() ? 1 : 0); // Time of possession packet.writeD(fort.getOwnedTime()); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index f389b26ed5..678ab43e96 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -42,11 +42,9 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_MAP_INFO.writeId(packet); - packet.writeD(_fortress.getResidenceId()); packet.writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status packet.writeD(_fortress.getFortSize()); // barracks count - final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId()); if ((commanders != null) && !commanders.isEmpty() && _fortress.getSiege().isInProgress()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 27da99cf41..da186103ae 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -51,7 +51,6 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_SIEGE_INFO.writeId(packet); - packet.writeD(_fortId); // Fortress Id packet.writeD(_size); // Total Barracks Count if (_csize > 0) @@ -64,22 +63,22 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { case 0: { - packet.writeD(0x03); + packet.writeD(3); break; } case 1: { - packet.writeD(0x02); + packet.writeD(2); break; } case 2: { - packet.writeD(0x01); + packet.writeD(1); break; } case 3: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -92,27 +91,27 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket // TODO: once control room supported, update packet.writeD(0x0x) to support 5th room case 0: { - packet.writeD(0x05); + packet.writeD(5); break; } case 1: { - packet.writeD(0x04); + packet.writeD(4); break; } case 2: { - packet.writeD(0x03); + packet.writeD(3); break; } case 3: { - packet.writeD(0x02); + packet.writeD(2); break; } case 4: { - packet.writeD(0x01); + packet.writeD(1); break; } } @@ -124,7 +123,7 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { for (int i = 0; i < _size; i++) { - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java index f7aca7dffd..912839e242 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java @@ -41,8 +41,7 @@ public class ExShowManorDefaultInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_MANOR_DEFAULT_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" and "Crop Sales" buttons + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" and "Crop Sales" buttons packet.writeD(_crops.size()); for (Seed crop : _crops) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 1d3312d668..d03ce2a5fd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -52,10 +52,8 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet); - packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java index cf38d18c1c..f41999329f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java @@ -34,7 +34,6 @@ public class ExShowQuestInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_INFO.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java index 70f31e318f..0fa64c401d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java @@ -37,7 +37,6 @@ public class ExShowQuestMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_MARK.writeId(packet); - packet.writeD(_questId); packet.writeD(_questState); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index ab85228caf..1a6ee00a10 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ExShowReceivedPostList implements IClientOutgoingPacket { - private final List _inbox; - private static final int MESSAGE_FEE = 100; private static final int MESSAGE_FEE_PER_SLOT = 1000; + private final List _inbox; + public ExShowReceivedPostList(int objectId) { _inbox = MailManager.getInstance().getInbox(objectId); @@ -45,7 +45,6 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { @@ -64,18 +63,18 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getSenderName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); + packet.writeD(msg.isUnread() ? 1 : 0); packet.writeD(((msg.getMailType() == MailType.COMMISSION_ITEM_SOLD) || (msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED)) ? 0 : 1); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(msg.isReturned() ? 0x01 : 0x00); - packet.writeD(0x00); // SysString in some case it seems + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(msg.isReturned() ? 1 : 0); + packet.writeD(0); // SysString in some case it seems } } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(MESSAGE_FEE); packet.writeD(MESSAGE_FEE_PER_SLOT); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java index 9679468789..deebb99c8f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java @@ -33,6 +33,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; */ public class ExShowScreenMessage implements IClientOutgoingPacket { + // Positions + public static final byte TOP_LEFT = 1; + public static final byte TOP_CENTER = 2; + public static final byte TOP_RIGHT = 3; + public static final byte MIDDLE_LEFT = 4; + public static final byte MIDDLE_CENTER = 5; + public static final byte MIDDLE_RIGHT = 6; + public static final byte BOTTOM_CENTER = 7; + public static final byte BOTTOM_RIGHT = 8; + private final int _type; private final int _sysMessageId; private final int _unk1; @@ -48,15 +58,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket private List _parameters; // Localisation related. private String _lang; - // Positions - public static final byte TOP_LEFT = 0x01; - public static final byte TOP_CENTER = 0x02; - public static final byte TOP_RIGHT = 0x03; - public static final byte MIDDLE_LEFT = 0x04; - public static final byte MIDDLE_CENTER = 0x05; - public static final byte MIDDLE_RIGHT = 0x06; - public static final byte BOTTOM_CENTER = 0x07; - public static final byte BOTTOM_RIGHT = 0x08; public void setLang(String lang) { @@ -265,7 +266,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SCREEN_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -284,9 +284,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(sml.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -308,9 +308,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -318,7 +318,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket } } } - packet.writeD(_type); packet.writeD(_sysMessageId); packet.writeD(_position); @@ -326,9 +325,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java index 29ab5d355f..6123b08991 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java @@ -37,7 +37,6 @@ public class ExShowSeedInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _seeds = (nextPeriod && !manor.isManorApproved()) ? null : manor.getSeedProduction(manorId, nextPeriod); } @@ -46,16 +45,14 @@ public class ExShowSeedInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown if (_seeds == null) { packet.writeD(0); return true; } - packet.writeD(_seeds.size()); for (SeedProduction seed : _seeds) { @@ -67,17 +64,17 @@ public class ExShowSeedInfo implements IClientOutgoingPacket if (s == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(s.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(s.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(s.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java index e628099700..eb6e686e10 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java @@ -32,13 +32,10 @@ public class ExShowSeedMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_MAP_INFO.writeId(packet); - packet.writeD(2); // seed count - // Seed of Destruction packet.writeD(1); // id 1? Grand Crusade packet.writeD(2770 + GraciaSeedsManager.getInstance().getSoDState()); // sys msg id - // Seed of Infinity packet.writeD(2); // id 2? Grand Crusade // Manager not implemented yet diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index 4fd891a466..373c314eba 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -62,10 +62,8 @@ public class ExShowSeedSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getSeedId()); // seed id diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 1994402da2..269bec5b97 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -47,7 +47,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _cropsItems.put(cropId, item); } } - for (CropProcure crop : CastleManorManager.getInstance().getCropProcure(_manorId, false)) { if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) @@ -61,7 +60,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_cropsItems.size()); // size for (Item item : _cropsItems.values()) @@ -70,9 +68,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket packet.writeD(item.getObjectId()); // Object id packet.writeD(item.getId()); // crop id packet.writeD(seed.getLevel()); // seed level - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(1)); // reward 1 id - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(2)); // reward 2 id if (_castleCrops.containsKey(item.getId())) { @@ -85,9 +83,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket else { packet.writeD(0xFFFFFFFF); // manor - packet.writeQ(0x00); // buy residual - packet.writeQ(0x00); // buy price - packet.writeC(0x00); // reward + packet.writeQ(0); // buy residual + packet.writeQ(0); // buy price + packet.writeC(0); // reward } packet.writeQ(item.getCount()); // my crops } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index db4bccc928..b61d5b2301 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -40,7 +40,6 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { @@ -50,17 +49,17 @@ public class ExShowSentPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getReceiverName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); - packet.writeD(0x01); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(msg.isUnread() ? 1 : 0); + packet.writeD(1); + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(0); } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java index 0e4e9fd2ef..0dca57f2f8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java @@ -48,7 +48,6 @@ public class ExShowTerritory implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TERRITORY.writeId(packet); - packet.writeD(_vertices.size()); packet.writeD(_minZ); packet.writeD(_maxZ); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java index 4e284f82c5..86e1009bbf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java @@ -46,7 +46,6 @@ public class ExShowTrace implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TRACE.writeId(packet); - packet.writeH(0); // type broken in H5 packet.writeD(0); // time broken in H5 packet.writeH(_locations.size()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java index 3245767ed7..836a5c9624 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java @@ -44,7 +44,6 @@ public class ExShowUsm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_USM.writeId(packet); - packet.writeD(_videoId); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java index 4acdffa842..1f1a14c31b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java @@ -34,7 +34,6 @@ public class ExShowVariationCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_CANCEL_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java index 3a2298019e..9870424e26 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java @@ -35,7 +35,6 @@ public class ExShowVariationMakeWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_MAKE_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java index 169827bab3..86211c8d97 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java @@ -44,10 +44,9 @@ public class ExSpawnEmitter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SPAWN_EMITTER.writeId(packet); - packet.writeD(_npcObjectId); packet.writeD(_playerObjectId); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java index 620800c1c4..534549b4fe 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java @@ -36,7 +36,6 @@ public class ExStartScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_START_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java index 0bd990cf34..babac59129 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java index 0e2689d598..d3e67afe99 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipObjId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java index 44b064113f..f5b3e1340f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java @@ -36,7 +36,6 @@ public class ExStopScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index 8029930c9a..367ac79be4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -66,7 +66,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket } OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet); - packet.writeD(_inventory); packet.writeD(_warehouse); // packet.writeD(_freight); // Removed with 152. diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java index 3293a5b557..57563ca2f9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java @@ -39,7 +39,6 @@ public class ExSubPledgeSkillAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUB_PLEDGET_SKILL_ADD.writeId(packet); - packet.writeD(_type); packet.writeD(_skillId); packet.writeD(_skillLevel); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java index d61dfa20ab..816d6f16a6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java @@ -97,7 +97,6 @@ public class ExSubjobInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUBJOB_INFO.writeId(packet); - packet.writeC(_type); packet.writeD(_currClassId); packet.writeD(_currRace); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java index 85616016c7..b7a152629d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java @@ -38,7 +38,6 @@ public class ExTacticalSign implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TACTICAL_SIGN.writeId(packet); - packet.writeD(_target.getObjectId()); packet.writeD(_tokenId); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java index 3486e6281d..9e03a8bd0a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java @@ -39,7 +39,6 @@ public class ExTeleportToLocationActivate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_TO_LOCATION_ACTIVATE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java index a214c53a0f..7bcddd964d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java @@ -27,6 +27,7 @@ public class ExUISetting implements IClientOutgoingPacket { public static final String UI_KEY_MAPPING_VAR = "UI_KEY_MAPPING"; public static final String SPLIT_VAR = " "; + private final byte[] _uiKeyMapping; public ExUISetting(Player player) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java index 187770cfc8..eff4285a8b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java @@ -37,7 +37,6 @@ public class ExUnReadMailCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_UN_READ_MAIL_COUNT.writeId(packet); - packet.writeD(_mailUnreadCount); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java index f992b3c937..e59c651371 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java @@ -41,7 +41,6 @@ public class ExUseSharedGroupItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USE_SHARED_GROUP_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeD(_grpId); packet.writeD(_remainingTime); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java index 474fcc5208..f49d451587 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class ExUserInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getTransformationId()); - final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); final boolean isInvisible = _player.isInvisible(); packet.writeD(abnormalVisualEffects.size() + (isInvisible ? 1 : 0)); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java index b841449ab3..1069a64e3e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java @@ -36,12 +36,9 @@ public class ExUserInfoCubic implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_CUBIC.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(_player.getCubics().size()); - _player.getCubics().keySet().forEach(packet::writeH); - packet.writeD(_player.getAgathionId()); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java index 3e4afb995b..6ef31d6117 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java @@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExUserInfoEquipSlot extends AbstractMaskPacket { private final Player _player; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -66,11 +65,9 @@ public class ExUserInfoEquipSlot extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_EQUIP_SLOT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(InventorySlot.values().length); // 152 packet.writeB(_masks); - final PlayerInventory inventory = _player.getInventory(); for (InventorySlot slot : InventorySlot.values()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java index 3eb1cf9578..d655e48843 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java @@ -36,7 +36,6 @@ public class ExUserInfoInvenWeight implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_INVEN_WEIGHT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java index 91e0e92338..16aa81e9c0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java @@ -44,7 +44,6 @@ public class ExValidateLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java index 727267c9d5..50cb4025e4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java @@ -35,7 +35,6 @@ public class ExVariationCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_CANCEL_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java index 5cdc1b8d0e..4fde190ae2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java @@ -32,14 +32,13 @@ public class ExVariationResult implements IClientOutgoingPacket { _option1 = option1; _option2 = option2; - _success = success ? 0x01 : 0x00; + _success = success ? 1 : 0; } @Override public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_RESULT.writeId(packet); - packet.writeD(_option1); packet.writeD(_option2); packet.writeD(_success); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java index db0acfd5ff..60fb57c0b3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java @@ -41,10 +41,9 @@ public class ExVitalityEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_EFFECT_INFO.writeId(packet); - packet.writeD(_points); packet.writeD(_vitalityBonus); // Vitality Bonus - packet.writeH(0x00); // Vitality additional bonus in % + packet.writeH(0); // Vitality additional bonus in % packet.writeH(_vitalityItemsRemaining); // How much vitality items remaining for use packet.writeH(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java index 3cd9d26602..9a401c2321 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java @@ -35,7 +35,6 @@ public class ExVitalityPointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_POINT_INFO.writeId(packet); - packet.writeD(_vitalityPoints); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java index 71baff96ea..c4c5539ca4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java @@ -45,7 +45,6 @@ public class ExVoteSystemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VOTE_SYSTEM_INFO.writeId(packet); - packet.writeD(_recomLeft); packet.writeD(_recomHave); packet.writeD(_bonusTime); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java index bc41adf7f2..8abcfc022e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java @@ -37,7 +37,6 @@ public class ExWorldChatCnt implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_WORLD_CHAT_CNT.writeId(packet); - packet.writeD(_points); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java index 5f935fe0dc..dc9c2288f8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java @@ -79,19 +79,17 @@ public class FakePlayerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // vehicleId + packet.writeD(0); // vehicleId packet.writeD(_objId); packet.writeS(_npc.getName()); - packet.writeH(_npc.getRace().ordinal()); - packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 0x01 : 0x00); + packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 1 : 0); packet.writeD(_fpcHolder.getClassId()); - - packet.writeD(0x00); // Inventory.PAPERDOLL_UNDER + packet.writeD(0); // Inventory.PAPERDOLL_UNDER packet.writeD(_fpcHolder.getEquipHead()); packet.writeD(_fpcHolder.getEquipRHand()); packet.writeD(_fpcHolder.getEquipLHand()); @@ -103,28 +101,22 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_fpcHolder.getEquipRHand()); // dual hand packet.writeD(_fpcHolder.getEquipHair()); packet.writeD(_fpcHolder.getEquipHair2()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderAugument()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } - packet.writeC(_fpcHolder.getArmorEnchantLevel()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderVisualId()) { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeC(_npc.getScriptValue()); // getPvpFlag() packet.writeD(_npc.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -135,16 +127,12 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_npc.getCollisionRadius()); packet.writeF(_npc.getCollisionHeight()); - packet.writeD(_fpcHolder.getHair()); packet.writeD(_fpcHolder.getHairColor()); packet.writeD(_fpcHolder.getFace()); - packet.writeS(_npc.getTemplate().getTitle()); - if (_clan != null) { packet.writeD(_clan.getId()); @@ -154,71 +142,51 @@ public class FakePlayerInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - - packet.writeC(0x01); // isSitting() ? 0x00 : 0x01 (at some initial tests it worked) - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); - packet.writeC(_npc.isInCombat() ? 0x01 : 0x00); - - packet.writeC(_npc.isAlikeDead() ? 0x01 : 0x00); - - packet.writeC(_npc.isInvisible() ? 0x01 : 0x00); - - packet.writeC(0x00); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount - packet.writeC(0x00); // getPrivateStoreType().getId() - - packet.writeH(0x00); // getCubics().size() + packet.writeC(1); // isSitting() ? 0 : 1 (at some initial tests it worked) + packet.writeC(_npc.isRunning() ? 1 : 0); + packet.writeC(_npc.isInCombat() ? 1 : 0); + packet.writeC(_npc.isAlikeDead() ? 1 : 0); + packet.writeC(_npc.isInvisible() ? 1 : 0); + packet.writeC(0); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount + packet.writeC(0); // getPrivateStoreType().getId() + packet.writeH(0); // getCubics().size() // getCubics().keySet().forEach(packet::writeH); - packet.writeC(0x00); - + packet.writeC(0); packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : 0); packet.writeH(_fpcHolder.getRecommends()); - packet.writeD(0x00); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 - + packet.writeD(0); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 packet.writeD(_fpcHolder.getClassId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(_fpcHolder.getWeaponEnchantLevel()); // isMounted() ? 0 : _enchantLevel - packet.writeC(_npc.getTeam().getId()); - - packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0x00); + packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0); packet.writeC(_fpcHolder.getNobleLevel()); - packet.writeC(_fpcHolder.isHero() ? 0x01 : 0x00); - - packet.writeC(_fpcHolder.isFishing() ? 0x01 : 0x00); - + packet.writeC(_fpcHolder.isHero() ? 1 : 0); + packet.writeC(_fpcHolder.isFishing() ? 1 : 0); packet.writeD(_fpcHolder.getBaitLocationX()); packet.writeD(_fpcHolder.getBaitLocationY()); packet.writeD(_fpcHolder.getBaitLocationZ()); - packet.writeD(_fpcHolder.getNameColor()); - packet.writeD(_heading); - packet.writeC(_fpcHolder.getPledgeStatus()); - packet.writeH(0x00); // getPledgeType() - + packet.writeH(0); // getPledgeType() packet.writeD(_fpcHolder.getTitleColor()); - - packet.writeC(0x00); // isCursedWeaponEquipped - - packet.writeD(0x00); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 - packet.writeD(0x00); // getTransformationDisplayId() + packet.writeC(0); // isCursedWeaponEquipped + packet.writeD(0); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 + packet.writeD(0); // getTransformationDisplayId() packet.writeD(_fpcHolder.getAgathionId()); - - packet.writeC(0x00); - - packet.writeD(0x00); // getCurrentCp() + packet.writeC(0); + packet.writeD(0); // getCurrentCp() packet.writeD(_npc.getMaxHp()); packet.writeD((int) Math.round(_npc.getCurrentHp())); packet.writeD(_npc.getMaxMp()); packet.writeD((int) Math.round(_npc.getCurrentMp())); - - packet.writeC(0x00); + packet.writeC(0); final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) @@ -229,9 +197,9 @@ public class FakePlayerInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(0x00); // cocPlayer.getPosition() - packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 0x01 : 0x00); - packet.writeC(0x00); // Used Ability Points + packet.writeC(0); // cocPlayer.getPosition() + packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 1 : 0); + packet.writeC(0); // Used Ability Points return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java index ae088538da..03223c8a3e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java @@ -62,7 +62,6 @@ public class FlyToLocation implements IClientOutgoingPacket _destY = destY; _destZ = destZ; _type = type; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -82,7 +81,6 @@ public class FlyToLocation implements IClientOutgoingPacket _flySpeed = flySpeed; _flyDelay = flyDelay; _animationSpeed = animationSpeed; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -103,7 +101,6 @@ public class FlyToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FLY_TO_LOCATION.writeId(packet); - packet.writeD(_chaObjId); packet.writeD(_destX); packet.writeD(_destY); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java index 1e52b0ef72..471d70f791 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java @@ -35,8 +35,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x01); + packet.writeC(1); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index ef1d37297e..2ee6ffbcd9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -50,25 +50,24 @@ public class GMHennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GMHENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON packet.writeH(_player.getHennaValue(BaseStat.MEN)); // equip MEN packet.writeH(_player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeH(_player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeH(0x00); // equip LUC - packet.writeH(0x00); // equip CHA + packet.writeH(0); // equip LUC + packet.writeH(0); // equip CHA packet.writeD(3); // Slots packet.writeD(_hennas.size()); // Size for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java index 38ca4c7be0..59bf0d9d93 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java @@ -38,7 +38,6 @@ public class GMHide implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_HIDE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index cd876896af..c2f0803303 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -50,7 +50,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -69,8 +68,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getINT()); packet.writeD(_player.getWIT()); packet.writeD(_player.getMEN()); - packet.writeD(0x00); // LUC - packet.writeD(0x00); // CHA + packet.writeD(0); // LUC + packet.writeD(0); // CHA packet.writeD(_player.getMaxHp()); packet.writeD((int) _player.getCurrentHp()); packet.writeD(_player.getMaxMp()); @@ -79,28 +78,24 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); packet.writeD(_player.getPkKills()); - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollObjectId(slot)); } - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); } - for (int slot = 0; slot < 11; slot++) { final VariationInstance augment = _player.getInventory().getPaperdollAugmentation(slot); packet.writeD(augment != null ? augment.getOption1Id() : 0); // Confirmed packet.writeD(augment != null ? augment.getOption2Id() : 0); // Confirmed } - packet.writeC(_player.getInventory().getTalismanSlots()); // CT2.3 packet.writeC(_player.getInventory().canEquipCloak() ? 1 : 0); // CT2.3 - packet.writeD(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeH(0); packet.writeD(_player.getPAtk()); packet.writeD(_player.getPAtkSpd()); packet.writeD(_player.getPDef()); @@ -108,18 +103,14 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAccuracy()); packet.writeD(_player.getCriticalHit()); packet.writeD(_player.getMAtk()); - packet.writeD(_player.getMAtkSpd()); packet.writeD(_player.getPAtkSpd()); - packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicEvasionRate()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name packet.writeD(_player.getReputation()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -135,8 +126,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeD(_player.isGM() ? 0x01 : 0x00); // builder level - + packet.writeD(_player.isGM() ? 1 : 0); // builder level packet.writeS(_player.getTitle()); packet.writeD(_player.getClanId()); // pledge id packet.writeD(_player.getClanCrestId()); // pledge crest id @@ -146,26 +136,19 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeC(_player.hasDwarvenCraft() ? 1 : 0); packet.writeD(_player.getPkKills()); packet.writeD(_player.getPvpKills()); - packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); - - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeC(321); - packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window - - packet.writeC(_player.isNoble() ? 0x01 : 0x00); - packet.writeC(_player.isHero() ? 0x01 : 0x00); - + packet.writeC(_player.isNoble() ? 1 : 0); + packet.writeC(_player.isHero() ? 1 : 0); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); - final AttributeType attackAttribute = _player.getAttackElement(); packet.writeH(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); @@ -175,8 +158,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket } packet.writeD(_player.getFame()); packet.writeD(_player.getVitalityPoints()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index 1d88596096..552b6e6168 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -37,14 +37,12 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_player.getName()); packet.writeD(_clan.getId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); @@ -52,15 +50,14 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 packet.writeD(_clan.getAllyCrestId()); // c2 packet.writeD(_clan.isAtWar() ? 1 : 0); // c3 - packet.writeD(0x00); // T3 Unknown - + packet.writeD(0); // T3 Unknown packet.writeD(_clan.getMembers().size()); for (ClanMember member : _clan.getMembers()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java index 93af10e254..3c155ff816 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -38,10 +38,8 @@ public class GMViewSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_SKILL_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_skills.size()); - final boolean isDisabled = (_player.getClan() != null) && (_player.getClan().getReputationScore() < 0); for (Skill skill : _skills) { @@ -49,7 +47,7 @@ public class GMViewSkillInfo implements IClientOutgoingPacket packet.writeH(skill.getDisplayLevel()); packet.writeH(skill.getSubLevel()); packet.writeD(skill.getDisplayId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(isDisabled && skill.isClanSkill() ? 1 : 0); packet.writeC(skill.isEnchantable() ? 1 : 0); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index f49138fafe..c909d5e6e1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -51,7 +51,6 @@ public class GMViewWarehouseWithdrawList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_WAREHOUSE_WITHDRAW_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java index d8c273f914..449271993b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java @@ -35,7 +35,6 @@ public class GameGuardQuery implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GAME_GUARD_QUERY.writeId(packet); - packet.writeD(0x27533DD9); packet.writeD(0x2E72A51D); packet.writeD(0x2017038B); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index b0c011b696..037b2e6b6b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -35,10 +35,8 @@ public class GetItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ITEM.writeId(packet); - packet.writeD(_playerId); packet.writeD(_item.getObjectId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java index f8c6126c87..5f4d7bf3ca 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java @@ -50,7 +50,6 @@ public class GetOffVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_OFF_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java index ffa8d5f310..77d1e6ba28 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java @@ -45,7 +45,6 @@ public class GetOnVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ON_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java index e5dcb9ded6..b1f5b588f9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java @@ -44,14 +44,13 @@ public class GmViewQuestInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_QUEST_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeH(_questList.size()); // quest count - for (Quest quest : _questList) { final QuestState qs = _player.getQuestState(quest.getName()); packet.writeD(quest.getId()); packet.writeD(qs == null ? 0 : qs.getCond()); } - packet.writeH(0x00); // some size + packet.writeH(0); // some size // for size; ddQQ return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 7e0614b359..3283ac802a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -51,7 +51,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeQ(_player.getAdena()); // activeChar current amount of Adena packet.writeD(3); // available equip slot packet.writeD(_hennaEquipList.size()); - for (Henna henna : _hennaEquipList) { // Player must have at least one dye in inventory @@ -62,8 +61,8 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); // item Id of the dye packet.writeQ(henna.getWearCount()); // amount of dyes required packet.writeQ(henna.getWearFee()); // amount of Adena required - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not - // packet.writeD(0x00); // Does not exist in Classic. + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // meet the requirement or not + // packet.writeD(0); // Does not exist in Classic. } } return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 0e6e64c7b2..23364ad722 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -50,25 +50,24 @@ public class HennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON packet.writeH(_player.getHennaValue(BaseStat.MEN)); // equip MEN packet.writeH(_player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeH(_player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeH(0x00); // equip LUC - packet.writeH(0x00); // equip CHA + packet.writeH(0); // equip LUC + packet.writeH(0); // equip CHA packet.writeD(3 - _player.getHennaEmptySlots()); // Slots packet.writeD(_hennas.size()); // Size for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); } - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 658087380a..9a22f0a564 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -40,12 +40,11 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_ITEM_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getWearCount()); // total amount of dye require packet.writeQ(_henna.getWearFee()); // total amount of Adena require to draw symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to draw or not 0 is false and 1 is true + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to draw or not 0 is false and 1 is true packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() + _player.getHennaValue(BaseStat.INT)); // equip INT @@ -59,7 +58,7 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket packet.writeH(_player.getDEX() + _player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeD(_player.getWIT()); // current WIT packet.writeH(_player.getWIT() + _player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 3800940bac..162812f30b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -40,12 +40,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getCancelCount()); // total amount of dye require packet.writeQ(_henna.getCancelFee()); // total amount of Adena require to remove symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to remove or not + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to remove or not packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() - _player.getHennaValue(BaseStat.INT)); // equip INT @@ -59,11 +58,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket packet.writeH(_player.getDEX() - _player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeD(_player.getWIT()); // current WIT packet.writeH(_player.getWIT() - _player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeD(0x00); // current LUC - packet.writeH(0x00); // equip LUC - packet.writeD(0x00); // current CHA - packet.writeH(0x00); // equip CHA - packet.writeD(0x00); + packet.writeD(0); // current LUC + packet.writeH(0); // equip LUC + packet.writeD(0); // current CHA + packet.writeH(0); // equip CHA + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 3a780986a0..d9f092b327 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -37,11 +37,9 @@ public class HennaRemoveList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); - packet.writeD(0x03); // seems to be max size + packet.writeD(3); // seems to be max size packet.writeD(3 - _player.getHennaEmptySlots()); - for (Henna henna : _player.getHennaList()) { if (henna != null) @@ -50,7 +48,7 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); packet.writeQ(henna.getCancelCount()); packet.writeQ(henna.getCancelFee()); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index b5c8628b50..f2a9cf1822 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -89,14 +89,12 @@ public interface IClientOutgoingPacket extends IOutgoingPacket Inventory.PAPERDOLL_ARTIFACT20, Inventory.PAPERDOLL_ARTIFACT21, }; - int[] PAPERDOLL_ORDER_AUGMENT = new int[] { Inventory.PAPERDOLL_RHAND, Inventory.PAPERDOLL_LHAND, Inventory.PAPERDOLL_RHAND }; - int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 0c54e810f0..3378827f34 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -46,7 +46,6 @@ public class InventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index c4598a72e6..cef69ecb6f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -59,8 +59,8 @@ public class ItemList extends AbstractItemPacket } else { - packet.writeC(0x01); // _showWindow ? 0x01 : 0x00 - packet.writeD(0x00); + packet.writeC(1); // _showWindow ? 1 : 0 + packet.writeD(0); packet.writeD(_items.size()); } writeInventoryBlock(packet, _player.getInventory()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java index b32b4df4a3..c3b9918230 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java @@ -32,9 +32,8 @@ public class JoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PARTY.writeId(packet); - packet.writeD(_response); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java index 65e06efeb7..f347f7efcd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java @@ -32,7 +32,6 @@ public class JoinPledge implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PLEDGE.writeId(packet); - packet.writeD(_pledgeId); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index 96f6d7c34d..996622b9e9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -35,17 +35,16 @@ public class KeyPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VERSION_CHECK.writeId(packet); - packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok for (int i = 0; i < 8; i++) { packet.writeC(_key[i]); // key } - packet.writeD(0x01); + packet.writeD(1); packet.writeD(Config.SERVER_ID); // server id - packet.writeC(0x01); - packet.writeD(0x00); // obfuscation key - packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 0x01 : 0x00); // isClassic + packet.writeC(1); + packet.writeD(0); // obfuscation key + packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 1 : 0); // isClassic return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java index 484c10f0c4..62424fd03a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java @@ -40,7 +40,6 @@ public class L2FriendSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_SAY.writeId(packet); - packet.writeD(0); // ?? packet.writeS(_receiver); packet.writeS(_sender); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java index b875edb772..790d599b5b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java @@ -32,11 +32,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ListPartyWaiting implements IClientOutgoingPacket { + private static final int NUM_PER_PAGE = 64; + private final List _rooms = new LinkedList<>(); private final int _size; - private static final int NUM_PER_PAGE = 64; - public ListPartyWaiting(PartyMatchingRoomLevelType type, int location, int page, int requestorLevel) { final List rooms = MatchingRoomManager.getInstance().getPartyMathchingRooms(location, type, requestorLevel); @@ -57,7 +57,6 @@ public class ListPartyWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_PARTY_WATING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java index 4f8f9adc64..bb0ac61dbd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java @@ -54,7 +54,6 @@ public class LoginFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LOGIN_FAIL.writeId(packet); - packet.writeD(_success); packet.writeD(_reason); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java index 18a522c315..6743e3e66f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java @@ -32,7 +32,6 @@ public class MagicSkillCanceld implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_CANCELED.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java index d56de10079..7ab29cc1a8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java @@ -66,7 +66,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // MagicSkillUse castingType packet.writeD(_objectId); packet.writeD(_skillId); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java index 3df8463279..a86626cfa6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java @@ -84,7 +84,6 @@ public class MagicSkillUse implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_USE.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // Casting bar type: 0 - default, 1 - default up, 2 - blue, 3 - green, 4 - red. packet.writeD(_creature.getObjectId()); packet.writeD(_target.getObjectId()); @@ -111,7 +110,7 @@ public class MagicSkillUse implements IClientOutgoingPacket packet.writeD(_target.getX()); packet.writeD(_target.getY()); packet.writeD(_target.getZ()); - packet.writeD(_actionId >= 0 ? 0x01 : 0x00); // 1 when ID from RequestActionUse is used + packet.writeD(_actionId >= 0 ? 1 : 0); // 1 when ID from RequestActionUse is used packet.writeD(_actionId >= 0 ? _actionId : 0); // ID from RequestActionUse. Used to set cooldown on summon skills. return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java index 6b710c692e..12e2488f24 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java @@ -37,11 +37,9 @@ public class ManagePledgePower implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet); - packet.writeD(_rank); packet.writeD(_action); packet.writeD(_clan.getRankPrivs(_rank).getBitmask()); - return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 95f4b6f201..4e2ab3f00b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -42,11 +42,9 @@ public class MonRaceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MON_RACE_INFO.writeId(packet); - packet.writeD(_unknown1); packet.writeD(_unknown2); - packet.writeD(0x08); - + packet.writeD(8); for (int i = 0; i < 8; i++) { packet.writeD(_monsters[i].getObjectId()); // npcObjectID @@ -68,7 +66,7 @@ public class MonRaceInfo implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java index 0093b3edc9..e6386921ff 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java @@ -45,13 +45,10 @@ public class MoveToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_xDst); packet.writeD(_yDst); packet.writeD(_zDst); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java index b1fb3ea003..59103c6c4c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java @@ -48,7 +48,6 @@ public class MoveToLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java index 30ff3c96af..aa261f924f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java @@ -50,11 +50,9 @@ public class MoveToPawn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_PAWN.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetId); packet.writeD(_distance); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index e1da19cc8f..50ff0191b8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -58,18 +58,16 @@ public class MultiSellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.MULTI_SELL_LIST.writeId(packet); - - packet.writeC(0x00); // Helios + packet.writeC(0); // Helios packet.writeD(_list.getId()); // list id - packet.writeC(0x00); // GOD Unknown + packet.writeC(0); // GOD Unknown packet.writeD(1 + (_index / PAGE_SIZE)); // page started from 1 - packet.writeD(_finished ? 0x01 : 0x00); // finished + packet.writeD(_finished ? 1 : 0); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - packet.writeC(0x00); // Grand Crusade - packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window - packet.writeD(0x20); // Helios - Always 32 - + packet.writeC(0); // Grand Crusade + packet.writeC(_list.isChanceMultisell() ? 1 : 0); // new multisell window + packet.writeD(32); // Helios - Always 32 while (_size-- > 0) { ItemInfo itemEnchantment = _list.getItemEnchantment(_index); @@ -86,19 +84,15 @@ public class MultiSellList extends AbstractItemPacket } } } - packet.writeD(_index); // Entry ID. Start from 1. packet.writeC(entry.isStackable() ? 1 : 0); - // Those values will be passed down to MultiSellChoose packet. packet.writeH(itemEnchantment != null ? itemEnchantment.getEnchantLevel() : 0); // enchant level writeItemAugment(packet, itemEnchantment); writeItemElemental(packet, itemEnchantment); writeItemEnsoulOptions(packet, itemEnchantment); - packet.writeH(entry.getProducts().size()); packet.writeH(entry.getIngredients().size()); - for (ItemChanceHolder product : entry.getProducts()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(product.getId()); @@ -122,7 +116,6 @@ public class MultiSellList extends AbstractItemPacket writeItemElemental(packet, displayItemEnchantment); writeItemEnsoulOptions(packet, displayItemEnchantment); } - for (ItemChanceHolder ingredient : entry.getIngredients()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(ingredient.getId()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java index 6e85f5348c..cd46aac3aa 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java @@ -45,11 +45,10 @@ public class MyTargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MY_TARGET_SELECTED.writeId(packet); - - packet.writeD(0x01); // Grand Crusade + packet.writeD(1); // Grand Crusade packet.writeD(_objectId); packet.writeH(_color); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java index 1901ad1297..166c5c1e00 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java @@ -36,7 +36,6 @@ public class NewCharacterSuccess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NEW_CHARACTER_SUCCESS.writeId(packet); - packet.writeD(_chars.size()); for (PlayerTemplate chr : _chars) { @@ -44,31 +43,24 @@ public class NewCharacterSuccess implements IClientOutgoingPacket { continue; } - // TODO: Unhardcode these packet.writeD(chr.getRace().ordinal()); packet.writeD(chr.getClassId().getId()); - packet.writeD(99); packet.writeD(chr.getBaseSTR()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseDEX()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseCON()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseINT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseWIT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseMEN()); packet.writeD(1); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java index be1605f679..6061ea26ef 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java @@ -38,7 +38,6 @@ public class NicknameChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NICK_NAME_CHANGED.writeId(packet); - packet.writeD(_objectId); packet.writeS(_title); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index f9cd107e2c..3e4837b4a4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -54,24 +54,20 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public NpcHtmlMessage(int npcObjId, int itemId) { super(npcObjId); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } public NpcHtmlMessage(int npcObjId, int itemId, String html) { super(npcObjId, html); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } @@ -79,11 +75,10 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java index 61f195e35d..05489103cb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java @@ -47,10 +47,8 @@ public class NpcInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -58,7 +56,6 @@ public class NpcInfo extends AbstractMaskPacket private int _clanId = 0; private int _statusMask = 0; private final Set _abnormalVisualEffects; - private String[] _localisation; public void setLang(String lang) @@ -101,112 +98,90 @@ public class NpcInfo extends AbstractMaskPacket { addComponentType(NpcInfoType.HEADING); } - if ((npc.getStat().getPAtkSpd() > 0) || (npc.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (npc.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((npc.getLeftHandItem() > 0) || (npc.getRightHandItem() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (npc.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (npc.getDisplayEffect() > 0) { addComponentType(NpcInfoType.DISPLAY_EFFECT); } - if (npc.isInsideZone(ZoneId.WATER) || npc.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (npc.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (npc.getCloneObjId() > 0) { addComponentType(NpcInfoType.CLONE); } - if (npc.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (npc.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (npc.getCurrentHp() <= npc.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (npc.getCurrentMp() <= npc.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (npc.getTemplate().isUsingServerSideName()) { addComponentType(NpcInfoType.NAME); } - if (npc.getTemplate().isUsingServerSideTitle() || (npc.isMonster() && (Config.SHOW_NPC_LEVEL || Config.SHOW_NPC_AGGRESSION)) || npc.isChampion() || npc.isTrap()) { addComponentType(NpcInfoType.TITLE); } - if (npc.getNameString() != null) { addComponentType(NpcInfoType.NAME_NPCSTRINGID); } - if (npc.getTitleString() != null) { addComponentType(NpcInfoType.TITLE_NPCSTRINGID); } - if (_npc.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (!_abnormalVisualEffects.isEmpty() || npc.isInvisible()) { addComponentType(NpcInfoType.ABNORMALS); } - if (npc.getEnchantEffect() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (npc.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (npc.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (npc.getClanId() > 0) { final Clan clan = ClanTable.getInstance().getClan(npc.getClanId()); @@ -220,14 +195,11 @@ public class NpcInfo extends AbstractMaskPacket addComponentType(NpcInfoType.CLAN); } } - addComponentType(NpcInfoType.COLOR_EFFECT); - if (npc.getPvpFlag() > 0) { addComponentType(NpcInfoType.PVP_FLAG); } - // TODO: Confirm me if (npc.isInCombat()) { @@ -245,8 +217,7 @@ public class NpcInfo extends AbstractMaskPacket { _statusMask |= 0x08; } - - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -296,27 +267,23 @@ public class NpcInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO.writeId(packet); - packet.writeD(_npc.getObjectId()); - packet.writeC(_npc.isShowSummonAnimation() ? 0x02 : 0x00); // // 0=teleported 1=default 2=summoned + packet.writeC(_npc.isShowSummonAnimation() ? 2 : 0); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 0x01 : 0x00); + packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { String title = _npc.getTitle(); - // Localisation related. if ((_localisation != null) && !_localisation[1].equals("")) { @@ -329,10 +296,8 @@ public class NpcInfo extends AbstractMaskPacket title = title.replace(NpcData.getInstance().getTemplate(_npc.getId()).getTitle(), _localisation[1]); } } - packet.writeS(title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -351,7 +316,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -366,20 +331,20 @@ public class NpcInfo extends AbstractMaskPacket if (containsMask(NpcInfoType.EQUIPPED)) { packet.writeD(_npc.getRightHandItem()); - packet.writeD(0x00); // Armor id? + packet.writeD(0); // Armor id? packet.writeD(_npc.getLeftHandItem()); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_npc.isDead() ? 0x00 : 0x01); + packet.writeC(_npc.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); + packet.writeC(_npc.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 0x01 : _npc.isFlying() ? 0x02 : 0x00); + packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -391,7 +356,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_npc.isFlying() ? 0x01 : 0x00); + packet.writeD(_npc.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { @@ -427,12 +392,12 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(0x00); // 2 - do some animation on spawn + packet.writeC(0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -464,12 +429,10 @@ public class NpcInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java index c95a8e5274..923e9cebad 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class NpcInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_npc.getObjectId()); packet.writeD(_npc.getTransformationDisplayId()); - final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size()); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java index a294edc57a..2a0ba41eeb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java @@ -38,7 +38,6 @@ public class NpcQuestHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NPC_QUEST_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_questId); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java index d3328ade97..fc6d0d4a3a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java @@ -106,7 +106,6 @@ public class NpcSay implements IClientOutgoingPacket { _parameters = new ArrayList<>(); } - for (String item : params) { if ((item != null) && (item.length() > 0)) @@ -127,11 +126,9 @@ public class NpcSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_SAY.writeId(packet); - packet.writeD(_objectId); packet.writeD(_textType.getClientId()); packet.writeD(_npcId); - // Localisation related. if (_lang != null) { @@ -147,7 +144,6 @@ public class NpcSay implements IClientOutgoingPacket } } } - packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java index 356e3f48a9..ac61f9d247 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java @@ -33,11 +33,10 @@ public class ObservationMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_START.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me packet.writeD(0xc0); // TODO: Find me return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java index 5c0a0766b3..896ccea02b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java @@ -33,7 +33,6 @@ public class ObservationReturn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_END.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java index c2f7ab404f..173772c870 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java @@ -37,7 +37,6 @@ public class OnEventTrigger implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EVENT_TRIGGER.writeId(packet); - packet.writeD(_emitterId); packet.writeC(_enabled); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index fbb5c84dfe..37d4fea9cf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -45,7 +45,6 @@ public class PackageSendableList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java index a53f589386..e24d63f717 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java @@ -39,7 +39,6 @@ public class PackageToList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_TO_LIST.writeId(packet); - packet.writeD(_players.size()); for (Entry entry : _players.entrySet()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 655c7abcd1..44b23b37f4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -55,7 +55,6 @@ public class PartyMemberPosition implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); - packet.writeD(locations.size()); for (Entry entry : locations.entrySet()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java index 9e275ec246..c9d3595037 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java @@ -36,7 +36,6 @@ public class PartyRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java index b9c7d06769..8c97cac6b5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java @@ -36,12 +36,10 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ADD.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); // c3 packet.writeD(_party.getDistributionType().getId()); // c3 packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); - packet.writeD((int) _member.getCurrentCp()); // c4 packet.writeD(_member.getMaxCp()); // c4 packet.writeD((int) _member.getCurrentHp()); @@ -51,7 +49,7 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket packet.writeD(_member.getVitalityPoints()); packet.writeC(_member.getLevel()); packet.writeH(_member.getClassId().getId()); - packet.writeC(0x00); + packet.writeC(0); packet.writeH(_member.getRace().ordinal()); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java index 65d0c60c2e..5ad91f5463 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java @@ -37,21 +37,17 @@ public class PartySmallWindowAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ALL.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); packet.writeC(_party.getDistributionType().getId()); packet.writeC(_party.getMemberCount() - 1); - for (Player member : _party.getMembers()) { if ((member != null) && (member != _exclude)) { packet.writeD(member.getObjectId()); packet.writeS(member.getName()); - packet.writeD((int) member.getCurrentCp()); // c4 packet.writeD(member.getMaxCp()); // c4 - packet.writeD((int) member.getCurrentHp()); packet.writeD(member.getMaxHp()); packet.writeD((int) member.getCurrentMp()); @@ -59,7 +55,7 @@ public class PartySmallWindowAll implements IClientOutgoingPacket packet.writeD(member.getVitalityPoints()); packet.writeC(member.getLevel()); packet.writeH(member.getClassId().getId()); - packet.writeC(0x01); // Unk + packet.writeC(1); // Unk packet.writeH(member.getRace().ordinal()); final Summon pet = member.getPet(); packet.writeD(member.getServitors().size() + (pet != null ? 1 : 0)); // Summon size, one only atm diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java index 94a8a5a2ce..09ce132af4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java @@ -33,7 +33,6 @@ public class PartySmallWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_DELETE.writeId(packet); - packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java index c53c6c7779..e9ea2efbbe 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java @@ -42,7 +42,6 @@ public class PartySmallWindowUpdate extends AbstractMaskPacket _summon.getStat().getExp()) { packet.writeQ(_summon.getStat().getExp()); // 0% absolute value @@ -160,9 +148,7 @@ public class PetInfo implements IClientOutgoingPacket { packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value } - packet.writeQ(_summon.getExpForNextLevel()); // 100% absoulte value - packet.writeD(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight packet.writeD(_summon.getMaxLoad()); // max weight it can carry packet.writeD(_summon.getPAtk()); // patk @@ -178,25 +164,20 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD((int) _summon.getStat().getMoveSpeed()); // speed packet.writeD(_summon.getPAtkSpd()); // atkspeed packet.writeD(_summon.getMAtkSpd()); // casting speed - packet.writeC(0); // TODO: Check me, might be ride status packet.writeC(_summon.getTeam().getId()); // Confirmed packet.writeC(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed packet.writeC(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed - - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. - + packet.writeD(0); // TODO: Find me + packet.writeD(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. packet.writeC(_summon.getOwner().getSummonPoints()); // Used Summon Points packet.writeC(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points - final Set aves = _summon.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeH(aves.size()); // Confirmed for (AbnormalVisualEffect ave : aves) { packet.writeH(ave.getClientId()); // Confirmed } - packet.writeC(_statusMask); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 5b43daa74b..1f60ec39d1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -46,7 +46,6 @@ public class PetInventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.PET_INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index e4cf35779f..16dc83b7ed 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -35,7 +35,6 @@ public class PetItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java index fdb00ddbb1..913f65d470 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java @@ -38,7 +38,6 @@ public class PetStatusShow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_SHOW.writeId(packet); - packet.writeD(_summonType); packet.writeD(_summonObjectId); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 25c2c74292..823a8c405a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -52,7 +52,6 @@ public class PetStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_UPDATE.writeId(packet); - packet.writeD(_summon.getSummonType()); packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getX()); @@ -69,7 +68,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket packet.writeQ(_summon.getStat().getExp()); packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value packet.writeQ(_summon.getExpForNextLevel()); // 100% absolute value - packet.writeD(0x01); // TODO: Find me! + packet.writeD(1); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java index 4bc3570779..0898b01f67 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java @@ -63,7 +63,6 @@ public class PlaySound implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLAY_SOUND.writeId(packet); - packet.writeD(_unknown1); // unknown 0 for quest and ship; packet.writeS(_soundFile); packet.writeD(_unknown3); // unknown 0 for quest; 1 for ship; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java index fbe57d4aaf..5108fe7e1b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java @@ -44,7 +44,6 @@ public class PledgeCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java index aa11b1213e..6805f64d7c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java @@ -34,7 +34,6 @@ public class PledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_INFO.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getId()); packet.writeS(_clan.getName()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java index 72f2c71838..193ee17589 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java @@ -36,12 +36,10 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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 - // clan or subpledge name if (_member.getPledgeType() != 0) { @@ -51,7 +49,6 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket { packet.writeS(_member.getClan().getName()); } - packet.writeS(_member.getApprenticeOrSponsorName()); // name of this member's apprentice/sponsor return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java index eefd482979..6aa5067c8f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java @@ -36,7 +36,6 @@ public class PledgeReceivePowerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_POWER_INFO.writeId(packet); - packet.writeD(_member.getPowerGrade()); // power grade packet.writeS(_member.getName()); packet.writeD(_member.getClan().getRankPrivs(_member.getPowerGrade()).getBitmask()); // privileges diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 818c38a076..01f71eea17 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -40,8 +40,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_SUB_PLEDGE_CREATED.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); packet.writeD(_subPledge.getId()); packet.writeS(_subPledge.getName()); packet.writeS(getLeaderName()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java index 4d0efeb82a..7649947064 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java @@ -43,7 +43,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(packet); - packet.writeD(_tab); // page packet.writeD(_clanList.size()); for (ClanWar clanWar : _clanList) @@ -53,7 +52,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket { continue; } - packet.writeS(clan.getName()); packet.writeD(clanWar.getState().ordinal()); // type: 0 = Declaration, 1 = Blood Declaration, 2 = In War, 3 = Victory, 4 = Defeat, 5 = Tie, 6 = Error packet.writeD(clanWar.getRemainingTime()); // Time if friends to start remaining diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java index 2cbbdbf046..80d10fcb66 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java @@ -34,26 +34,25 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_INFO_UPDATE.writeId(packet); - // sending empty data so client will ask all the info in response ;) packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getLevel()); // clan level packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); // castle state ? + packet.writeD(0); // castle state ? packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); // clan reputation score - packet.writeD(0x00); // ? - packet.writeD(0x00); // ? + packet.writeD(0); // ? + packet.writeD(0); // ? packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); // c5 packet.writeD(_clan.getAllyCrestId()); // c5 packet.writeD(_clan.isAtWar() ? 1 : 0); // c5 - packet.writeD(0x00); // TODO: Find me! - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java index ae26e50dbb..2fa9f26d4a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java @@ -51,12 +51,11 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ADD.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); - packet.writeD(0x00); - packet.writeD(0x01); + packet.writeD(0); + packet.writeD(1); packet.writeD(_isOnline); // 1 = online 0 = offline packet.writeD(_pledgeType); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index c5ea7b284b..a1be315cf4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -41,7 +41,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket { _clan = clan; _pledge = pledge; - _pledgeId = _pledge == null ? 0x00 : _pledge.getId(); + _pledgeId = _pledge == null ? 0 : _pledge.getId(); _leaderName = pledge == null ? clan.getLeaderName() : CharNameTable.getInstance().getNameById(pledge.getLeaderId()); _name = pledge == null ? clan.getName() : pledge.getName(); _members = _clan.getMembers(); @@ -65,31 +65,28 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(packet); - - packet.writeD(_isSubPledge ? 0x00 : 0x01); + packet.writeD(_isSubPledge ? 0 : 1); packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_pledgeId); packet.writeS(_name); packet.writeS(_leaderName); - packet.writeD(_clan.getCrestId()); // crest id .. is used again packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); // 0 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(0); // 0 packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.isAtWar() ? 1 : 0); // new c3 - packet.writeD(0x00); // Territory castle ID + packet.writeD(0); // Territory castle ID packet.writeD(_clan.getSubPledgeMembersCount(_pledgeId)); - for (ClanMember m : _members) { if (m.getPledgeType() != _pledgeId) @@ -107,8 +104,8 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket } else { - packet.writeD(0x01); // no visible effect - packet.writeD(0x01); // packet.writeD(1); + packet.writeD(1); // no visible effect + packet.writeD(1); // packet.writeD(1); } packet.writeD(m.isOnline() ? m.getObjectId() : 0); // objectId = online 0 = offline packet.writeD(m.getSponsor() != 0 ? 1 : 0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java index 0fd387e419..154bcc610d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java @@ -32,7 +32,6 @@ public class PledgeShowMemberListDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_DELETE.writeId(packet); - packet.writeS(_player); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java index c61f412ed0..7b8c7c516b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java @@ -66,7 +66,6 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index 4e89797e45..09f70ea024 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -62,14 +62,14 @@ public class PledgeSkillList implements IClientOutgoingPacket { packet.writeD(sk.getDisplayId()); packet.writeH(sk.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } for (SubPledgeSkill sk : _subSkills) { packet.writeD(sk._subType); // Clan Sub-unit types packet.writeD(sk._skillId); packet.writeH(sk._skillLevel); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java index f3b8d4c26c..a94601294f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java @@ -37,7 +37,6 @@ public class PledgeSkillListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST_ADD.writeId(packet); - packet.writeD(_id); packet.writeD(_level); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java index 9e1b4843ac..5f32f2bf54 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java @@ -33,15 +33,14 @@ public class PledgeStatusChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_STATUS_CHANGED.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getLeaderId()); packet.writeD(_clan.getId()); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getAllyId()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.getCrestLargeId()); - packet.writeD(0x00); // pledge type ? + packet.writeD(0); // pledge type ? return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java index 5b56d0b28d..41d0f9f7d8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java @@ -44,12 +44,10 @@ public class PrivateStoreListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_LIST.writeId(packet); - packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); // Viewer's item count? + packet.writeD(0); // Viewer's item count? packet.writeD(_items.size()); - int slotNumber = 0; for (TradeItem item : _items) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 67b6ba8d94..d72050283e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -43,11 +43,10 @@ public class PrivateStoreListSell extends AbstractItemPacket else { OutgoingPackets.PRIVATE_STORE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index d05590cbde..df056c2e43 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -60,13 +60,13 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket { packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); + packet.writeD(0); for (Item item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item2 : _buyList) { writeItem(packet, item2); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index d8768104a4..6bbabb282b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -63,13 +63,13 @@ public class PrivateStoreManageListSell extends AbstractItemPacket packet.writeD(_objId); packet.writeD(_packageSale ? 1 : 0); packet.writeQ(_playerAdena); - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item2 : _sellList) { writeItem(packet, item2); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java index 8a5b9eef92..0d7bcbea16 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgBuy implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java index b00bd2add2..8fdb5701b8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgSell implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java index c3958367e8..5ddaa46ba0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java @@ -40,7 +40,6 @@ public class RadarControl implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RADAR_CONTROL.writeId(packet); - packet.writeD(_showRadar); packet.writeD(_type); // maybe type packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java index 3918894601..5d67413b6f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java @@ -43,10 +43,8 @@ public class RecipeBookItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_BOOK_ITEM_LIST.writeId(packet); - - packet.writeD(_isDwarvenCraft ? 0x00 : 0x01); // 0 = Dwarven - 1 = Common + packet.writeD(_isDwarvenCraft ? 0 : 1); // 0 = Dwarven - 1 = Common packet.writeD(_maxMp); - if (_recipes == null) { packet.writeD(0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 59ec218c84..9f460fe896 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -55,11 +55,10 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeD((int) _player.getCurrentMp()); packet.writeD(_player.getMaxMp()); packet.writeD(_success ? 1 : 0); // item creation success/failed - packet.writeC(0x00); - packet.writeQ(0x00); + packet.writeC(0); + packet.writeQ(0); return true; } - PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java index 4474a37c03..f4db5be9df 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java @@ -35,15 +35,14 @@ public class RecipeShopItemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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); - packet.writeQ(0x00); - packet.writeC(0x00); // Trigger offering window if 1 - packet.writeQ(0x00); + packet.writeQ(0); + packet.writeC(0); // Trigger offering window if 1 + packet.writeQ(0); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java index 75e45f5877..38b0b8ea4e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java @@ -43,7 +43,6 @@ public class RecipeShopManageList implements IClientOutgoingPacket { _recipes = _seller.getCommonRecipeBook(); } - if (_seller.hasManufactureShop()) { final Iterator it = _seller.getManufactureItems().values().iterator(); @@ -63,11 +62,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MANAGE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD((int) _seller.getAdena()); - packet.writeD(_isDwarven ? 0x00 : 0x01); - + packet.writeD(_isDwarven ? 0 : 1); if (_recipes == null) { packet.writeD(0); @@ -83,10 +80,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket packet.writeD(count); } } - if (!_seller.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -94,7 +90,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket for (ManufactureItem item : _seller.getManufactureItems().values()) { packet.writeD(item.getRecipeId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeQ(item.getCost()); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java index c025b5e4ed..2b9bc5b6e7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java @@ -33,7 +33,6 @@ public class RecipeShopMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MSG.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeS(_player.getStoreName()); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java index be8ae1181e..8b3cb42f47 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java @@ -36,14 +36,13 @@ public class RecipeShopSellList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_SELL_LIST.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD((int) _manufacturer.getCurrentMp()); // Creator's MP packet.writeD(_manufacturer.getMaxMp()); // Creator's MP packet.writeQ(_buyer.getAdena()); // Buyer Adena if (!_manufacturer.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -51,7 +50,7 @@ public class RecipeShopSellList implements IClientOutgoingPacket for (ManufactureItem temp : _manufacturer.getManufactureItems().values()) { packet.writeD(temp.getRecipeId()); - packet.writeD(0x00); // unknown + packet.writeD(0); // unknown packet.writeQ(temp.getCost()); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 74700e29b0..269e14d50b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -88,7 +88,6 @@ public class RelationChanged implements IClientOutgoingPacket { return; } - final Relation r = new Relation(); r._objId = activeChar.getObjectId(); r._relation = relation; @@ -102,7 +101,6 @@ public class RelationChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RELATION_CHANGED.writeId(packet); - packet.writeC(_mask); if (_multi == null) { @@ -122,7 +120,6 @@ public class RelationChanged implements IClientOutgoingPacket private void writeRelation(PacketWriter packet, Relation relation) { packet.writeD(relation._objId); - if ((_mask & SEND_DEFAULT) != SEND_DEFAULT) { packet.writeD(relation._relation); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java index b4e9dc25c5..4477cfb705 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java @@ -35,7 +35,6 @@ public class RequestEnchant implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java index 4ef15fb74c..7a0a6cbe58 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java @@ -33,7 +33,6 @@ public class Revive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.REVIVE.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java index 9c409601e3..b9ddf7733f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java @@ -42,7 +42,6 @@ public class Ride implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RIDE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_mounted); packet.writeD(_rideType); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 813ce03f4d..13ef62f55f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -49,11 +49,9 @@ public class SellListProcure implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SELL_LIST_PROCURE.writeId(packet); - packet.writeQ(_money); // money - packet.writeD(0x00); // lease ? + packet.writeD(0); // lease ? packet.writeH(_sellList.size()); // list size - for (Entry entry : _sellList.entrySet()) { final Item item = entry.getKey(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java index baa37a8507..75b5b07854 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java @@ -39,12 +39,10 @@ public class SendMacroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MACRO_LIST.writeId(packet); - packet.writeC(_updateType.getId()); - packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0x00); // modified, created or deleted macro's id + packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0); // modified, created or deleted macro's id packet.writeC(_count); // count of Macros packet.writeC(_macro != null ? 1 : 0); // unknown - if ((_macro != null) && (_updateType != MacroUpdateType.DELETE)) { packet.writeD(_macro.getId()); // Macro ID @@ -52,9 +50,7 @@ public class SendMacroList implements IClientOutgoingPacket packet.writeS(_macro.getDescr()); // Desc packet.writeS(_macro.getAcronym()); // acronym packet.writeD(_macro.getIcon()); // icon - packet.writeC(_macro.getCommands().size()); // count - int i = 1; for (MacroCmd cmd : _macro.getCommands()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java index 47fada25be..21622b5f19 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java @@ -32,7 +32,6 @@ public class SendTradeRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_REQUEST.writeId(packet); - packet.writeD(_senderId); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java index 69aa749406..1513a0e3d1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java @@ -55,7 +55,6 @@ public class ServerObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SERVER_OBJECT_INFO.writeId(packet); - packet.writeD(_activeChar.getObjectId()); packet.writeD(_displayId + 1000000); packet.writeS(_name); // name @@ -70,8 +69,8 @@ public class ServerObjectInfo implements IClientOutgoingPacket packet.writeF(_collisionHeight); packet.writeD((int) (_isAttackable ? _activeChar.getCurrentHp() : 0)); packet.writeD(_isAttackable ? _activeChar.getMaxHp() : 0); - packet.writeD(0x01); // object type - packet.writeD(0x00); // special effects + packet.writeD(1); // object type + packet.writeD(0); // special effects return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java index 88b370ad8b..0164e5c4a2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java @@ -34,7 +34,6 @@ public class SetSummonRemainTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SET_SUMMON_REMAIN_TIME.writeId(packet); - packet.writeD(_maxTime); packet.writeD(_remainingTime); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java index db28b72acf..016f5a0c9a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java @@ -38,7 +38,6 @@ public class ShopPreviewInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_INFO.writeId(packet); - packet.writeD(Inventory.PAPERDOLL_TOTALSLOTS); // Slots packet.writeD(getFromList(Inventory.PAPERDOLL_UNDER)); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index df50db952f..a55186f551 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -51,11 +51,9 @@ public class ShopPreviewList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_LIST.writeId(packet); - packet.writeD(5056); packet.writeQ(_money); // current money packet.writeD(_listId); - int newlength = 0; for (Product product : _list) { @@ -65,23 +63,20 @@ public class ShopPreviewList implements IClientOutgoingPacket } } packet.writeH(newlength); - for (Product product : _list) { if ((product.getItem().getCrystalType().getLevel() <= _expertise) && product.getItem().isEquipable()) { packet.writeD(product.getItemId()); packet.writeH(product.getItem().getType2()); // item type2 - if (product.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { packet.writeQ(product.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } else { - packet.writeQ(0x00); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand + packet.writeQ(0); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } - packet.writeQ(Config.WEAR_PRICE); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 298301ed0d..b13080ff28 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -40,7 +40,6 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_BUFF_STATUS_UPDATE.writeId(packet); - packet.writeD(_skillId); packet.writeH(_skillLevel); packet.writeH(_skillSubLevel); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index c6a67fb97c..b8624ce4cd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -33,7 +33,6 @@ public class ShortCutInit implements IClientOutgoingPacket { return; } - _shortCuts = player.getAllShortCuts(); } @@ -41,24 +40,22 @@ public class ShortCutInit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); packet.writeD(sc.getSlot() + (sc.getPage() * 12)); - switch (sc.getType()) { case ITEM: { packet.writeD(sc.getId()); - packet.writeD(0x01); // Enabled or not + packet.writeD(1); // Enabled or not packet.writeD(sc.getSharedReuseGroup()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeQ(0x00); // Augment id - packet.writeD(0x00); // Visual id + packet.writeD(0); + packet.writeD(0); + packet.writeQ(0); // Augment id + packet.writeD(0); // Visual id break; } case SKILL: @@ -67,8 +64,8 @@ public class ShortCutInit implements IClientOutgoingPacket packet.writeH(sc.getLevel()); packet.writeH(sc.getSubLevel()); packet.writeD(sc.getSharedReuseGroup()); - packet.writeC(0x00); // C5 - packet.writeD(0x01); // C6 + packet.writeC(0); // C5 + packet.writeD(1); // C6 break; } case ACTION: @@ -77,7 +74,7 @@ public class ShortCutInit implements IClientOutgoingPacket case BOOKMARK: { packet.writeD(sc.getId()); - packet.writeD(0x01); // C6 + packet.writeD(1); // C6 } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java index 43d61af661..f099eab47e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java @@ -37,7 +37,6 @@ public class ShortCutRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_REGISTER.writeId(packet); - packet.writeD(_shortcut.getType().ordinal()); packet.writeD(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client switch (_shortcut.getType()) @@ -47,10 +46,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeD(_shortcut.getId()); packet.writeD(_shortcut.getCharacterType()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeD(0x00); // unknown - packet.writeD(0x00); // unknown - packet.writeD(0x00); // item augment id - packet.writeD(0x00); // TODO: Find me, item visual id ? + packet.writeD(0); // unknown + packet.writeD(0); // unknown + packet.writeD(0); // item augment id + packet.writeD(0); // TODO: Find me, item visual id ? break; } case SKILL: @@ -59,10 +58,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeH(_shortcut.getLevel()); packet.writeH(_shortcut.getSubLevel()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeC(0x00); // C5 + packet.writeC(0); // C5 packet.writeD(_shortcut.getCharacterType()); - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me + packet.writeD(0); // TODO: Find me break; } case ACTION: diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java index d6f71b5f70..cfae3b3fad 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java @@ -54,7 +54,6 @@ public class ShowBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - packet.writeC(_showBoard); // c4 1 to show community 00 to hide packet.writeS("bypass _bbshome"); // top packet.writeS("bypass _bbsgetfav"); // favorite diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java index 4b62a7001b..4d62e99d7a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java @@ -32,7 +32,6 @@ public class ShowCalculator implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_CALC.writeId(packet); - packet.writeD(_calculatorId); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java index 55f58d5375..4574762467 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java @@ -32,9 +32,8 @@ public class ShowMiniMap implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_MINIMAP.writeId(packet); - packet.writeD(_mapId); - packet.writeC(0x00); // Seven Signs state + packet.writeC(0); // Seven Signs state return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java index 303eab4e8a..97100d09d2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java @@ -34,7 +34,6 @@ public class ShowPCCafeCouponShowUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_PCCAFE_COUPON_SHOW_UI.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java index d86958e586..0a0f3ae861 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java @@ -35,7 +35,6 @@ public class ShowXMasSeal implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_XMAS_SEAL.writeId(packet); - packet.writeD(_item); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java index 66eccc7fbf..1baa030c4d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java @@ -28,9 +28,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = ca
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Attackers Clans?
* d = Number of Attackers Clans
* { //repeats
@@ -58,11 +58,10 @@ public class SiegeAttackerList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _castle.getSiege().getAttackerClans().size(); if (size > 0) { @@ -76,12 +75,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -90,8 +88,8 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index 5d5c831f14..8afd1f38ce 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -29,9 +29,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = 0xcb
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Defending Clans?
* d = Number of Defending Clans
* { //repeats
@@ -60,16 +60,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // Unknown - packet.writeD(0x01); // Unknown - packet.writeD(0x00); // Unknown - + packet.writeD(0); // Unknown + packet.writeD(1); // Unknown + packet.writeD(0); // Unknown final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0); packet.writeD(size); packet.writeD(size); - // Add owners final Clan ownerClan = _castle.getOwner(); if (ownerClan != null) @@ -78,14 +75,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket packet.writeS(ownerClan.getName()); packet.writeS(ownerClan.getLeaderName()); packet.writeD(ownerClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.OWNER.ordinal()); packet.writeD(ownerClan.getAllyId()); packet.writeS(ownerClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(ownerClan.getAllyCrestId()); } - // List of confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans()) { @@ -94,19 +90,17 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(defendingClan.getAllyCrestId()); } - // List of not confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans()) { @@ -115,12 +109,11 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER_PENDING.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 0a3fe46cb7..dfeefdaecf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -59,13 +59,11 @@ public class SiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_INFO.writeId(packet); - if (_castle != null) { packet.writeD(_castle.getResidenceId()); - final int ownerId = _castle.getOwnerId(); - packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 0x01 : 0x00); + packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0); packet.writeD(ownerId); if (ownerId > 0) { @@ -89,7 +87,6 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { @@ -97,7 +94,7 @@ public class SiegeInfo implements IClientOutgoingPacket cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis()); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(Config.SIEGE_HOUR_LIST.size()); for (int hour : Config.SIEGE_HOUR_LIST) { @@ -108,7 +105,7 @@ public class SiegeInfo implements IClientOutgoingPacket else { packet.writeD((int) (_castle.getSiegeDate().getTimeInMillis() / 1000)); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index d11b3817c0..3c4c475339 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -51,12 +51,11 @@ public class SkillCoolTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SKILL_COOL_TIME.writeId(packet); - packet.writeD(_skillReuseTimeStamps.size()); for (TimeStamp ts : _skillReuseTimeStamps) { packet.writeD(ts.getSkillId()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD((int) ts.getReuse() / 1000); packet.writeD((int) Math.max(ts.getStamp() - _currentTime, 0) / 1000); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index de54232b51..ed4615c403 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -41,10 +41,9 @@ public class Snoop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SNOOP.writeId(packet); - packet.writeD(_convoId); packet.writeS(_name); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_type.getClientId()); packet.writeS(_speaker); packet.writeS(_msg); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java index 37827bdf6c..52f15519a5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java @@ -37,10 +37,9 @@ public class SocialAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SOCIAL_ACTION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_actionId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index fd7e43a153..19066f5f85 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -33,16 +33,15 @@ public class SpawnItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPAWN_ITEM.writeId(packet); - packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeD(_item.isStackable() ? 0x01 : 0x00); + packet.writeD(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java index ccae75b850..04f3ad716c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java @@ -110,7 +110,6 @@ public class SpecialCamera implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPECIAL_CAMERA.writeId(packet); - packet.writeD(_id); packet.writeD(_force); packet.writeD(_angle1); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java index cdd3821740..281756e793 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java @@ -34,7 +34,6 @@ public class StartPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_PLEDGE_WAR.writeId(packet); - packet.writeS(_playerName); packet.writeS(_pledgeName); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java index 48b4238eea..27fb4f606b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java @@ -38,7 +38,6 @@ public class StartRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_side); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java index b4f421df36..067bdeb082 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java @@ -72,7 +72,6 @@ public class StaticObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATIC_OBJECT.writeId(packet); - packet.writeD(_staticObjectId); packet.writeD(_objectId); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index 928b54aa48..40836e4af8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -46,7 +46,6 @@ public class StatusUpdate implements IClientOutgoingPacket public void addUpdate(StatusUpdateType type, int level) { _updates.put(type, level); - if (_isPlayable) { switch (type) @@ -75,10 +74,9 @@ public class StatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATUS_UPDATE.writeId(packet); - packet.writeD(_objectId); // casterId - packet.writeD(_isVisible ? _casterObjectId : 0x00); - packet.writeC(_isVisible ? 0x01 : 0x00); + packet.writeD(_isVisible ? _casterObjectId : 0); + packet.writeC(_isVisible ? 1 : 0); packet.writeC(_updates.size()); for (Entry entry : _updates.entrySet()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java index 9919307366..cf2b71df5a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java @@ -53,7 +53,6 @@ public class StopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java index 50fdc3fe4c..78fdb5d70c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java @@ -43,7 +43,6 @@ public class StopMoveInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java index 9c828c3962..b254cad8b1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java @@ -34,7 +34,6 @@ public class StopPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java index b0392de226..ca69cd5346 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java @@ -36,7 +36,6 @@ public class StopRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FINISH_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_speed); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index c1feb37b2f..2d92796c75 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -43,10 +43,8 @@ public class SummonInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class SummonInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class SummonInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,11 +154,9 @@ public class SummonInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - // Show red aura? - // if (_statusMask != 0) + // if (_statusMask != 0x00) // { // addComponentType(NpcInfoType.VISUAL_STATE); // } @@ -229,28 +206,24 @@ public class SummonInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.SUMMON_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -269,7 +242,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -285,19 +258,19 @@ public class SummonInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -309,20 +282,20 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -346,12 +319,12 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -381,12 +354,10 @@ public class SummonInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java index 864462f76f..6f88551204 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java @@ -34,7 +34,6 @@ public class SurrenderPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SURRENDER_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 55902e07e1..bbd7706dbe 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -162,7 +162,6 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } - _params[_paramIndex++] = param; } @@ -268,7 +267,6 @@ public class SystemMessage implements IClientOutgoingPacket { return addString(item.getName()); } - append(new SMParam(TYPE_ITEM_NAME, id)); return this; } @@ -396,7 +394,6 @@ public class SystemMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SYSTEM_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -409,13 +406,12 @@ public class SystemMessage implements IClientOutgoingPacket params[i] = _params[i].getValue(); } packet.writeH(SystemMessageId.S1_2.getId()); - packet.writeC(0x01); + packet.writeC(1); packet.writeC(TYPE_TEXT); packet.writeS(sml.getLocalisation(params)); return true; } } - packet.writeH(getId()); packet.writeC(_params.length); for (SMParam param : _params) @@ -425,9 +421,7 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } - packet.writeC(param.getType()); - switch (param.getType()) { case TYPE_ELEMENT_NAME: diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java index a91da07e77..d357efbb0e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java @@ -47,13 +47,12 @@ public class TargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_SELECTED.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java index 3dadd249f6..3d7208c06f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java @@ -42,12 +42,11 @@ public class TargetUnselected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_UNSELECTED.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index 943b5078b6..13f9b9565a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -41,14 +41,13 @@ public class TeleportToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TELEPORT_TO_LOCATION.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // Fade 0, Instant 1. + packet.writeD(0); // Fade 0, Instant 1. packet.writeD(_heading); - packet.writeD(0x00); // Unknown. + packet.writeD(0); // Unknown. return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java index cb82f2da59..8d09576d9d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java @@ -32,7 +32,6 @@ public class TradeDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_DONE.writeId(packet); - packet.writeD(_num); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java index 716ed2a099..6a94d2463f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java @@ -41,9 +41,9 @@ public class TradeOtherAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java index 3d0ef0b501..7907f3d498 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java @@ -41,9 +41,9 @@ public class TradeOwnAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c59568bf1d..3822108c5a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -58,7 +58,6 @@ public class TradeStart extends AbstractItemPacket { _mask |= 0x08; } - // Does not shows level if (_partner.isGM()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java index f8e2a191de..e5ec2376cc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java @@ -44,10 +44,10 @@ public class TradeUpdate extends AbstractItemPacket { OutgoingPackets.TRADE_UPDATE.writeId(packet); packet.writeC(_sendType); - packet.writeD(0x01); + packet.writeD(1); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2); writeItem(packet, _item, _count); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java index c7102ca385..728020c0b1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java @@ -32,7 +32,6 @@ public class TutorialEnableClientEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_ENABLE_CLIENT_EVENT.writeId(packet); - packet.writeD(_eventId); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java index 92ac75afcf..7cc33a0f80 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java @@ -48,7 +48,6 @@ public class TutorialShowHtml extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_HTML.writeId(packet); - packet.writeD(_type); packet.writeS(getHtml()); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java index 75a57be38b..2ee62835db 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java @@ -37,7 +37,6 @@ public class TutorialShowQuestionMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_QUESTION_MARK.writeId(packet); - packet.writeC(_markType); packet.writeD(_markId); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index efea6902e3..e6ab8f9305 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class UserInfo extends AbstractMaskPacket { private Player _player; - private int _relation; private int _runSpd; private int _walkSpd; @@ -47,14 +46,12 @@ public class UserInfo extends AbstractMaskPacket private int _enchantLevel; private int _armorEnchant; private String _title; - private final byte[] _masks = new byte[] { (byte) 0x00, (byte) 0x00, (byte) 0x00 }; - private int _initSize = 5; public UserInfo(Player player) @@ -78,6 +75,7 @@ public class UserInfo extends AbstractMaskPacket _enchantLevel = player.getInventory().getWeaponEnchant(); _armorEnchant = player.getInventory().getArmorMinEnchant(); _title = player.getTitle(); + if (player.isGM() && player.isInvisible()) { _title = "[Invisible]"; @@ -133,29 +131,25 @@ public class UserInfo extends AbstractMaskPacket } OutgoingPackets.USER_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_initSize); packet.writeH(24); packet.writeB(_masks); - if (containsMask(UserInfoType.RELATION)) { packet.writeD(_relation); } - if (containsMask(UserInfoType.BASIC_INFO)) { packet.writeH(16 + (_player.getAppearance().getVisibleName().length() * 2)); packet.writeString(_player.getName()); - packet.writeC(_player.isGM() ? 0x01 : 0x00); + packet.writeC(_player.isGM() ? 1 : 0); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } - if (containsMask(UserInfoType.BASE_STATS)) { packet.writeH(18); @@ -165,10 +159,9 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getINT()); packet.writeH(_player.getWIT()); packet.writeH(_player.getMEN()); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); } - if (containsMask(UserInfoType.MAX_HPCPMP)) { packet.writeH(14); @@ -176,7 +169,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMaxMp()); packet.writeD(_player.getMaxCp()); } - if (containsMask(UserInfoType.CURRENT_HPMPCP_EXP_SP)) { packet.writeH(38); @@ -187,32 +179,28 @@ public class UserInfo extends AbstractMaskPacket packet.writeQ(_player.getExp()); packet.writeF((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel()))); } - if (containsMask(UserInfoType.ENCHANTLEVEL)) { packet.writeH(4); packet.writeC(_enchantLevel); packet.writeC(_armorEnchant); } - if (containsMask(UserInfoType.APPAREANCE)) { packet.writeH(15); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); } - if (containsMask(UserInfoType.STATUS)) { packet.writeH(6); packet.writeC(_player.getMountType().ordinal()); packet.writeC(_player.getPrivateStoreType().getId()); packet.writeC(_player.hasDwarvenCraft() || (_player.getSkillLevel(248) > 0) ? 1 : 0); - packet.writeC(0x00); + packet.writeC(0); } - if (containsMask(UserInfoType.STATS)) { packet.writeH(56); @@ -231,18 +219,16 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); } - if (containsMask(UserInfoType.ELEMENTALS)) { packet.writeH(14); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); } - if (containsMask(UserInfoType.POSITION)) { packet.writeH(18); @@ -251,7 +237,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getZ()); packet.writeD(_player.isInVehicle() ? _player.getVehicle().getObjectId() : 0); } - if (containsMask(UserInfoType.SPEED)) { packet.writeH(18); @@ -264,28 +249,24 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_flyRunSpd); packet.writeH(_flyWalkSpd); } - if (containsMask(UserInfoType.MULTIPLIER)) { packet.writeH(18); packet.writeF(_moveMultiplier); packet.writeF(_player.getAttackSpeedMultiplier()); } - if (containsMask(UserInfoType.COL_RADIUS_HEIGHT)) { packet.writeH(18); packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); } - if (containsMask(UserInfoType.ATK_ELEMENTAL)) { packet.writeH(5); - packet.writeC(0x00); - packet.writeH(0x00); + packet.writeC(0); + packet.writeH(0); } - if (containsMask(UserInfoType.CLAN)) { packet.writeH(32 + (_title.length() * 2)); @@ -295,12 +276,11 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getClanCrestLargeId()); packet.writeD(_player.getClanCrestId()); packet.writeD(_player.getClanPrivileges().getBitmask()); - packet.writeC(_player.isClanLeader() ? 0x01 : 0x00); + packet.writeC(_player.isClanLeader() ? 1 : 0); packet.writeD(_player.getAllyId()); packet.writeD(_player.getAllyCrestId()); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); } - if (containsMask(UserInfoType.SOCIAL)) { packet.writeH(22); @@ -314,69 +294,61 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); } - if (containsMask(UserInfoType.VITA_FAME)) { packet.writeH(15); packet.writeD(_player.getVitalityPoints()); - packet.writeC(0x00); // Vita Bonus + packet.writeC(0); // Vita Bonus packet.writeD(_player.getFame()); packet.writeD(_player.getRaidbossPoints()); } - if (containsMask(UserInfoType.SLOTS)) { packet.writeH(12); // 152 packet.writeC(_player.getInventory().getTalismanSlots()); packet.writeC(_player.getInventory().getBroochJewelSlots()); packet.writeC(_player.getTeam().getId()); - packet.writeD(0x00); - + packet.writeD(0); if (_player.getInventory().getAgathionSlots() > 0) { - packet.writeC(0x01); // Charm slots + packet.writeC(1); // Charm slots packet.writeC(_player.getInventory().getAgathionSlots() - 1); packet.writeC(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152 } else { - packet.writeC(0x00); // Charm slots - packet.writeC(0x00); + packet.writeC(0); // Charm slots + packet.writeC(0); packet.writeC(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152 } } - if (containsMask(UserInfoType.MOVEMENTS)) { packet.writeH(4); packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); - packet.writeC(_player.isRunning() ? 0x01 : 0x00); + packet.writeC(_player.isRunning() ? 1 : 0); } - if (containsMask(UserInfoType.COLOR)) { packet.writeH(10); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); } - if (containsMask(UserInfoType.INVENTORY_LIMIT)) { packet.writeH(9); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); packet.writeH(_player.getInventoryLimit()); packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); } - if (containsMask(UserInfoType.TRUE_HERO)) { packet.writeH(9); - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeC(_player.isTrueHero() ? 100 : 0x00); + packet.writeD(0); + packet.writeH(0); + packet.writeC(_player.isTrueHero() ? 100 : 0); } - if (containsMask(UserInfoType.ATT_SPIRITS)) // 152 { packet.writeH(26); @@ -387,7 +359,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD((int) _player.getEarthSpiritDefense()); packet.writeD(_player.getActiveElementalSpiritType()); } - return true; } @@ -404,7 +375,6 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x10; // Party leader } } - if (clan != null) { relation |= 0x20; // Clan member @@ -413,12 +383,10 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x40; // Clan leader } } - if (player.isInSiege()) { relation |= 0x80; // In siege } - return relation; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java index 283bcf1614..90c416726a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java @@ -36,7 +36,6 @@ public class ValidateLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java index 4d8f9683d0..83f72bf981 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java @@ -40,7 +40,6 @@ public class ValidateLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java index b684e70bdc..71367cd26d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java @@ -36,7 +36,6 @@ public class VehicleCheckLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_CHECK_LOCATION.writeId(packet); - packet.writeD(_boat.getObjectId()); packet.writeD(_boat.getX()); packet.writeD(_boat.getY()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java index a4a5780f30..5b565c08b7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java @@ -46,7 +46,6 @@ public class VehicleDeparture implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_DEPARTURE.writeId(packet); - packet.writeD(_objId); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java index ec611028bf..4a995a6352 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java @@ -44,7 +44,6 @@ public class VehicleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java index 207a6fd899..bf629dcbbc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java @@ -42,7 +42,6 @@ public class VehicleStarted implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_START.writeId(packet); - packet.writeD(_objectId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 35ca986d35..5eb9eb7ab9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -30,6 +30,7 @@ public class WareHouseDepositList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; public static final int FREIGHT = 1; + private final int _sendType; private final long _playerAdena; private final List _items = new ArrayList<>(); @@ -49,7 +50,6 @@ public class WareHouseDepositList extends AbstractItemPacket _sendType = sendType; _whType = type; _playerAdena = player.getAdena(); - final boolean isPrivate = _whType == PRIVATE; for (Item temp : player.getInventory().getAvailableItems(true, isPrivate, false)) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 7af1cd273c..5ece99310a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -32,6 +32,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private final int _sendType; private Player _player; private long _playerAdena; @@ -60,7 +61,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } - _items = _player.getActiveWarehouse().getItems(); for (Item item : _items) { @@ -78,15 +78,15 @@ public class WareHouseWithdrawalList extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeH(0x00); + packet.writeH(0); packet.writeD(_invSize); packet.writeD(_items.size()); for (Item item : _items) { writeItem(packet, item); packet.writeD(item.getObjectId()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } else diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java index 5f2dd05f3b..aea1476fb2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java @@ -35,8 +35,7 @@ public class ExDivideAdenaCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_CANCEL.writeId(packet); - - packet.writeC(0x00); // TODO: Find me + packet.writeC(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java index 6af912cebf..de4e955aba 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java @@ -46,9 +46,8 @@ public class ExDivideAdenaDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_DONE.writeId(packet); - - packet.writeC(_isPartyLeader ? 0x01 : 0x00); - packet.writeC(_isCCLeader ? 0x01 : 0x00); + packet.writeC(_isPartyLeader ? 1 : 0); + packet.writeC(_isCCLeader ? 1 : 0); packet.writeD(_memberCount); packet.writeQ(_distributedAdenaCount); packet.writeQ(_adenaCount); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index 549def456e..84b5fead76 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -43,7 +43,6 @@ public class ExChooseShapeShiftingItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_SHAPE_SHIFTING_ITEM.writeId(packet); - packet.writeD(_targetType != null ? _targetType.ordinal() : 0); packet.writeD(_type != null ? _type.ordinal() : 0); packet.writeD(_itemId); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java index 33fb439aa5..ba55887a1a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java @@ -45,7 +45,6 @@ public class ExCuriousHouseMemberUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_UPDATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_maxHp); packet.writeD(_maxCp); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java index 8ad3659725..be2d29d864 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPacket { - public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0x00); - public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(0x01); + public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0); + public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(1); private final int _result; @@ -39,7 +39,6 @@ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPa public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_EXTRACTION_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java index ec82cc14f3..e84d7a7255 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; public static final ExPutShapeShiftingTargetItemResult FAILED = new ExPutShapeShiftingTargetItemResult(RESULT_FAILED, 0); @@ -43,7 +43,6 @@ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_resultId); packet.writeQ(_price); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java index f4d3118cc4..038eae0042 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExShapeShiftingResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; - public static final int RESULT_CLOSE = 0x02; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; + public static final int RESULT_CLOSE = 2; public static final ExShapeShiftingResult FAILED = new ExShapeShiftingResult(RESULT_FAILED, 0, 0); public static final ExShapeShiftingResult CLOSE = new ExShapeShiftingResult(RESULT_CLOSE, 0, 0); @@ -47,7 +47,6 @@ public class ExShapeShiftingResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHAPE_SHIFTING_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_targetItemId); packet.writeD(_extractItemId); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java index eaf0d209fd..4b48b09002 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java @@ -38,7 +38,7 @@ public class ExConfirmVipAttendanceCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CONFIRM_VIP_ATTENDANCE_CHECK.writeId(packet); - packet.writeC(_available ? 0x01 : 0x00); // can receive reward today? 1 else 0 + packet.writeC(_available ? 1 : 0); // can receive reward today? 1 else 0 packet.writeC(_index); // active reward index packet.writeD(0); packet.writeD(0); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java index 9d61fe68d6..dd94df023f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java @@ -45,10 +45,10 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket OutgoingPackets.EX_VIP_ATTENDANCE_ITEM_LIST.writeId(packet); packet.writeC(_available ? _index + 1 : _index); // index to receive? packet.writeC(_index); // last received index? - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeC(0x01); - packet.writeC(_available ? 0x01 : 0x00); // player can receive reward today? + packet.writeD(0); + packet.writeD(0); + packet.writeC(1); + packet.writeC(_available ? 1 : 0); // player can receive reward today? packet.writeC(250); packet.writeC(AttendanceRewardData.getInstance().getRewardsCount()); // reward size int rewardCounter = 0; @@ -57,11 +57,11 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket rewardCounter++; packet.writeD(reward.getId()); packet.writeQ(reward.getCount()); - packet.writeC(0x01); // is unknown? - packet.writeC((rewardCounter % 7) == 0 ? 0x01 : 0x00); // is last in row? + packet.writeC(1); // is unknown? + packet.writeC((rewardCounter % 7) == 0 ? 1 : 0); // is last in row? } - packet.writeC(0x00); - packet.writeD(0x00); + packet.writeC(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java index 4c3ae253ea..c79b68becc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java @@ -39,7 +39,6 @@ public class ExResponseCommissionBuyInfo extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_INFO.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java index ddfa8b6db1..c1d29735b8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java @@ -40,7 +40,6 @@ public class ExResponseCommissionBuyItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_ITEM.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java index aa4bbbde24..01e4782408 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java @@ -39,7 +39,6 @@ public class ExResponseCommissionDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_DELETE.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java index e7e3c39816..b915574175 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java @@ -55,7 +55,6 @@ public class ExResponseCommissionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_INFO.writeId(packet); - packet.writeD(_result); packet.writeD(_itemId); packet.writeQ(_presetPricePerUnit); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java index 4963393b42..a012b3ab30 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java @@ -64,7 +64,6 @@ public class ExResponseCommissionList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_LIST.writeId(packet); - packet.writeD(_replyType.getClientId()); switch (_replyType) { @@ -73,13 +72,11 @@ public class ExResponseCommissionList extends AbstractItemPacket { packet.writeD((int) Instant.now().getEpochSecond()); packet.writeD(_chunkId); - int chunkSize = _items.size() - _listIndexStart; if (chunkSize > MAX_CHUNK_SIZE) { chunkSize = MAX_CHUNK_SIZE; } - packet.writeD(chunkSize); for (int i = _listIndexStart; i < (_listIndexStart + chunkSize); i++) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java index b1b0a97d7a..183547af06 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java @@ -39,7 +39,6 @@ public class ExResponseCommissionRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_REGISTER.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java index 74d8a95587..b68386e4ed 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java @@ -35,8 +35,7 @@ public class ExShowCommission implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_COMMISSION.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java index 0c267ecf34..11b1ff1e0a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExEnchantFail implements IClientOutgoingPacket { public static final ExEnchantFail STATIC_PACKET = new ExEnchantFail(0, 0); + private final int _itemOne; private final int _itemTwo; @@ -39,7 +40,6 @@ public class ExEnchantFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_FAIL.writeId(packet); - packet.writeD(_itemOne); packet.writeD(_itemTwo); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java index 71ba811ed5..87d29a8e7c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java @@ -36,7 +36,6 @@ public class ExEnchantSucess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SUCESS.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java index eb4eb8b26c..ec67d50fb6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java @@ -39,7 +39,6 @@ public class ExGetCrystalizingEstimation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - packet.writeD(_items.size()); for (ItemChanceHolder holder : _items) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java index ac16c14f5b..ebf5b64751 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java @@ -43,18 +43,18 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket } OutgoingPackets.EX_CONNECTED_TIME_AND_GETTABLE_REWARD.writeId(packet); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_oneDayRewardAvailableCount); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index a8f3304739..f11ae5f478 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -62,7 +62,6 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket } OutgoingPackets.EX_ONE_DAY_RECEIVE_REWARD_LIST.writeId(packet); - packet.writeD(_dayRemainTime); packet.writeD(_weekRemainTime); packet.writeD(_monthRemainTime); @@ -74,7 +73,7 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket { packet.writeH(reward.getId()); packet.writeC(reward.getStatus(_player)); - packet.writeC(reward.getRequiredCompletions() > 1 ? 0x01 : 0x00); + packet.writeC(reward.getRequiredCompletions() > 1 ? 1 : 0); packet.writeD(Math.min(reward.getProgress(_player), _player.getLevel())); packet.writeD(reward.getRequiredCompletions()); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java index f0d1fb0d65..03c8bc9b68 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java @@ -43,9 +43,7 @@ abstract class AbstractElementalSpiritPacket implements IClientOutgoingPacket packet.writeD(spirit.getMaxCharacteristics()); packet.writeD(spirit.getMaxCharacteristics()); packet.writeD(spirit.getMaxCharacteristics()); - packet.writeC(1); // unk - for (int j = 0; j < 1; j++) { packet.writeH(2); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java index 3a53a42a95..53c6d5b3e9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java @@ -45,16 +45,14 @@ public class ElementalSpiritAbsorbInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_ABSORB_INFO.writeId(packet); - final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type)); if (spirit == null) { - packet.writeC(0x00); - packet.writeC(0x00); + packet.writeC(0); + packet.writeC(0); return true; } - - packet.writeC(0x01); + packet.writeC(1); packet.writeC(_type); packet.writeC(spirit.getStage()); packet.writeQ(spirit.getExperience()); @@ -62,7 +60,6 @@ public class ElementalSpiritAbsorbInfo implements IClientOutgoingPacket packet.writeQ(spirit.getExperienceToNextLevel()); // MaxExp packet.writeD(spirit.getLevel()); packet.writeD(spirit.getMaxLevel()); - final List absorbItems = spirit.getAbsorbItems(); packet.writeD(absorbItems.size()); // AbsorbCount for (ElementalSpiritAbsorbItemHolder absorbItem : absorbItems) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java index 430c43f891..7012b8a7a2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java @@ -44,7 +44,6 @@ public class ElementalSpiritEvolutionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_EVOLUTION_INFO.writeId(packet); - final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type)); if (spirit == null) { @@ -52,13 +51,11 @@ public class ElementalSpiritEvolutionInfo implements IClientOutgoingPacket packet.writeD(0); return true; } - packet.writeC(_type); packet.writeD(spirit.getNpcId()); - packet.writeD(0x01); // unk + packet.writeD(1); // unk packet.writeD(spirit.getStage()); packet.writeF(100); // chance ?? - final List items = spirit.getItemsToEvolve(); packet.writeD(items.size()); for (ItemHolder item : items) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java index c14deecea5..e6adc10453 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java @@ -41,7 +41,6 @@ public class ElementalSpiritExtractInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_EXTRACT_INFO.writeId(packet); - final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type)); if (spirit == null) { @@ -49,15 +48,12 @@ public class ElementalSpiritExtractInfo implements IClientOutgoingPacket packet.writeC(0); return true; } - packet.writeC(_type); // active elemental spirit packet.writeC(1); // is extract ? - packet.writeC(1); // cost count // for each cost count packet.writeD(57); // item id packet.writeD(1000000); // item count - packet.writeD(spirit.getExtractItem()); packet.writeD(spirit.getExtractAmount()); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java index 15fa123db6..ba363bf243 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java @@ -41,7 +41,6 @@ public class ElementalSpiritInfo extends AbstractElementalSpiritPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_INFO.writeId(packet); - final ElementalSpirit[] spirits = _player.getSpirits(); if (spirits == null) { @@ -50,20 +49,16 @@ public class ElementalSpiritInfo extends AbstractElementalSpiritPacket packet.writeC(0); return true; } - packet.writeC(_type); // show spirit info window 1; Change type 2; Only update 0 packet.writeC(_spiritType); - packet.writeC(spirits.length); // spirit count - for (ElementalSpirit spirit : spirits) { packet.writeC(spirit.getType()); - packet.writeC(0x01); // spirit active ? + packet.writeC(1); // spirit active ? // if active writeSpiritInfo(packet, spirit); } - packet.writeD(1); // Reset talent items count for (int j = 0; j < 1; j++) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java index bc05ef3212..66488267d4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java @@ -38,7 +38,6 @@ public class ExElementalSpiritGetExp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_GET_EXP.writeId(packet); - packet.writeC(_type); packet.writeQ(_experience); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java index 7f380efe99..8f5cfd3c98 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java @@ -41,7 +41,6 @@ public abstract class UpdateElementalSpiritPacket extends AbstractElementalSpiri { packet.writeC(_update ? 1 : 0); packet.writeC(_type); - if (_update) { final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type)); @@ -49,7 +48,6 @@ public abstract class UpdateElementalSpiritPacket extends AbstractElementalSpiri { return; } - packet.writeC(_type); writeSpiritInfo(packet, spirit); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java index fa605b548a..a99ad7f4e3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java @@ -52,7 +52,7 @@ public class ExFishingStart implements IClientOutgoingPacket packet.writeD(_baitLocation.getX()); packet.writeD(_baitLocation.getY()); packet.writeD(_baitLocation.getZ()); - packet.writeC(0x01); // 0 = newbie, 1 = normal, 2 = night + packet.writeC(1); // 0 = newbie, 1 = normal, 2 = night return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java index 046ad04cb6..74501fe7ff 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java @@ -49,7 +49,6 @@ public class ExUserInfoFishing implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_FISHING.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_isFishing ? 1 : 0); if (_baitLocation == null) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index dc0e3e05bc..336a384bcc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -47,9 +47,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FRIEND_DETAIL_INFO.writeId(packet); - packet.writeD(_objectId); - if (_friend == null) { packet.writeS(_name); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java index 0d4bb47ff0..a90b7b6083 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java @@ -33,8 +33,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x00); + packet.writeC(0); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java index 9add9c9caa..d24139644c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java @@ -49,7 +49,6 @@ public class FriendAddRequestResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_charId); packet.writeS(_charName); @@ -57,7 +56,7 @@ public class FriendAddRequestResult implements IClientOutgoingPacket packet.writeD(_charObjectId); packet.writeD(_charLevel); packet.writeD(_charClassId); - packet.writeH(0x00); // Always 0 on retail + packet.writeH(0); // Always 0 on retail return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java index a135944662..13a7d01967 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java @@ -86,12 +86,10 @@ public class FriendList implements IClientOutgoingPacket } continue; } - if (player1.isOnline()) { online = true; } - classid = player1.getClassId().getId(); level = player1.getLevel(); _info.add(new FriendInfo(objId, name, online, classid, level)); @@ -102,14 +100,13 @@ public class FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._classid); packet.writeD(info._level); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java index 07c23f9fd2..1bb4142e34 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java @@ -38,7 +38,6 @@ public class FriendRemove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_REMOVE.writeId(packet); - packet.writeD(_responce); packet.writeS(_charName); return true; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java index e8dbddcd63..a3990c0879 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java @@ -52,7 +52,6 @@ public class FriendStatus implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_STATUS.writeId(packet); - packet.writeD(_type); packet.writeS(_name); switch (_type) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java index 8752104e06..78da5850b8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java @@ -50,7 +50,6 @@ public class L2Friend implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND.writeId(packet); - packet.writeD(_action ? 1 : 3); // 1-add 3-remove packet.writeD(_objid); packet.writeS(_name); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java index b69a253635..e50693cb11 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java @@ -81,17 +81,16 @@ public class L2FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._level); packet.writeD(info._classId); - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java index 677c09091f..706c179a9c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java @@ -37,7 +37,6 @@ public class ExMentorAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_ADD.writeId(packet); - packet.writeS(_mentor.getName()); packet.writeD(_mentor.getActiveClass()); packet.writeD(_mentor.getLevel()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java index 4722a9cab3..18c1cdeedf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java @@ -64,9 +64,8 @@ public class ExMentorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_LIST.writeId(packet); - packet.writeD(_type); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mentees.size()); for (Mentee mentee : _mentees) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java index d739dd94b7..2283920b98 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ListMenteeWaiting implements IClientOutgoingPacket { private static final int PLAYERS_PER_PAGE = 64; + private final List _possibleCandiates = new ArrayList<>(); private final int _page; @@ -51,18 +52,15 @@ public class ListMenteeWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_MENTEE_WAITING.writeId(packet); - - packet.writeD(0x01); // always 1 in retail + packet.writeD(1); // always 1 in retail if (_possibleCandiates.isEmpty()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } - packet.writeD(_possibleCandiates.size()); packet.writeD(_possibleCandiates.size() % PLAYERS_PER_PAGE); - for (Player player : _possibleCandiates) { if ((1 <= (PLAYERS_PER_PAGE * _page)) && (1 > (PLAYERS_PER_PAGE * (_page - 1)))) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java index fd8875aedd..c5a96dd099 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java @@ -34,12 +34,12 @@ public class ExPledgeBonusList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_BONUS_LIST.writeId(packet); - packet.writeC(0x00); // 140 + packet.writeC(0); // 140 ClanRewardData.getInstance().getClanRewardBonuses(ClanRewardType.MEMBERS_ONLINE).stream().sorted(Comparator.comparingInt(ClanRewardBonus::getLevel)).forEach(bonus -> { packet.writeD(bonus.getSkillReward().getSkillId()); }); - packet.writeC(0x01); // 140 + packet.writeC(1); // 140 ClanRewardData.getInstance().getClanRewardBonuses(ClanRewardType.HUNTING_MONSTERS).stream().sorted(Comparator.comparingInt(ClanRewardBonus::getLevel)).forEach(bonus -> { packet.writeD(bonus.getItemReward().getId()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java index 81fd4fe6aa..ac4f03e25c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java @@ -50,7 +50,6 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Player: " + _player + " attempting to write to a null clan!"); return false; } - final ClanRewardBonus highestMembersOnlineBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.MEMBERS_ONLINE); final ClanRewardBonus highestHuntingBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.HUNTING_MONSTERS); final ClanRewardBonus membersOnlineBonus = ClanRewardType.MEMBERS_ONLINE.getAvailableBonus(clan); @@ -75,25 +74,22 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Couldn't find item reward for highest available hunting bonus!!"); return false; } - // General OP Code OutgoingPackets.EX_PLEDGE_BONUS_OPEN.writeId(packet); - // Members online bonus packet.writeD(highestMembersOnlineBonus.getRequiredAmount()); packet.writeD(clan.getMaxOnlineMembers()); - packet.writeC(0x00); // 140 - packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0x00); - packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 0x01 : 0x00); - + packet.writeC(0); // 140 + packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0); + packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 1 : 0); // Hunting bonus packet.writeD(highestHuntingBonus.getRequiredAmount()); packet.writeD(clan.getHuntingPoints()); - packet.writeC(0x00); // 140 - packet.writeD(huntingBonus != null ? highestHuntingBonus.getItemReward().getId() : 0x00); - packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 0x01 : 0x00); + packet.writeC(0); // 140 + packet.writeD(huntingBonus != null ? highestHuntingBonus.getItemReward().getId() : 0); + packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index fb735b8925..e75426e598 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -69,7 +69,6 @@ public class ExBRBuyProduct implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUY_PRODUCT.writeId(packet); - packet.writeD(_reply); return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java index 742b3eba9d..91a186b81d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java @@ -39,10 +39,9 @@ public class ExBRGamePoint implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_GAME_POINT.writeId(packet); - packet.writeD(_charId); packet.writeQ(_charPoints); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java index 50f21df46a..e36f2ff502 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java @@ -45,7 +45,6 @@ public class ExBRProductInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_INFO.writeId(packet); - packet.writeD(_item.getBrId()); packet.writeD(_item.getPrice()); packet.writeD(_item.getItems().size()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java index dc851ffd43..0f042ba043 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java @@ -45,9 +45,8 @@ public class ExBRProductList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); // Adena - packet.writeQ(0x00); // Hero coins + packet.writeQ(0); // Hero coins packet.writeC(_type); // Type 0 - Home, 1 - History, 2 - Favorites packet.writeD(_primeList.size()); for (PrimeShopGroup brItem : _primeList) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java index b23e9fa8a9..f4406c1407 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java @@ -38,7 +38,6 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RAID_BOSS_SPAWN_INFO.writeId(packet); - packet.writeD(_bossIds.size()); // alive count for (int id : _bossIds) // alive ids { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java index 2463589c81..c09b3e899d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java @@ -47,18 +47,15 @@ public class ExFlyMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_mapId); - packet.writeD(_locations.size()); for (SayuneEntry loc : _locations) { packet.writeD(loc.getId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(loc.getX()); packet.writeD(loc.getY()); packet.writeD(loc.getZ()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java index 03fc6b580d..70b3fb25d2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java @@ -47,16 +47,13 @@ public class ExFlyMoveBroadcast implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE_BROADCAST.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); packet.writeD(_mapId); - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD(_currentLoc.getX()); packet.writeD(_currentLoc.getY()); packet.writeD(_currentLoc.getZ()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java index cfe11a27e0..49e5d86910 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java @@ -35,7 +35,6 @@ public class ExNotifyFlyMoveStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_FLY_MOVE_START.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java index d5640a47ef..0efa37ae8c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java @@ -51,7 +51,6 @@ public class ExMoveToLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_SUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_targetX); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java index 0cbe2c3e02..a0314c39aa 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java @@ -46,7 +46,6 @@ public class ExShuttleGetOff implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_OFF.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java index 5211bef5ba..061bcafed9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java @@ -43,7 +43,6 @@ public class ExShuttleGetOn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_ON.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java index 97d54a9019..c8aee1fde7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java @@ -43,7 +43,6 @@ public class ExShuttleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHUTTLE_INFO.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD(_shuttle.getX()); packet.writeD(_shuttle.getY()); @@ -60,8 +59,8 @@ public class ExShuttleInfo implements IClientOutgoingPacket packet.writeD(loc.getY()); packet.writeD(loc.getZ()); } - packet.writeD(stop.isDoorOpen() ? 0x01 : 0x00); - packet.writeD(stop.hasDoorChanged() ? 0x01 : 0x00); + packet.writeD(stop.isDoorOpen() ? 1 : 0); + packet.writeD(stop.hasDoorChanged() ? 1 : 0); } return true; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java index 6ba38f29a1..28b33b998e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java @@ -43,7 +43,6 @@ public class ExShuttleMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_MOVE.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD((int) _shuttle.getStat().getMoveSpeed()); packet.writeD((int) _shuttle.getStat().getRotationSpeed()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java index bf2b6ea6eb..6c31189d6a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java @@ -44,7 +44,6 @@ public class ExStopMoveInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_SHUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java index f7f6849732..8492f42a6e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java @@ -44,7 +44,6 @@ public class ExValidateLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_SHUTTLE.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipProductList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipProductList.java index e2ced450b3..562f88d22b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipProductList.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipProductList.java @@ -45,13 +45,11 @@ public class ReceiveVipProductList implements IClientOutgoingPacket } final Collection products = PrimeShopData.getInstance().getPrimeItems().values(); final PrimeShopGroup gift = PrimeShopData.getInstance().getVipGiftOfTier(_player.getVipTier()); - OutgoingPackets.RECIVE_VIP_PRODUCT_LIST.writeId(packet); packet.writeQ(_player.getAdena()); packet.writeQ(_player.getGoldCoin()); // Gold Coin Amount packet.writeQ(_player.getSilverCoin()); // Silver Coin Amount packet.writeC(1); // Show Reward tab - if (gift != null) { packet.writeD(products.size() + 1); @@ -61,7 +59,6 @@ public class ReceiveVipProductList implements IClientOutgoingPacket { packet.writeD(products.size()); } - for (PrimeShopGroup product : products) { writeProduct(product, packet); @@ -79,7 +76,6 @@ public class ReceiveVipProductList implements IClientOutgoingPacket buffer.writeC(product.getPanelType()); // NEW - 6; HOT - 5 ... Unk buffer.writeC(product.getVipTier()); buffer.writeC(10); - buffer.writeC(product.getItems().size()); for (PrimeShopItem item : product.getItems()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java index 1d59c6d002..e7654ed911 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java @@ -60,7 +60,7 @@ public class AccountKicked implements IOutgoingPacket { OutgoingPackets.ACCOUNT_KICKED.writeId(packet); packet.writeD(_reason.getCode()); - return true; } } + diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 2e3a1f6163..1fe813e393 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: response + * Format: d d: response */ public class GGAuth implements IOutgoingPacket { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/network/serverpackets/Init.java index 4b3f71f30e..d725f45ca2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/network/serverpackets/Init.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/network/serverpackets/Init.java @@ -52,7 +52,6 @@ public class Init implements IOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.INIT.writeId(packet); - packet.writeD(_sessionId); // session id packet.writeD(0x0000c621); // protocol revision diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index 8c534554a8..f4dcd22b00 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: the failure reason + * Format: d d: the failure reason */ public class LoginFail implements IOutgoingPacket { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/network/BaseRecievePacket.java index c682cb741d..a6ed15ce32 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/network/BaseRecievePacket.java @@ -73,7 +73,7 @@ public abstract class BaseRecievePacket try { result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE); - result = result.substring(0, result.indexOf(0x00)); + result = result.substring(0, result.indexOf(0)); _off += (result.length() * 2) + 2; } catch (Exception e) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/network/BaseSendablePacket.java index a9d918de4c..8fa8491cbf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/network/BaseSendablePacket.java @@ -117,16 +117,16 @@ public abstract class BaseSendablePacket public byte[] getBytes() { // if (this instanceof Init) - // writeD(0x00); // reserve for XOR initial key + // writeD(0); // reserve for XOR initial key - writeD(0x00); // reserve for checksum + writeD(0); // reserve for checksum final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++) { - writeC(0x00); + writeC(0); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/AttackType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/AttackType.java index 6064b10ed7..e9983f15e3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/AttackType.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/AttackType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum AttackType { - MISSED(0x01), - BLOCKED(0x02), - CRITICAL(0x04), - SHOT_USED(0x08); + MISSED(1), + BLOCKED(2), + CRITICAL(4), + SHOT_USED(8); private final int _mask; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/GroupType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/GroupType.java index 954aaace8b..916a14fd05 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/GroupType.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/GroupType.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum GroupType implements IUpdateTypeComponent { - NONE(0x01), - PARTY(0x02), - COMMAND_CHANNEL(0x04); + NONE(1), + PARTY(2), + COMMAND_CHANNEL(4); private int _mask; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/ItemListType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/ItemListType.java index 2d38c8f5b1..c80234439f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/ItemListType.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/ItemListType.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum ItemListType implements IUpdateTypeComponent { - AUGMENT_BONUS(0x01), - ELEMENTAL_ATTRIBUTE(0x02), - ENCHANT_EFFECT(0x04), - VISUAL_ID(0x08), - SOUL_CRYSTAL(0x10); + AUGMENT_BONUS(1), + ELEMENTAL_ATTRIBUTE(2), + ENCHANT_EFFECT(4), + VISUAL_ID(8), + SOUL_CRYSTAL(16); private final int _mask; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java index b3d08596c6..29403b783d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum MacroUpdateType { - ADD(0x01), - LIST(0x01), - MODIFY(0x02), - DELETE(0x00); + ADD(1), + LIST(1), + MODIFY(2), + DELETE(0); private final int _id; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java index 86c6159869..7776721c0f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java @@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum PartySmallWindowUpdateType implements IUpdateTypeComponent { - CURRENT_CP(0x01), - MAX_CP(0x02), - CURRENT_HP(0x04), - MAX_HP(0x08), - CURRENT_MP(0x10), - MAX_MP(0x20), - LEVEL(0x40), - CLASS_ID(0x80), - PARTY_SUBSTITUTE(0x100), - VITALITY_POINTS(0x200); + CURRENT_CP(1), + MAX_CP(2), + CURRENT_HP(4), + MAX_HP(8), + CURRENT_MP(16), + MAX_MP(32), + LEVEL(64), + CLASS_ID(128), + PARTY_SUBSTITUTE(256), + VITALITY_POINTS(512); private final int _mask; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 00bb331778..667ce7f17c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.Broadcast; import org.l2jmobius.gameserver.util.Util; /** - * Fromat:(ch) dddddc + * Format:(ch) dddddc * @author -Wooden- */ public class RequestExMagicSkillUseGround implements IClientIncomingPacket diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java index 8744393432..033095e74d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java @@ -39,7 +39,6 @@ public class AbnormalStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ABNORMAL_STATUS_UPDATE.writeId(packet); - packet.writeH(_effects.size()); for (BuffInfo info : _effects) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 1b8ddb2042..bec794bef3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -44,7 +44,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; } @@ -60,7 +59,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; setHtml(html); } @@ -77,13 +75,11 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } - if (!html.contains(""; return; } - _html = html; } @@ -96,7 +92,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } - setHtml(content); return true; } @@ -138,12 +133,10 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { player.clearHtmlActions(getScope()); } - if (_disabledValidation) { return; } - if (player != null) { Util.buildHtmlActionCache(player, getScope(), _npcObjId, _html); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index e9cd6a88b8..b99d4d3348 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -86,8 +86,8 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket= 0) || (item.getAttributeDefence(AttributeType.FIRE) > 0) || (item.getAttributeDefence(AttributeType.WATER) > 0) || (item.getAttributeDefence(AttributeType.WIND) > 0) || (item.getAttributeDefence(AttributeType.EARTH) > 0) || (item.getAttributeDefence(AttributeType.HOLY) > 0) || (item.getAttributeDefence(AttributeType.DARK) > 0)) { mask |= ItemListType.ELEMENTAL_ATTRIBUTE.getMask(); } - if (item.getEnchantOptions() != null) { for (int id : item.getEnchantOptions()) @@ -184,17 +182,14 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket 0) { mask |= ItemListType.VISUAL_ID.getMask(); } - if (((item.getSoulCrystalOptions() != null) && !item.getSoulCrystalOptions().isEmpty()) || ((item.getSoulCrystalSpecialOptions() != null) && !item.getSoulCrystalSpecialOptions().isEmpty())) { mask |= ItemListType.SOUL_CRYSTAL.getMask(); } - return mask; } @@ -262,7 +257,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); packet.writeC(removeSkills.size()); for (Skill removed : removeSkills) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java index 8fa6259f64..6451dffd02 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ActionFailed implements IClientOutgoingPacket { public static final ActionFailed STATIC_PACKET = new ActionFailed(); - private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); + private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); static { for (SkillCastingType castingType : SkillCastingType.values()) @@ -57,7 +57,6 @@ public class ActionFailed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ACTION_FAIL.writeId(packet); - packet.writeD(_castingType); // MagicSkillUse castingType return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java index 6e868368c9..30ce58da60 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java @@ -44,9 +44,8 @@ public class AgitDecoInfo implements IClientOutgoingPacket { continue; } - packet.writeC(_residense.hasFunction(type) ? 0x01 : 0x00); + packet.writeC(_residense.hasFunction(type) ? 1 : 0); } - // Unknown packet.writeD(0); // TODO: Find me! packet.writeD(0); // TODO: Find me! diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java index 6cb71fc985..4683fb30f0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java @@ -44,7 +44,6 @@ public class AllianceInfo implements IClientOutgoingPacket _name = leader.getAllyName(); _leaderC = leader.getName(); _leaderP = leader.getLeaderName(); - final Collection allies = ClanTable.getInstance().getClanAllies(allianceId); _allies = new ClanInfo[allies.size()]; int idx = 0; @@ -57,7 +56,6 @@ public class AllianceInfo implements IClientOutgoingPacket total += ci.getTotal(); online += ci.getOnline(); } - _total = total; _online = online; } @@ -66,18 +64,16 @@ public class AllianceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_INFO.writeId(packet); - packet.writeS(_name); packet.writeD(_total); packet.writeD(_online); packet.writeS(_leaderC); packet.writeS(_leaderP); - packet.writeD(_allies.length); for (ClanInfo aci : _allies) { packet.writeS(aci.getClan().getName()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(aci.getClan().getLevel()); packet.writeS(aci.getClan().getLeaderName()); packet.writeD(aci.getTotal()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java index f9d08f6600..186fd12e81 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java @@ -44,7 +44,6 @@ public class AllyCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java index 6218f1717f..1ae4653f91 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java @@ -38,7 +38,6 @@ public class AskJoinAlly implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_ALLIANCE.writeId(packet); - packet.writeD(_requestorObjId); packet.writeS(null); // Ally Name ? packet.writeS(null); // TODO: Find me! diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java index a66bb3cd33..b9cfbe81b9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java @@ -39,7 +39,6 @@ public class AskJoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_PARTY.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 05c420ff59..227ab571be 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -45,7 +45,6 @@ public class Attack implements IClientOutgoingPacket _attackerObjId = attacker.getObjectId(); _attackerLoc = new Location(attacker); _targetLoc = new Location(target); - final Player player = attacker.getActingPlayer(); if (player == null) { @@ -111,7 +110,6 @@ public class Attack implements IClientOutgoingPacket final Iterator it = _hits.iterator(); final Hit firstHit = it.next(); OutgoingPackets.ATTACK.writeId(packet); - packet.writeD(_attackerObjId); packet.writeD(firstHit.getTargetId()); packet.writeD(_soulshotVisualSubstitute); // Ertheia @@ -121,13 +119,11 @@ public class Attack implements IClientOutgoingPacket packet.writeD(_attackerLoc.getX()); packet.writeD(_attackerLoc.getY()); packet.writeD(_attackerLoc.getZ()); - packet.writeH(_hits.size() - 1); while (it.hasNext()) { writeHit(packet, it.next()); } - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java index bd6878eb42..8b85fe85e3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java @@ -35,7 +35,6 @@ public class AutoAttackStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_START.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java index e767d1877a..a294b1e212 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java @@ -35,7 +35,6 @@ public class AutoAttackStop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_STOP.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java index 3f329415df..0c79677eae 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java @@ -38,7 +38,6 @@ public class BlockListPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BLOCK_LIST.writeId(packet); - packet.writeD(_playersId.size()); for (int playerId : _playersId) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index f610cdc6aa..d95f0543b9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -45,8 +45,7 @@ public class BuyList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x00); // Type BUY + packet.writeD(0); // Type BUY packet.writeQ(_money); // current money packet.writeD(_listId); packet.writeD(_inventorySlots); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index cd25af908d..7cb2bf4425 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -50,36 +50,34 @@ public class BuyListSeed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BUY_LIST_SEED.writeId(packet); - packet.writeQ(_money); // current money - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeD(_manorId); // manor id - if (!_list.isEmpty()) { packet.writeH(_list.size()); // list length for (SeedProduction s : _list) { - packet.writeC(0x00); // mask item 0 to print minimal item information + packet.writeC(0); // mask item 0 to print minimal item information packet.writeD(s.getId()); // ObjectId packet.writeD(s.getId()); // ItemId packet.writeC(0xFF); // T1 packet.writeQ(s.getAmount()); // Quantity - packet.writeC(0x05); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item - packet.writeC(0x00); // Filler (always 0) - packet.writeH(0x00); // Equipped : 00-No, 01-yes - packet.writeQ(0x00); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand - packet.writeH(0x00); // Enchant level (pet level shown in control item) + packet.writeC(5); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item + packet.writeC(0); // Filler (always 0) + packet.writeH(0); // Equipped : 00-No, 01-yes + packet.writeQ(0); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand + packet.writeH(0); // Enchant level (pet level shown in control item) packet.writeD(-1); packet.writeD(-9999); - packet.writeC(0x01); // GOD Item enabled = 1 disabled (red) = 0 + packet.writeC(1); // GOD Item enabled = 1 disabled (red) = 0 packet.writeQ(s.getPrice()); // price } _list.clear(); } else { - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java index 3a7b67af23..f3dc872dca 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java @@ -32,8 +32,7 @@ public class CSShowComBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - - packet.writeC(0x01); // c4 1 to show community 00 to hide + packet.writeC(1); // c4 1 to show community 00 to hide packet.writeB(_html); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java index eacc27aa07..b18dac4cc3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java @@ -36,7 +36,6 @@ public class CameraMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CAMERA_MODE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java index 1682f5bc62..adea754676 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java @@ -39,7 +39,6 @@ public class ChairSit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAIR_SIT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_staticObjectId); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java index 2bc31a285a..de141fa067 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java @@ -38,7 +38,6 @@ public class ChangeMoveType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_MOVE_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_running ? RUN : WALK); packet.writeD(0); // c2 diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index 73277d923d..fbe5e39e2e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -22,17 +22,17 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ChangeWaitType implements IClientOutgoingPacket { + public static final int WT_SITTING = 0; + public static final int WT_STANDING = 1; + public static final int WT_START_FAKEDEATH = 2; + public static final int WT_STOP_FAKEDEATH = 3; + private final int _objectId; private final int _moveType; private final int _x; private final int _y; private final int _z; - public static final int WT_SITTING = 0; - public static final int WT_STANDING = 1; - public static final int WT_START_FAKEDEATH = 2; - public static final int WT_STOP_FAKEDEATH = 3; - public ChangeWaitType(Creature creature, int newMoveType) { _objectId = creature.getObjectId(); @@ -46,7 +46,6 @@ public class ChangeWaitType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_WAIT_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_moveType); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index 41180bac50..aa2e7b2eaa 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -30,7 +30,6 @@ public class CharCreateFail implements IClientOutgoingPacket public static final int REASON_CREATE_NOT_ALLOWED = 0x05; // "Characters cannot be created from this server." public static final int REASON_CHOOSE_ANOTHER_SVR = 0x06; // "Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please // choose another server." - private final int _error; public CharCreateFail(int errorCode) @@ -42,7 +41,6 @@ public class CharCreateFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index f0e99885ad..768617e558 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -31,8 +31,7 @@ public class CharCreateOk implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_SUCCESS.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index bed289ca0a..1674eef343 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -33,7 +33,6 @@ public class CharDeleteFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_DELETE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index b6769d53f9..41342219f0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -33,6 +33,22 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { + private static final int[] PAPERDOLL_ORDER = new int[] + { + Inventory.PAPERDOLL_UNDER, + Inventory.PAPERDOLL_HEAD, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_LHAND, + Inventory.PAPERDOLL_GLOVES, + Inventory.PAPERDOLL_CHEST, + Inventory.PAPERDOLL_LEGS, + Inventory.PAPERDOLL_FEET, + Inventory.PAPERDOLL_CLOAK, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_HAIR, + Inventory.PAPERDOLL_HAIR2 + }; + private final Player _player; private final Clan _clan; private int _objId; @@ -55,22 +71,6 @@ public class CharInfo implements IClientOutgoingPacket private int _vehicleId = 0; private final boolean _gmSeeInvis; - private static final int[] PAPERDOLL_ORDER = new int[] - { - Inventory.PAPERDOLL_UNDER, - Inventory.PAPERDOLL_HEAD, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_LHAND, - Inventory.PAPERDOLL_GLOVES, - Inventory.PAPERDOLL_CHEST, - Inventory.PAPERDOLL_LEGS, - Inventory.PAPERDOLL_FEET, - Inventory.PAPERDOLL_CLOAK, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_HAIR, - Inventory.PAPERDOLL_HAIR2 - }; - public CharInfo(Player player, boolean gmSeeInvis) { _player = player; @@ -119,16 +119,15 @@ public class CharInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); // Confirmed packet.writeD(_y); // Confirmed packet.writeD(_z); // Confirmed packet.writeD(_vehicleId); // Confirmed packet.writeD(_objId); // Confirmed packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed - packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) @@ -152,10 +151,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.getPvpFlag()); packet.writeD(_player.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -166,53 +163,40 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); - packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeS(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle()); - packet.writeD(_player.getAppearance().getVisibleClanId()); packet.writeD(_player.getAppearance().getVisibleClanCrestId()); packet.writeD(_player.getAppearance().getVisibleAllyId()); packet.writeD(_player.getAppearance().getVisibleAllyCrestId()); - - packet.writeC(_player.isSitting() ? 0x00 : 0x01); // Confirmed - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // Confirmed - packet.writeC(_player.isInCombat() ? 0x01 : 0x00); // Confirmed - - packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 0x01 : 0x00); // Confirmed - - packet.writeC(_player.isInvisible() ? 0x01 : 0x00); - + packet.writeC(_player.isSitting() ? 0 : 1); // Confirmed + packet.writeC(_player.isRunning() ? 1 : 0); // Confirmed + packet.writeC(_player.isInCombat() ? 1 : 0); // Confirmed + packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 1 : 0); // Confirmed + packet.writeC(_player.isInvisible() ? 1 : 0); packet.writeC(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount packet.writeC(_player.getPrivateStoreType().getId()); // Confirmed packet.writeH(_player.getCubics().size()); // Confirmed _player.getCubics().keySet().forEach(packet::writeH); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); // Confirmed packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); packet.writeH(_player.getRecomHave()); // Confirmed packet.writeD(_player.getMountNpcId() == 0 ? 0 : _player.getMountNpcId() + 1000000); - packet.writeD(_player.getClassId().getId()); // Confirmed - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeC(_player.isMounted() ? 0 : _enchantLevel); // Confirmed - packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeD(_player.getClanCrestLargeId()); packet.writeC(_player.isNoble() ? 1 : 0); // Confirmed packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 2 : 0); // 152 - Value for enabled changed to 2? packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed - final ILocational baitLocation = _player.getFishing().getBaitLocation(); if (baitLocation != null) { @@ -228,29 +212,21 @@ public class CharInfo implements IClientOutgoingPacket } packet.writeD(_player.getAppearance().getNameColor()); // Confirmed - packet.writeD(_heading); // Confirmed - packet.writeC(_player.getPledgeClass()); packet.writeH(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); // Confirmed - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - - packet.writeC(0x00); // nPvPRestrainStatus - + packet.writeC(0); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentHp())); // Confirmed packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - - packet.writeC(0x00); // cBRLectureMark + packet.writeC(0); // cBRLectureMark final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed @@ -262,8 +238,9 @@ public class CharInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } + packet.writeC(_player.isTrueHero() ? 100 : 0); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); // Hair accessory + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); // Hair accessory packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 7187b73184..11f5f4df52 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -40,17 +40,16 @@ public class CharSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTED.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getTitle()); packet.writeD(_sessionId); packet.writeD(_player.getClanId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x01); // active ?? + packet.writeD(1); // active ?? packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -62,25 +61,20 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_player.getReputation()); packet.writeD(_player.getPkKills()); packet.writeD(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_player.getClassId().getId()); - packet.writeB(new byte[16]); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeB(new byte[28]); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 9590634dc2..bf6e2d3b99 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -44,10 +44,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { private static final Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); - private final String _loginName; - private final int _sessionId; - private int _activeId; - private final List _characterPackages; private static final int[] PAPERDOLL_ORDER = new int[] { @@ -112,7 +108,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_ARTIFACT20, // 152 Inventory.PAPERDOLL_ARTIFACT21 // 152 }; - private static final int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, @@ -126,6 +121,11 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_HAIR2, }; + private final String _loginName; + private final int _sessionId; + private int _activeId; + private final List _characterPackages; + /** * Constructor for CharSelectionInfo. * @param loginName @@ -156,17 +156,14 @@ public class CharSelectionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.size(); packet.writeD(size); // Created character count - packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) - packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 0x01 : 0x00); // if 1 can't create new char - packet.writeC(0x01); // 0=can't play, 1=can play free until level 85, 2=100% free play - packet.writeD(0x02); // if 1, Korean client - packet.writeC(0x00); // Gift message for inactive accounts // 152 - packet.writeC(0x00); // Balthus Knights, if 1 suggests premium account - + packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 1 : 0); // if 1 can't create new char + packet.writeC(1); // 0=can't play, 1=can play free until level 85, 2=100% free play + packet.writeD(2); // if 1, Korean client + packet.writeC(0); // Gift message for inactive accounts // 152 + packet.writeC(0); // Balthus Knights, if 1 suggests premium account long lastAccess = 0; if (_activeId == -1) { @@ -179,7 +176,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - for (int i = 0; i < size; i++) { final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); @@ -187,90 +183,73 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name packet.writeD(_sessionId); // Account ID - packet.writeD(0x00); // Clan ID - packet.writeD(0x00); // Builder level - + packet.writeD(0); // Clan ID + packet.writeD(0); // Builder level packet.writeD(charInfoPackage.getSex()); // Sex packet.writeD(charInfoPackage.getRace()); // Race packet.writeD(charInfoPackage.getBaseClassId()); - - packet.writeD(0x01); // GameServerName - + packet.writeD(1); // GameServerName packet.writeD(charInfoPackage.getX()); packet.writeD(charInfoPackage.getY()); packet.writeD(charInfoPackage.getZ()); packet.writeF(charInfoPackage.getCurrentHp()); packet.writeF(charInfoPackage.getCurrentMp()); - packet.writeQ(charInfoPackage.getSp()); packet.writeQ(charInfoPackage.getExp()); packet.writeF((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel()))); // High // Five packet.writeD(charInfoPackage.getLevel()); - packet.writeD(charInfoPackage.getReputation()); packet.writeD(charInfoPackage.getPkKills()); packet.writeD(charInfoPackage.getPvPKills()); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); // Ertheia - packet.writeD(0x00); // Ertheia - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); // Ertheia + packet.writeD(0); // Ertheia for (int slot : getPaperdollOrder()) { packet.writeD(charInfoPackage.getPaperdollItemId(slot)); } - for (int slot : getPaperdollOrderVisualId()) { packet.writeD(charInfoPackage.getPaperdollItemVisualId(slot)); } - packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_CHEST)); // Upper Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_LEGS)); // Lower Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_HEAD)); // Headgear enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_GLOVES)); // Gloves enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_FEET)); // Boots enchant level - packet.writeD(charInfoPackage.getHairStyle()); packet.writeD(charInfoPackage.getHairColor()); packet.writeD(charInfoPackage.getFace()); - packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); - packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption1Id() : 0); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption2Id() : 0); - // packet.writeD(charInfoPackage.getTransformId()); // Used to display Transformations - packet.writeD(0x00); // Currently on retail when you are on character select you don't see your transformation. - - packet.writeD(0x00); // Pet NpcId - packet.writeD(0x00); // Pet level - packet.writeD(0x00); // Pet Food - packet.writeD(0x00); // Pet Food Level - packet.writeF(0x00); // Current pet HP - packet.writeF(0x00); // Current pet MP - + packet.writeD(0); // Currently on retail when you are on character select you don't see your transformation. + packet.writeD(0); // Pet NpcId + packet.writeD(0); // Pet level + packet.writeD(0); // Pet Food + packet.writeD(0); // Pet Food Level + packet.writeF(0); // Current pet HP + packet.writeF(0); // Current pet MP packet.writeD(charInfoPackage.getVitalityPoints()); // Vitality packet.writeD((int) Config.RATE_VITALITY_EXP_MULTIPLIER * 100); // Vitality Percent packet.writeD(charInfoPackage.getVitalityItemsUsed()); // Remaining vitality item uses - packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0x00 : 0x01); // Char is active or not - packet.writeC(charInfoPackage.isNoble() ? 0x01 : 0x00); - packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 0x02 : 0x00); // Hero glow - packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 0x01 : 0x00); // Show hair accessory if enabled + packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0 : 1); // Char is active or not + packet.writeC(charInfoPackage.isNoble() ? 1 : 0); + packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 2 : 0); // Hero glow + packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 1 : 0); // Show hair accessory if enabled } return true; } @@ -279,7 +258,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); - try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate")) { @@ -292,7 +270,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (charInfopackage != null) { characterList.add(charInfopackage); - final Player player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { @@ -306,7 +283,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return characterList; } @@ -348,7 +324,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { clan.removeClanMember(objectId, 0); } - GameClient.deleteCharByObjId(objectId); return null; } @@ -367,20 +342,16 @@ public class CharSelectionInfo implements IClientOutgoingPacket charInfopackage.setHairStyle(chardata.getInt("hairstyle")); charInfopackage.setHairColor(chardata.getInt("haircolor")); charInfopackage.setSex(chardata.getInt("sex")); - charInfopackage.setExp(chardata.getLong("exp")); charInfopackage.setSp(chardata.getLong("sp")); charInfopackage.setVitalityPoints(chardata.getInt("vitality_points")); charInfopackage.setClanId(chardata.getInt("clanid")); - charInfopackage.setRace(chardata.getInt("race")); - final int baseClassId = chardata.getInt("base_class"); final int activeClassId = chardata.getInt("classid"); charInfopackage.setX(chardata.getInt("x")); charInfopackage.setY(chardata.getInt("y")); charInfopackage.setZ(chardata.getInt("z")); - final int faction = chardata.getInt("faction"); if (faction == 1) { @@ -390,7 +361,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setEvil(); } - if (Config.MULTILANG_ENABLE) { String lang = chardata.getString("language"); @@ -400,22 +370,18 @@ public class CharSelectionInfo implements IClientOutgoingPacket } charInfopackage.setHtmlPrefix("data/lang/" + lang + "/"); } - // if is in subclass, load subclass exp, sp, level info if (baseClassId != activeClassId) { loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId); } - charInfopackage.setClassId(activeClassId); - // Get the augmentation id for equipped weapon int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); if (weaponObjId < 1) { weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); } - if (weaponObjId > 0) { try (Connection con = DatabaseFactory.getConnection(); @@ -441,7 +407,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } - // Check if the base class is set to zero and also doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly. if ((baseClassId == 0) && (activeClassId > 0)) { @@ -451,7 +416,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setBaseClassId(baseClassId); } - charInfopackage.setDeleteTimer(deletetime); charInfopackage.setLastAccess(chardata.getLong("lastAccess")); charInfopackage.setNoble(chardata.getInt("nobless") == 1); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java index 847e24db87..d59df7911a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java @@ -32,7 +32,6 @@ public class ChooseInventoryItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHOOSE_INVENTORY_ITEM.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java index 12a3940521..ac66c2fa0f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java @@ -32,7 +32,6 @@ public class ClientSetTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CLIENT_SET_TIME.writeId(packet); - packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // time in client minutes packet.writeD(6); // constant to match the server time( this determines the speed of the client clock) return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java index 43732f74fa..66a1f5e20d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java @@ -68,7 +68,6 @@ public class ConfirmDlg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CONFIRM_DLG.writeId(packet); - final SMParam[] params = _systemMessage.getParams(); packet.writeD(_systemMessage.getId()); packet.writeD(params.length); @@ -131,7 +130,6 @@ public class ConfirmDlg implements IClientOutgoingPacket } } } - packet.writeD(_time); packet.writeD(_requesterId); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 2a98428740..85d5630327 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -71,7 +71,6 @@ public class CreatureSay implements IClientOutgoingPacket _mask |= 0x08; } } - // Does not shows level if (sender.isGM()) { @@ -123,7 +122,6 @@ public class CreatureSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_sender == null ? 0 : _sender.getObjectId()); packet.writeD(_chatType.getClientId()); if (_senderName != null) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index dfc40d995f..a307b06e4b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -38,9 +38,8 @@ public class DeleteObject implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DELETE_OBJECT.writeId(packet); - packet.writeD(_objectId); - packet.writeC(0x00); // c2 + packet.writeC(0); // c2 return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java index 982c8f3311..3b5917e55b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java @@ -50,7 +50,6 @@ public class Dice implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DICE.writeId(packet); - packet.writeD(_objectId); // object id of player packet.writeD(_itemId); // item id of dice (spade) 4625,4626,4627,4628 packet.writeD(_number); // number rolled diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 3d741a86a6..ebc93d0fc4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -68,7 +68,6 @@ public class Die implements IClientOutgoingPacket siegeClan = fort.getSiege().getAttackerClan(clan); isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan); } - _toVillage = creature.canRevive() && !creature.isPendingRevive(); _toClanHall = (clan != null) && (clan.getHideoutId() > 0); _toCastle = ((clan != null) && (clan.getCastleId() > 0)) || isInCastleDefense; @@ -76,7 +75,6 @@ public class Die implements IClientOutgoingPacket _useFeather = creature.getAccessLevel().allowFixedRes() || creature.getInventory().haveItemForSelfResurrection(); _toFortress = ((clan != null) && (clan.getFortId() > 0)) || isInFortDefense; } - _isSweepable = creature.isAttackable() && creature.isSweepActive(); } @@ -91,7 +89,6 @@ public class Die implements IClientOutgoingPacket { _items = new ArrayList<>(8); } - if (_items.size() < 8) { _items.add(itemId); @@ -116,20 +113,18 @@ public class Die implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DIE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_toVillage ? 0x01 : 0x00); - packet.writeD(_toClanHall ? 0x01 : 0x00); - packet.writeD(_toCastle ? 0x01 : 0x00); - packet.writeD(_toOutpost ? 0x01 : 0x00); - packet.writeD(_isSweepable ? 0x01 : 0x00); - packet.writeD(_useFeather ? 0x01 : 0x00); - packet.writeD(_toFortress ? 0x01 : 0x00); - packet.writeD(0x00); // Disables use Feather button for X seconds - packet.writeD(0x00); // Adventure's Song - packet.writeC(_hideAnimation ? 0x01 : 0x00); - - packet.writeD(_itemsEnabled ? 0x01 : 0x00); + packet.writeD(_toVillage ? 1 : 0); + packet.writeD(_toClanHall ? 1 : 0); + packet.writeD(_toCastle ? 1 : 0); + packet.writeD(_toOutpost ? 1 : 0); + packet.writeD(_isSweepable ? 1 : 0); + packet.writeD(_useFeather ? 1 : 0); + packet.writeD(_toFortress ? 1 : 0); + packet.writeD(0); // Disables use Feather button for X seconds + packet.writeD(0); // Adventure's Song + packet.writeC(_hideAnimation ? 1 : 0); + packet.writeD(_itemsEnabled ? 1 : 0); packet.writeD(getItems().size()); getItems().forEach(packet::writeD); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java index 15404f9dee..5837faec19 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java @@ -33,7 +33,6 @@ public class DoorInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_INFO.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.getId()); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java index 54f8742a73..14d41afee7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java @@ -33,7 +33,6 @@ public class DoorStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_STATUS_UPDATE.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.isOpen() ? 0 : 1); packet.writeD(_door.getDamage()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index b12458e719..3035890956 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -40,20 +40,17 @@ public class DropItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DROP_ITEM.writeId(packet); - packet.writeD(_objectId); packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeC(_item.isStackable() ? 0x01 : 0x00); + packet.writeC(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - - packet.writeC(0x00); - // packet.writeD(0x01); if above C == true (1) then packet.readD() + packet.writeC(0); + // packet.writeD(1); if above C == true (1) then packet.readD() packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java index 631c43ba0c..99bd80d97e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java @@ -62,13 +62,12 @@ public class Earthquake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EARTHQUAKE.writeId(packet); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_intensity); packet.writeD(_duration); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 6063a54535..1a8b8ddfbb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -59,25 +59,20 @@ public class EnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_crystal); packet.writeQ(_count); - // Guessing. // With 166 options became 3x write integers instead of shorts and enchant level moved bellow. - // Commenting until actually knowing. // for (int option : _enchantOptions) // { // packet.writeD(option); // } - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_enchantLevel); // Confirmed. - return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java index 837be1f5e3..169410245b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java @@ -41,7 +41,6 @@ public class EtcStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ETC_STATUS_UPDATE.writeId(packet); - packet.writeC(_player.getCharges()); // 1-7 increase force, level packet.writeD(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%) packet.writeC(_player.getExpertiseWeaponPenalty()); // Weapon Grade Penalty [1-4] diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java index 5dca90f960..9f8d576148 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java @@ -24,13 +24,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class Ex2ndPasswordAck implements IClientOutgoingPacket { + // TODO: Enum + public static final int SUCCESS = 0; + public static final int WRONG_PATTERN = 1; + private final int _status; private final int _response; - // TODO: Enum - public static final int SUCCESS = 0x00; - public static final int WRONG_PATTERN = 0x01; - public Ex2ndPasswordAck(int status, int response) { _status = status; @@ -41,10 +41,9 @@ public class Ex2ndPasswordAck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_ACK.writeId(packet); - packet.writeC(_status); - packet.writeD(_response == WRONG_PATTERN ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(_response == WRONG_PATTERN ? 1 : 0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java index 48bde5161d..c86b5185d0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordCheck implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_NEW = 0x00; - public static final int PASSWORD_PROMPT = 0x01; - public static final int PASSWORD_OK = 0x02; + public static final int PASSWORD_NEW = 0; + public static final int PASSWORD_PROMPT = 1; + public static final int PASSWORD_OK = 2; private final int _windowType; @@ -40,9 +40,8 @@ public class Ex2ndPasswordCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_CHECK.writeId(packet); - packet.writeD(_windowType); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java index 1abf50ab01..f6731bf18f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordVerify implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_OK = 0x00; - public static final int PASSWORD_WRONG = 0x01; - public static final int PASSWORD_BAN = 0x02; + public static final int PASSWORD_OK = 0; + public static final int PASSWORD_WRONG = 1; + public static final int PASSWORD_BAN = 2; private final int _wrongTentatives; private final int _mode; @@ -42,7 +42,6 @@ public class Ex2ndPasswordVerify implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_VERIFY.writeId(packet); - packet.writeD(_mode); packet.writeD(_wrongTentatives); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java index 55abf718c5..db551344ef 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java @@ -45,10 +45,8 @@ public class ExAbnormalStatusUpdateFromTarget implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ABNORMAL_STATUS_UPDATE_FROM_TARGET.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeH(_effects.size()); - for (BuffInfo info : _effects) { packet.writeD(info.getSkill().getDisplayId()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java index c4b9cd8356..f3abd6ec5c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java @@ -41,7 +41,6 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRABLE_SKILL_LIST_BY_CLASS.writeId(packet); - packet.writeH(_type.getId()); packet.writeH(_learnable.size()); for (SkillLearn skill : _learnable) @@ -54,7 +53,7 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket packet.writeC(skill.getRequiredItems().size()); if (_type == AcquireSkillType.SUBPLEDGE) { - packet.writeH(0x00); + packet.writeH(0); } } return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java index fd0e2fc97c..8555bb6e86 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java @@ -61,7 +61,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_SKILL_INFO.writeId(packet); - packet.writeD(_id); packet.writeD(_level); packet.writeQ(_spCost); @@ -73,7 +72,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket packet.writeD(holder.getId()); packet.writeQ(holder.getCount()); } - packet.writeD(_skillRem.size()); for (Skill skill : _skillRem) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java index 29793f4d6c..ff8c526ec4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java @@ -36,7 +36,6 @@ public class ExAdenaInvenCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ADENA_INVEN_COUNT.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeH(_player.getInventory().getSize()); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java index 2aa2d85bc5..5ef11e0f1e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java @@ -50,13 +50,11 @@ public class ExAirShipInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_INFO.writeId(packet); - packet.writeD(_ship.getObjectId()); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(_captain); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); @@ -73,14 +71,13 @@ public class ExAirShipInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - packet.writeD(_ship.getFuel()); packet.writeD(_ship.getMaxFuel()); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java index 4cfc76bfba..8b37f4fc0a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java @@ -42,7 +42,6 @@ public class ExAirShipStopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_airShipId); packet.writeD(_playerId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java index 33c57712da..52958f931b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java @@ -37,12 +37,10 @@ public class ExAirShipTeleportList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_TELEPORT_LIST.writeId(packet); - packet.writeD(_dockId); if (_teleports != null) { packet.writeD(_teleports.length); - for (int i = 0; i < _teleports.length; i++) { packet.writeD(i - 1); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java index 392b228f0d..7918022c72 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java @@ -50,13 +50,12 @@ public class ExAlchemySkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_SKILL_LIST.writeId(packet); - packet.writeD(_skills.size()); for (Skill skill : _skills) { packet.writeD(skill.getId()); packet.writeD(skill.getLevel()); - packet.writeQ(0x00); // Always 0 on Naia, SP i guess? + packet.writeQ(0); // Always 0 on Naia, SP i guess? packet.writeC(skill.getId() == CommonSkill.ALCHEMY_CUBE.getId() ? 0 : 1); // This is type in flash, visible or not } return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java index 3d7ee12a81..1990e1e701 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java @@ -37,7 +37,6 @@ public class ExAskCoupleAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_COUPLE_ACTION.writeId(packet); - packet.writeD(_actionId); packet.writeD(_objectId); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java index 61cabedd98..45615daf5a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java @@ -39,9 +39,8 @@ public class ExAskJoinMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_MPCC.writeId(packet); - packet.writeS(_requestorName); // name of CCLeader - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java index 17fa9d028f..908022ff7e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java @@ -38,7 +38,6 @@ public class ExAskJoinPartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_PARTY_ROOM.writeId(packet); - packet.writeS(_charName); packet.writeS(_roomName); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java index 2a6b958dc9..1551840013 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java @@ -38,7 +38,6 @@ public class ExAskModifyPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_MODIFY_PARTY_LOOTING.writeId(packet); - packet.writeS(_requestor); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java index 958e7c3d06..fa62c8a207 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java @@ -45,7 +45,6 @@ public class ExAttributeEnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ATTRIBUTE_ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeC(_isWeapon); packet.writeH(_type); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java index 1a3a1ef3fe..3d65055b3c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java @@ -41,9 +41,8 @@ public class ExAutoSoulShot implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AUTO_SOUL_SHOT.writeId(packet); - packet.writeD(_itemId); - packet.writeD(_enable ? 0x01 : 0x00); + packet.writeD(_enable ? 1 : 0); packet.writeD(_type); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java index 8680c6bd7a..a8137347ec 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java @@ -37,8 +37,7 @@ public class ExBaseAttributeCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASE_ATTRIBUTE_CANCEL_RESULT.writeId(packet); - - packet.writeD(0x01); // result + packet.writeD(1); // result packet.writeD(_objId); packet.writeD(_attribute); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java index 3fd8588108..13ad96137d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java @@ -75,7 +75,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 1149, 1150, 1151, 1152, 1153, 1154, 1155 }; - public static final int[] DEFAULT_ACTION_LIST = { 0, 1, 2, 3, @@ -146,7 +145,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 5012, 5013, 5014, 5015 }; //@formatter:on - public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST); private final int[] _actionIds; @@ -160,7 +158,6 @@ public class ExBasicActionList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASIC_ACTION_LIST.writeId(packet); - packet.writeD(_actionIds.length); for (int _actionId : _actionIds) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java index 4c4fac8c91..d32dca4d21 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java @@ -34,13 +34,14 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBeautyItemList implements IClientOutgoingPacket { - private int _colorCount; - private final BeautyData _beautyData; - private final Map> _colorData = new HashMap<>(); private static final int HAIR_TYPE = 0; private static final int FACE_TYPE = 1; private static final int COLOR_TYPE = 2; + private int _colorCount; + private final BeautyData _beautyData; + private final Map> _colorData = new HashMap<>(); + public ExBeautyItemList(Player player) { _beautyData = BeautyShopData.getInstance().getBeautyData(player.getRace(), player.getAppearance().getSexType()); @@ -60,7 +61,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BEAUTY_ITEM_LIST.writeId(packet); - packet.writeD(HAIR_TYPE); packet.writeD(_beautyData.getHairList().size()); for (BeautyItem hair : _beautyData.getHairList().values()) @@ -72,7 +72,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(hair.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(FACE_TYPE); packet.writeD(_beautyData.getFaceList().size()); for (BeautyItem face : _beautyData.getFaceList().values()) @@ -84,7 +83,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(face.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(COLOR_TYPE); packet.writeD(_colorCount); for (Entry> entry : _colorData.entrySet()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java index 1825236886..6d4c45cb2b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java @@ -34,7 +34,6 @@ public class ExBirthdayPopup implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_BIRTH_DAY.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java index 7d2f17e697..43e525f05f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java @@ -26,6 +26,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBrBroadcastEventState implements IClientOutgoingPacket { + public static final int APRIL_FOOLS = 20090401; + public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) + public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) + public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) + public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) + private final int _eventId; private final int _eventState; private int _param0; @@ -36,12 +42,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket private String _param5; private String _param6; - public static final int APRIL_FOOLS = 20090401; - public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) - public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) - public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) - public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) - public ExBrBroadcastEventState(int eventId, int eventState) { _eventId = eventId; @@ -65,7 +65,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BROADCAST_EVENT_STATE.writeId(packet); - packet.writeD(_eventId); packet.writeD(_eventState); packet.writeD(_param0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java index 1fd7ec663a..c0683c8797 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java @@ -44,7 +44,6 @@ public class ExBrBuffEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUFF_EVENT_STATE.writeId(packet); - packet.writeD(_type); packet.writeD(_value); packet.writeD(_state); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java index 943aae8a62..8e009d7b09 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java @@ -43,7 +43,6 @@ public class ExBrLoadEventTopRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_LOAD_EVENT_TOP_RANKERS.writeId(packet); - packet.writeD(_eventId); packet.writeD(_day); packet.writeD(_count); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java index 0a0ddf31b8..291f7a6b55 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java @@ -36,9 +36,8 @@ public class ExBrPremiumState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PREMIUM_STATE.writeId(packet); - packet.writeD(_player.getObjectId()); - packet.writeC(_player.hasPremiumStatus() || (_player.getVipTier() > 0) ? 0x01 : 0x00); + packet.writeC(_player.hasPremiumStatus() || (_player.getVipTier() > 0) ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 381dd859ad..567cfc70f9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -59,10 +59,8 @@ public class ExBuySellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x01); // Type SELL + packet.writeD(1); // Type SELL packet.writeD(_inventorySlots); - if ((_sellList != null)) { packet.writeH(_sellList.size()); @@ -74,9 +72,8 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - if ((_refundList != null) && !_refundList.isEmpty()) { packet.writeH(_refundList.size()); @@ -90,10 +87,9 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - - packet.writeC(_done ? 0x01 : 0x00); + packet.writeC(_done ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java index 2b43c0ce4b..e0ec81e0e7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java @@ -39,7 +39,6 @@ public class ExCastleState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CASTLE_STATE.writeId(packet); - packet.writeD(_castleId); packet.writeD(_castleSide.ordinal()); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java index b7f90d261b..a8196c7a83 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java @@ -52,7 +52,6 @@ public class ExChangeClientEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_CLIENT_EFFECT_INFO.writeId(packet); - packet.writeD(_type); packet.writeD(_key); packet.writeD(_value); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java index 472abc88df..eea59162ee 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java @@ -37,7 +37,6 @@ public class ExChangeNpcState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NPC_STATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java index 8cdcb4460d..45f2805517 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java @@ -49,7 +49,6 @@ public class ExChangePostState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_POST_STATE.writeId(packet); - packet.writeD(_receivedBoard ? 1 : 0); packet.writeD(_changedMsgIds.length); for (int postId : _changedMsgIds) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java index fc58ec9a2e..d765ab54e0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java @@ -35,7 +35,6 @@ public class ExChangeToAwakenedClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_TO_AWAKENED_CLASS.writeId(packet); - packet.writeD(_classId); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index f51a3eb3ae..1e9b8e9dc8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -47,7 +47,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket throw new IllegalArgumentException("Undefined Atribute item: " + stone); } _level = ElementalAttributeData.getInstance().getMaxElementLevel(_itemId); - // Register only items that can be put an attribute stone/crystal for (Item item : player.getInventory().getItems()) { @@ -62,7 +61,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_INVENTORY_ATTRIBUTE_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeQ(_count); packet.writeD(_atribute == AttributeType.FIRE ? 1 : 0); // Fire diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java index a272d85469..238882cd11 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java @@ -35,7 +35,6 @@ public class ExCloseMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java index d2ecd70952..877bca760a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java @@ -34,7 +34,6 @@ public class ExClosePartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_PARTY_ROOM.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java index 27c112776b..1d02c972b5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java @@ -54,7 +54,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLOSSEUM_FENCE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_clientState); packet.writeD(_x); @@ -62,7 +61,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_width); packet.writeD(_length); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java index 766d3619ad..b72bef93e8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java @@ -37,9 +37,8 @@ public class ExConfirmAddingContact implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AGIT_AUCTION_CMD.writeId(packet); - packet.writeS(_charName); - packet.writeD(_added ? 0x01 : 0x00); + packet.writeD(_added ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java index beded32254..c832d507ed 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameAddPlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x01); - + packet.writeD(1); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java index 5f36f730d0..847ea93e6a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java @@ -45,9 +45,7 @@ public class ExCubeGameChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java index 66abbf4b75..a2f2e61ded 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java @@ -43,12 +43,10 @@ public class ExCubeGameChangeTeam implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x05); - + packet.writeD(5); packet.writeD(_player.getObjectId()); - packet.writeD(_fromRedTeam ? 0x01 : 0x00); - packet.writeD(_fromRedTeam ? 0x00 : 0x01); + packet.writeD(_fromRedTeam ? 1 : 0); + packet.writeD(_fromRedTeam ? 0 : 1); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java index 5273b2099a..136b439283 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java @@ -39,9 +39,7 @@ public class ExCubeGameChangeTimeToStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x03); - + packet.writeD(3); packet.writeD(_seconds); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java index f81a302941..9bdba49029 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java @@ -35,7 +35,6 @@ public class ExCubeGameCloseUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0xffffffff); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java index 259a0e9407..3177e7a488 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java @@ -40,11 +40,9 @@ public class ExCubeGameEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x01); - - packet.writeD(_isRedTeamWin ? 0x01 : 0x00); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(1); + packet.writeD(_isRedTeamWin ? 1 : 0); + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java index 4d89e621ce..8b96bb545f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java @@ -55,14 +55,11 @@ public class ExCubeGameExtendedChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeD(_playerPoints); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java index e5a00f1ab7..c084789f13 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameRemovePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java index 00be884d2f..35a3f289d1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java @@ -35,8 +35,7 @@ public class ExCubeGameRequestReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x04); + packet.writeD(4); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java index 1bc89e0c32..8b755dd3cc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java @@ -30,7 +30,6 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket // Players Lists private final List _bluePlayers; private final List _redPlayers; - // Common Values private final int _roomNumber; @@ -51,12 +50,9 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_roomNumber); packet.writeD(0xffffffff); - packet.writeD(_bluePlayers.size()); for (Player player : _bluePlayers) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java index 2f2c092c08..d000112787 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java @@ -31,7 +31,6 @@ public class ExCursedWeaponList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet); - final Set ids = CursedWeaponsManager.getInstance().getCursedWeaponsIds(); packet.writeD(ids.size()); ids.forEach(packet::writeD); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java index 2f60a1b80c..5bc7ff3238 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java @@ -39,7 +39,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet); - if (!_cursedWeaponInfo.isEmpty()) { packet.writeD(_cursedWeaponInfo.size()); @@ -47,7 +46,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { packet.writeD(w.id); packet.writeD(w.activated); - packet.writeD(w.pos.getX()); packet.writeD(w.pos.getY()); packet.writeD(w.pos.getZ()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java index f475a02b28..0456fb9dae 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java @@ -34,7 +34,6 @@ public class ExDissmissMPCCRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DISSMISS_MPCC_ROOM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java index 258010f717..c731b7c7a9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java @@ -37,7 +37,6 @@ public class ExDuelAskStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_ASK_START.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDuel); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java index 043c82c0db..e9a31bee57 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java @@ -38,7 +38,6 @@ public class ExDuelEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_END.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java index 264409b3d6..e1fa1cea88 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java @@ -38,7 +38,6 @@ public class ExDuelReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_READY.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java index 488aafcb7d..ecdd528a16 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java @@ -38,7 +38,6 @@ public class ExDuelStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_START.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java index 7df040c5e7..5ed0c09675 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java @@ -36,7 +36,6 @@ public class ExDuelUpdateUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_UPDATE_USER_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeD(_player.getClassId().getId()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 7ab055a3d8..f58c0573a8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExEnchantSkillInfo implements IClientOutgoingPacket { private final Set _routes; - private final int _skillId; private final int _skillLevel; private final int _skillSubLevel; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 41368a8efb..e4ee350e64 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -50,7 +50,6 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_INFO_DETAIL.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java index 5cedcd6284..1d32f0d725 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java @@ -43,7 +43,6 @@ public class ExEnchantSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_LIST.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skills.size()); for (Skill skill : _skills) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java index 6ab5e869f2..853d74039f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java @@ -38,7 +38,6 @@ public class ExEnchantSkillResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_RESULT.writeId(packet); - packet.writeD(_enchanted ? 1 : 0); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java index 7b7d2d008d..410bf16510 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java @@ -42,7 +42,6 @@ public class ExEventMatchMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_EVENT_MATCH_MESSAGE.writeId(packet); - packet.writeC(_type); packet.writeS(_message); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java index 7264e90233..1946758bf5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java @@ -37,11 +37,9 @@ public class ExGetBookMarkInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOOK_MARK_INFO.writeId(packet); - - packet.writeD(0x00); // Dummy + packet.writeD(0); // Dummy packet.writeD(_player.getBookMarkSlot()); packet.writeD(_player.getTeleportBookmarks().size()); - for (TeleportBookmark tpbm : _player.getTeleportBookmarks()) { packet.writeD(tpbm.getId()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java index 36e7bb81af..201e8eb49b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java @@ -42,15 +42,14 @@ public class ExGetBossRecord implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOSS_RECORD.writeId(packet); - packet.writeD(_ranking); packet.writeD(_totalPoints); if (_bossRecordInfo == null) { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } else { @@ -59,7 +58,7 @@ public class ExGetBossRecord implements IClientOutgoingPacket { packet.writeD(entry.getKey()); packet.writeD(entry.getValue()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? } } return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java index ea0a5f8b18..85ccad0758 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java @@ -41,7 +41,6 @@ public class ExGetOffAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_OFF_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java index f8e16a4191..9a02e49223 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java @@ -39,7 +39,6 @@ public class ExGetOnAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_ON_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java index 51197344a5..704b3212a1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExGetPremiumItemList implements IClientOutgoingPacket { private final Player _player; - private final Map _map; public ExGetPremiumItemList(Player player) @@ -43,7 +42,6 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_PREMIUM_ITEM_LIST.writeId(packet); - packet.writeD(_map.size()); for (Entry entry : _map.entrySet()) { @@ -51,7 +49,7 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket packet.writeQ(entry.getKey()); packet.writeD(item.getItemId()); packet.writeQ(item.getCount()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeS(item.getSender()); } return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index a005fa8ad8..0200bdee08 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -40,7 +40,6 @@ public class ExHeroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HERO_LIST.writeId(packet); - packet.writeD(_heroList.size()); for (StatSet hero : _heroList.values()) { @@ -51,7 +50,7 @@ public class ExHeroList implements IClientOutgoingPacket packet.writeS(hero.getString(Hero.ALLY_NAME, "")); packet.writeD(hero.getInt(Hero.ALLY_CREST, 0)); packet.writeD(hero.getInt(Hero.COUNT)); - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index d5b5430142..0baca7cd86 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -48,8 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); - - packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade + packet.writeC(_hide ? 0 : 1); // Grand Crusade packet.writeD(_currentTemplateId); packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java index 81db66b88f..323c0cdf1e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java @@ -35,7 +35,6 @@ public class ExIsCharNameCreatable implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_IS_CHAR_NAME_CREATABLE.writeId(packet); - packet.writeD(_allowed); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java index 2cea176d69..4eea62de37 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java @@ -39,11 +39,11 @@ public class ExItemAnnounce implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_ANNOUNCE.writeId(packet); - packet.writeC(0x00); // item icon + packet.writeC(0); // item icon packet.writeString(_player.getName()); // name of player packet.writeD(_item.getId()); // item id packet.writeD(_item.getEnchantLevel()); // enchant level - packet.writeC(0x00); // name of item + packet.writeC(0); // name of item return true; } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java index ecc751eab3..45def9e0be 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java @@ -38,7 +38,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { throw new NullPointerException(); } - if (currentAuction.getAuctionState() != ItemAuctionState.STARTED) { _timeRemaining = 0; @@ -47,7 +46,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { _timeRemaining = (int) (currentAuction.getFinishingTimeRemaining() / 1000); // in seconds } - _refresh = refresh; _currentAuction = currentAuction; _nextAuction = nextAuction; @@ -57,16 +55,12 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_AUCTION_INFO.writeId(packet); - - packet.writeC(_refresh ? 0x00 : 0x01); + packet.writeC(_refresh ? 0 : 1); packet.writeD(_currentAuction.getInstanceId()); - final ItemAuctionBid highestBid = _currentAuction.getHighestBid(); packet.writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid()); - packet.writeD(_timeRemaining); writeItem(packet, _currentAuction.getItemInfo()); - if (_nextAuction != null) { packet.writeQ(_nextAuction.getAuctionInitBid()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java index 53ad8abd58..1c5e38cbab 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListMpccWaiting implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _rooms = new LinkedList<>(); @@ -53,7 +54,6 @@ public class ExListMpccWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_MPCC_WAITING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 78f2fec636..eafea24fa6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _players = new LinkedList<>(); @@ -60,7 +61,6 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(packet); - packet.writeD(_size); packet.writeD(_players.size()); for (Player player : _players) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java index 786c616875..c8723a9fc0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java @@ -46,7 +46,6 @@ public class ExMPCCPartyInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCPARTY_INFO_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_LeaderOID); packet.writeD(_memberCount); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java index 4bf07f0133..08259e4e6c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java @@ -37,7 +37,6 @@ public class ExMPCCPartymasterList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_PARTYMASTER_LIST.writeId(packet); - packet.writeD(_leadersName.size()); _leadersName.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java index abbdc8fe76..f021ef5f1f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java @@ -36,7 +36,6 @@ public class ExMPCCRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java index 154e156270..2eec590cb4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java @@ -41,7 +41,6 @@ public class ExMPCCRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java index 06e3027bfc..a0e9d0a4b0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java @@ -37,7 +37,6 @@ public class ExMPCCShowPartyMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCSHOW_PARTY_MEMBER_INFO.writeId(packet); - packet.writeD(_party.getMemberCount()); for (Player pc : _party.getMembers()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java index e454a746f3..771b2f22cb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java @@ -49,7 +49,6 @@ public class ExMagicAttackInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAGIC_ATTACK_INFO.writeId(packet); - packet.writeD(_caster); packet.writeD(_target); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java index 9cfbeb5aee..1aaa5b6520 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java @@ -35,7 +35,6 @@ public class ExMailArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAIL_ARRIVED.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java index 983ff22b92..48156c0600 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java @@ -44,7 +44,6 @@ public class ExManageMpccRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MANAGE_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java index f710c006e8..9d7d14211e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java @@ -45,7 +45,6 @@ public class ExMoveToLocationAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_objId); packet.writeD(_tx); packet.writeD(_ty); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java index 3e3bdc9fed..87e44b51cd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java @@ -43,7 +43,6 @@ public class ExMoveToLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java index 7ab0d1c7da..3c1902892a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java @@ -40,11 +40,9 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet); - packet.writeS(_channel.getLeader().getName()); - packet.writeD(0x00); // Channel loot 0 or 1 + packet.writeD(0); // Channel loot 0 or 1 packet.writeD(_channel.getMemberCount()); - packet.writeD(_channel.getParties().size()); for (Party p : _channel.getParties()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java index 1536bd5f9b..f2a32bb6e8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java @@ -43,7 +43,6 @@ public class ExNeedToChangeName implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEED_TO_CHANGE_NAME.writeId(packet); - packet.writeD(_type); packet.writeD(_subType); packet.writeS(_name); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java index be9bec8559..d18b4606b3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java @@ -35,7 +35,6 @@ public class ExNevitAdventEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CHANNELING_EFFECT.writeId(packet); - packet.writeD(_timeLeft); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java index 3a0367c178..09f6250f51 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java @@ -35,7 +35,6 @@ public class ExNevitAdventPointInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_AGATHION_ENERGY_INFO.writeId(packet); - packet.writeD(_points); // 72 = 1%, max 7200 = 100% return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java index 88fdaae499..ef220d86de 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java @@ -37,9 +37,8 @@ public class ExNevitAdventTimeChange implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - // state 0 - pause 1 - started - packet.writeC(_paused ? 0x00 : 0x01); + packet.writeC(_paused ? 0 : 1); // left time in ms max is 16000 its 4m and state is automatically changed to quit packet.writeD(_time); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java index fccdf510cc..4025bf78fa 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java @@ -34,7 +34,6 @@ public class ExNewSkillToLearnByLevelUp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEW_SKILL_TO_LEARN_BY_LEVEL_UP.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java index 324c18a517..f2ce8614dc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java @@ -43,8 +43,7 @@ public class ExNoticePostArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTICE_POST_ARRIVED.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java index afe3719d9b..050c7ccea5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java @@ -43,8 +43,7 @@ public class ExNoticePostSent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_WRITE_POST.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java index 5d98c20b09..e0bd08d39a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java @@ -30,7 +30,6 @@ public class ExNotifyPremiumItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_PREMIUM_ITEM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java index 6cb3724448..ba3c0cfeaa 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java @@ -34,7 +34,6 @@ public class ExOlympiadMatchEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MATCH_END.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java index 264d5aa484..7ffd5ed3bd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java @@ -55,19 +55,15 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x00); // Type 0 = Match List, 1 = Match Result - + packet.writeD(0); // Type 0 = Match List, 1 = Match Result packet.writeD(_games.size()); - packet.writeD(0x00); - + packet.writeD(0); for (OlympiadGameTask curGame : _games) { final AbstractOlympiadGame game = curGame.getGame(); if (game != null) { packet.writeD(game.getStadiumId()); // Stadium Id (Arena 1 = 0) - if (game instanceof OlympiadGameNonClassed) { packet.writeD(1); @@ -80,8 +76,7 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket { packet.writeD(0); } - - packet.writeD(curGame.isRunning() ? 0x02 : 0x01); // (1 = Standby, 2 = Playing) + packet.writeD(curGame.isRunning() ? 2 : 1); // (1 = Standby, 2 = Playing) packet.writeS(game.getPlayerNames()[0]); // Player 1 Name packet.writeS(game.getPlayerNames()[1]); // Player 2 Name } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java index 712651603d..b387271fba 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java @@ -53,9 +53,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x01); // Type 0 = Match List, 1 = Match Result - + packet.writeD(1); // Type 0 = Match List, 1 = Match Result packet.writeD(_tie ? 1 : 0); // 0 - win, 1 - tie packet.writeS(_winnerList.get(0).getName()); packet.writeD(_winTeam); @@ -69,9 +67,8 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } - packet.writeD(_loseTeam); packet.writeD(_loserList.size()); for (OlympiadInfo info : _loserList) @@ -83,7 +80,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java index 34d81d1f53..712b9e06c6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java @@ -38,7 +38,6 @@ public class ExOlympiadMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MODE.writeId(packet); - packet.writeC(_mode); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java index ebea6c56f3..5b4f2c2523 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java @@ -53,7 +53,6 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_SPELLED_INFO.writeId(packet); - packet.writeD(_playerId); packet.writeD(_effects.size() + _effects2.size()); for (BuffInfo info : _effects) @@ -62,7 +61,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(info.getSkill().getDisplayId()); packet.writeH(info.getSkill().getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(info.getSkill().getAbnormalType().getClientId()); writeOptionalD(packet, info.getSkill().isAura() ? -1 : info.getTime()); } @@ -73,7 +72,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(skill.getDisplayId()); packet.writeH(skill.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(skill.getAbnormalType().getClientId()); packet.writeH(-1); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java index 18c34fe9de..ca473edfcf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java @@ -76,7 +76,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_USER_INFO.writeId(packet); - if (_player != null) { packet.writeC(_player.getOlympiadSide()); @@ -91,7 +90,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket packet.writeS(_par.getName()); packet.writeD(_par.getBaseClass()); } - packet.writeD(_curHp); packet.writeD(_maxHp); packet.writeD(_curCp); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java index e84d0251bd..7ec64cc8c3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java @@ -35,7 +35,6 @@ public class ExOpenMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OPEN_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java index 90349cc1a2..5661dc9f57 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java @@ -56,7 +56,6 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PCCAFE_POINT_INFO.writeId(packet); - packet.writeD(_points); // num points packet.writeD(_mAddPoint); // points inc display packet.writeC(_mPeriodType); // period(0=don't show window,1=acquisition,2=use points) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java index f7e8b4a99a..248a2f7d98 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_ADD.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java index 832bee0012..1f452f4bae 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_DELETE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_summon.getSummonType()); packet.writeD(_summon.getOwner().getObjectId()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java index 0646a67001..703694fa2f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_UPDATE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 0e3edb3ea7..e4c6b79ae0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -47,7 +47,6 @@ public class ExPartyRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2bffdec368..2ebf1dc7f0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -43,10 +43,8 @@ public class ExPetInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class ExPetInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class ExPetInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,9 +154,8 @@ public class ExPetInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -227,28 +205,24 @@ public class ExPetInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PET_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -267,7 +241,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -283,19 +257,19 @@ public class ExPetInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -307,20 +281,20 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -344,12 +318,12 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -379,12 +353,10 @@ public class ExPetInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java index 082f4c7662..0f72c05a3a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java @@ -34,7 +34,6 @@ public class ExPlayScene implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLAY_SCENE.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java index e98d317e14..7e3803bdaa 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java @@ -36,7 +36,6 @@ public class ExPledgeCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_COUNT.writeId(packet); - packet.writeD(_count); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java index 838029e284..4084de3481 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java @@ -38,7 +38,6 @@ public class ExPledgeDraftListSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_DRAFT_LIST_SEARCH.writeId(packet); - packet.writeD(_pledgeRecruitList.size()); for (PledgeWaitingInfo prl : _pledgeRecruitList) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java index fb956e9996..44e34004ea 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java @@ -25,11 +25,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExPledgeEmblem implements IClientOutgoingPacket { + private static final int TOTAL_SIZE = 65664; + private final int _crestId; private final int _clanId; private final byte[] _data; private final int _chunkId; - private static final int TOTAL_SIZE = 65664; public ExPledgeEmblem(int crestId, byte[] chunkedData, int clanId, int chunkId) { @@ -43,7 +44,6 @@ public class ExPledgeEmblem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clanId); packet.writeD(_crestId); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java index ed19bf976b..b32f8c0645 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitApplyInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_APPLY_INFO.writeId(packet); - packet.writeD(_status.ordinal()); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java index fc98b7b6f7..af4af9c9c1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitBoardDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_DETAIL.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClanId()); packet.writeD(_pledgeRecruitInfo.getKarma()); packet.writeS(_pledgeRecruitInfo.getInformation()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index b4d48373a6..eda808e754 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -34,7 +34,6 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket private final int _clanOnCurrentPage; private final int _startIndex; private final int _endIndex; - static final int CLAN_PER_PAGE = 12; public ExPledgeRecruitBoardSearch(List clanList, int currentPage) @@ -51,11 +50,9 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_SEARCH.writeId(packet); - packet.writeD(_currentPage); packet.writeD(_totalNumberOfPage); packet.writeD(_clanOnCurrentPage); - for (int i = _startIndex; i < _endIndex; i++) { packet.writeD(_clanList.get(i).getClanId()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 4ae5ffe316..b1f139226d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -40,7 +40,6 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java index 77080a3820..5844f220ec 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java @@ -39,7 +39,6 @@ public class ExPledgeWaitingList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST.writeId(packet); - packet.writeD(pledgePlayerRecruitInfos.size()); for (PledgeApplicantInfo recruitInfo : pledgePlayerRecruitInfos.values()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java index a9245c1309..6b88572057 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java @@ -30,7 +30,6 @@ public class ExPledgeWaitingListAlarm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_ALARM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java index 60997b3da0..28c3967119 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java @@ -40,7 +40,6 @@ public class ExPledgeWaitingListApplied implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_APPLIED.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClan().getId()); packet.writeS(_pledgeRecruitInfo.getClan().getName()); packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java index 66a06892c2..1f53d1bb38 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java @@ -36,7 +36,6 @@ public class ExPledgeWaitingUser implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_USER.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getPlayerId()); packet.writeS(_pledgeRecruitInfo.getMessage()); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java index 49bc9b0995..5f404779f5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java @@ -43,7 +43,6 @@ public class ExPrivateStoreSetWholeMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_objectId); packet.writeS(_msg); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java index cb5e8fbce9..ff996b5d0c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutCommissionResultForVariationMake implements IClientOutgoingPac public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_COMMISSION_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_gemstoneObjId); packet.writeD(_itemId); packet.writeQ(_gemstoneCount); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java index 81721e921f..098472b7ae 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantScrollItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SCROLL_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java index 871f377db2..ffea182a49 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java index c47a4bcff4..8016e128f4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java index c8b46be499..95c0c0e4e1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_INTENSIVE_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_refinerItemObjId); packet.writeD(_lifestoneItemId); packet.writeD(_gemstoneItemId); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 2128b2b19f..2970ca00a2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -41,13 +41,12 @@ public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_CANCEL.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); packet.writeD(_itemAug1); packet.writeD(_itemAug2); packet.writeQ(_price); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java index 80541e65cd..c25dd16b01 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java @@ -34,10 +34,9 @@ public class ExPutItemResultForVariationMake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java index fe5eb74eb0..bc8896164d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java @@ -56,13 +56,12 @@ public class ExQuestNpcLogList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_NPC_LOG_LIST.writeId(packet); - packet.writeD(_questId); packet.writeC(_npcLogList.size()); for (NpcLogListHolder holder : _npcLogList) { packet.writeD(holder.isNpcString() ? holder.getId() : holder.getId() + 1000000); - packet.writeC(holder.isNpcString() ? 0x01 : 0x00); + packet.writeC(holder.isNpcString() ? 1 : 0); packet.writeD(holder.getCount()); } return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java index 62d622caff..60616b256d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java @@ -35,7 +35,6 @@ public class ExRedSky implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RED_SKY.writeId(packet); - packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java index ce40b1a792..163faff855 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java @@ -36,7 +36,6 @@ public class ExRegenMax implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REGEN_MAX.writeId(packet); - packet.writeD(1); packet.writeD(_time); packet.writeD(_tickInterval); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java index d864795cd6..a17525576b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java @@ -34,7 +34,6 @@ public class ExRemoveEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REMOVE_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 57ed88ac29..4e479e75a6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -56,7 +56,6 @@ public class ExReplyReceivedPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_RECEIVED_POST.writeId(packet); - packet.writeD(_msg.getMailType().ordinal()); // GOD if (_msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED) { @@ -76,11 +75,10 @@ public class ExReplyReceivedPost extends AbstractItemPacket } packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown packet.writeS(_msg.getSenderName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -92,9 +90,8 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeQ(_msg.getReqAdena()); packet.writeD(_msg.hasAttachments() ? 1 : 0); packet.writeD(_msg.isReturned() ? 1 : 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 75f6596194..ed490eae91 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -54,14 +54,12 @@ public class ExReplySentPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_SENT_POST.writeId(packet); - - packet.writeD(0x00); // GOD + packet.writeD(0); // GOD packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); packet.writeS(_msg.getReceiverName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -73,11 +71,11 @@ public class ExReplySentPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeQ(_msg.getReqAdena()); - packet.writeD(_msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(_msg.isReturned() ? 0x01 : 00); + packet.writeD(_msg.hasAttachments() ? 1 : 0); + packet.writeD(_msg.isReturned() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index cc4f7ce1d8..e6a3f9bca2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -35,7 +35,6 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java index 2634aa1cdd..60201b177f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java @@ -35,7 +35,6 @@ public class ExRequestHackShield implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REQUEST_HACK_SHIELD.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java index c51ff31d0b..75e3b3a945 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java @@ -29,13 +29,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyList implements IClientOutgoingPacket { + public static final int SHOW_FACESHAPE = 1; + public static final int SHOW_HAIRSTYLE = 0; + private final Player _player; private final int _type; private final Map _beautyItem; - public static final int SHOW_FACESHAPE = 1; - public static final int SHOW_HAIRSTYLE = 0; - public ExResponseBeautyList(Player player, int type) { _player = player; @@ -54,7 +54,6 @@ public class ExResponseBeautyList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java index ca2ed360ab..4b19201833 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java @@ -25,16 +25,15 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket { + public static final int FAILURE = 0; + public static final int SUCCESS = 1; + public static final int CHANGE = 0; + public static final int RESTORE = 1; + private final Player _player; private final int _type; private final int _result; - public static final int FAILURE = 0; - public static final int SUCCESS = 1; - - public static final int CHANGE = 0; - public static final int RESTORE = 1; - public ExResponseBeautyRegistReset(Player player, int type, int result) { _player = player; @@ -46,7 +45,6 @@ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_REGIST_RESET.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java index 0e313ef3b7..c0922cfb04 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java @@ -36,10 +36,8 @@ public class ExResponseResetList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_RESET_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); - packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java index 01fe1945ef..a230033d67 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java @@ -37,7 +37,6 @@ public class ExRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ROTATION.writeId(packet); - packet.writeD(_charId); packet.writeD(_heading); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index c58ccfc233..2646a71e77 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -36,7 +36,6 @@ public class ExRpItemLink extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RP_ITEM_LINK.writeId(packet); - writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java index 04556bbed2..f0c6eba8e9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java @@ -34,7 +34,6 @@ public class ExSearchOrc implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEARCH_ORC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index 1e06cc2a3f..7a4dced122 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -38,7 +38,6 @@ public class ExSendManorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_MANOR_LIST.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java index b63c69f37e..2c25cc8bfc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java @@ -124,7 +124,6 @@ public class ExSendUIEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_UIEVENT.writeId(packet); - packet.writeD(_objectId); packet.writeD(_type); // 0 = show, 1 = hide (there is 2 = pause and 3 = resume also but they don't work well you can only pause count down and you cannot resume it because resume hides the counter). packet.writeD(0); // unknown diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java index 4378479707..716a3e8623 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java @@ -385,16 +385,13 @@ public class ExServerPrimitive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SERVER_PRIMITIVE.writeId(packet); - packet.writeS(_name); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(65535); // has to do something with display range and angle packet.writeD(65535); // has to do something with display range and angle - packet.writeD(_points.size() + _lines.size()); - for (Point point : _points) { packet.writeC(1); // Its the type in this case Point @@ -408,7 +405,6 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(point.getY()); packet.writeD(point.getZ()); } - for (Line line : _lines) { packet.writeC(2); // Its the type in this case Line diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java index fb32e199b2..51fb91b643 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java @@ -46,7 +46,6 @@ public class ExSetCompassZoneCode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_COMPASS_ZONE_CODE.writeId(packet); - packet.writeD(_zoneType); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java index 1d0fbae3a4..34dee8bda0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java @@ -38,7 +38,6 @@ public class ExSetPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_PARTY_LOOTING.writeId(packet); - packet.writeD(_result); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java index 7b14ec8412..4e491af9d1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java @@ -34,7 +34,6 @@ public class ExShowAdventurerGuideBook implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_ADVENTURER_GUIDE_BOOK.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index 82554fdc5f..1f8df76083 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -39,7 +39,6 @@ public class ExShowAgitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AGIT_INFO.writeId(packet); - final Collection clanHalls = ClanHallData.getInstance().getClanHalls(); packet.writeD(clanHalls.size()); clanHalls.forEach(clanHall -> diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index dd11ee0150..51e6646ff5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -44,7 +44,6 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BASE_ATTRIBUTE_CANCEL_WINDOW.writeId(packet); - packet.writeD(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java index 14e55d39f3..e22345c4fd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java @@ -25,13 +25,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExShowBeautyMenu implements IClientOutgoingPacket { - private final Player _player; - private final int _type; - // TODO: Enum public static final int MODIFY_APPEARANCE = 0; public static final int RESTORE_APPEARANCE = 1; + private final Player _player; + private final int _type; + public ExShowBeautyMenu(Player player, int type) { _player = player; @@ -42,7 +42,6 @@ public class ExShowBeautyMenu implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BEAUTY_MENU.writeId(packet); - packet.writeD(_type); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 15d011befc..b0d2b90494 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -41,7 +41,6 @@ public class ExShowCastleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CASTLE_INFO.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) @@ -65,8 +64,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } packet.writeD(castle.getTaxPercent(TaxType.BUY)); packet.writeD((int) (castle.getSiege().getSiegeDate().getTimeInMillis() / 1000)); - - packet.writeC(castle.getSiege().isInProgress() ? 0x01 : 0x00); // Grand Crusade + packet.writeC(castle.getSiege().isInProgress() ? 1 : 0); // Grand Crusade packet.writeC(castle.getSide().ordinal()); // Grand Crusade } return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java index aeb4079f3a..f9a6ebe0e7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java @@ -38,7 +38,6 @@ public class ExShowContactList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_SHOW_POST_FRIEND.writeId(packet); - packet.writeD(_contacts.size()); _contacts.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index a079ea3129..94b989b583 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -37,7 +37,6 @@ public class ExShowCropInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _crops = (nextPeriod && !manor.isManorApproved()) ? null : manor.getCropProcure(manorId, nextPeriod); } @@ -46,10 +45,9 @@ public class ExShowCropInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Crop Sales" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Crop Sales" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); + packet.writeD(0); if (_crops != null) { packet.writeD(_crops.size()); @@ -64,17 +62,17 @@ public class ExShowCropInfo implements IClientOutgoingPacket if (seed == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(seed.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(seed.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(seed.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index ebffd775d8..1f01ee7b87 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -62,10 +62,8 @@ public class ExShowCropSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getCropId()); // crop id diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index ee9fa9fd37..b625a1e4e7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -39,7 +39,6 @@ public class ExShowFortressInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_INFO.writeId(packet); - final Collection forts = FortManager.getInstance().getForts(); packet.writeD(forts.size()); for (Fort fort : forts) @@ -47,7 +46,7 @@ public class ExShowFortressInfo implements IClientOutgoingPacket final Clan clan = fort.getOwnerClan(); packet.writeD(fort.getResidenceId()); packet.writeS(clan != null ? clan.getName() : ""); - packet.writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00); + packet.writeD(fort.getSiege().isInProgress() ? 1 : 0); // Time of possession packet.writeD(fort.getOwnedTime()); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index f389b26ed5..678ab43e96 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -42,11 +42,9 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_MAP_INFO.writeId(packet); - packet.writeD(_fortress.getResidenceId()); packet.writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status packet.writeD(_fortress.getFortSize()); // barracks count - final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId()); if ((commanders != null) && !commanders.isEmpty() && _fortress.getSiege().isInProgress()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 27da99cf41..da186103ae 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -51,7 +51,6 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_SIEGE_INFO.writeId(packet); - packet.writeD(_fortId); // Fortress Id packet.writeD(_size); // Total Barracks Count if (_csize > 0) @@ -64,22 +63,22 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { case 0: { - packet.writeD(0x03); + packet.writeD(3); break; } case 1: { - packet.writeD(0x02); + packet.writeD(2); break; } case 2: { - packet.writeD(0x01); + packet.writeD(1); break; } case 3: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -92,27 +91,27 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket // TODO: once control room supported, update packet.writeD(0x0x) to support 5th room case 0: { - packet.writeD(0x05); + packet.writeD(5); break; } case 1: { - packet.writeD(0x04); + packet.writeD(4); break; } case 2: { - packet.writeD(0x03); + packet.writeD(3); break; } case 3: { - packet.writeD(0x02); + packet.writeD(2); break; } case 4: { - packet.writeD(0x01); + packet.writeD(1); break; } } @@ -124,7 +123,7 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { for (int i = 0; i < _size; i++) { - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java index f7aca7dffd..912839e242 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java @@ -41,8 +41,7 @@ public class ExShowManorDefaultInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_MANOR_DEFAULT_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" and "Crop Sales" buttons + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" and "Crop Sales" buttons packet.writeD(_crops.size()); for (Seed crop : _crops) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 1d3312d668..d03ce2a5fd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -52,10 +52,8 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet); - packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java index cf38d18c1c..f41999329f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java @@ -34,7 +34,6 @@ public class ExShowQuestInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_INFO.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java index 70f31e318f..0fa64c401d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java @@ -37,7 +37,6 @@ public class ExShowQuestMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_MARK.writeId(packet); - packet.writeD(_questId); packet.writeD(_questState); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index ab85228caf..1a6ee00a10 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ExShowReceivedPostList implements IClientOutgoingPacket { - private final List _inbox; - private static final int MESSAGE_FEE = 100; private static final int MESSAGE_FEE_PER_SLOT = 1000; + private final List _inbox; + public ExShowReceivedPostList(int objectId) { _inbox = MailManager.getInstance().getInbox(objectId); @@ -45,7 +45,6 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { @@ -64,18 +63,18 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getSenderName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); + packet.writeD(msg.isUnread() ? 1 : 0); packet.writeD(((msg.getMailType() == MailType.COMMISSION_ITEM_SOLD) || (msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED)) ? 0 : 1); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(msg.isReturned() ? 0x01 : 0x00); - packet.writeD(0x00); // SysString in some case it seems + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(msg.isReturned() ? 1 : 0); + packet.writeD(0); // SysString in some case it seems } } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(MESSAGE_FEE); packet.writeD(MESSAGE_FEE_PER_SLOT); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java index 9679468789..deebb99c8f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java @@ -33,6 +33,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; */ public class ExShowScreenMessage implements IClientOutgoingPacket { + // Positions + public static final byte TOP_LEFT = 1; + public static final byte TOP_CENTER = 2; + public static final byte TOP_RIGHT = 3; + public static final byte MIDDLE_LEFT = 4; + public static final byte MIDDLE_CENTER = 5; + public static final byte MIDDLE_RIGHT = 6; + public static final byte BOTTOM_CENTER = 7; + public static final byte BOTTOM_RIGHT = 8; + private final int _type; private final int _sysMessageId; private final int _unk1; @@ -48,15 +58,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket private List _parameters; // Localisation related. private String _lang; - // Positions - public static final byte TOP_LEFT = 0x01; - public static final byte TOP_CENTER = 0x02; - public static final byte TOP_RIGHT = 0x03; - public static final byte MIDDLE_LEFT = 0x04; - public static final byte MIDDLE_CENTER = 0x05; - public static final byte MIDDLE_RIGHT = 0x06; - public static final byte BOTTOM_CENTER = 0x07; - public static final byte BOTTOM_RIGHT = 0x08; public void setLang(String lang) { @@ -265,7 +266,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SCREEN_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -284,9 +284,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(sml.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -308,9 +308,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -318,7 +318,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket } } } - packet.writeD(_type); packet.writeD(_sysMessageId); packet.writeD(_position); @@ -326,9 +325,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java index 29ab5d355f..6123b08991 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java @@ -37,7 +37,6 @@ public class ExShowSeedInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _seeds = (nextPeriod && !manor.isManorApproved()) ? null : manor.getSeedProduction(manorId, nextPeriod); } @@ -46,16 +45,14 @@ public class ExShowSeedInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown if (_seeds == null) { packet.writeD(0); return true; } - packet.writeD(_seeds.size()); for (SeedProduction seed : _seeds) { @@ -67,17 +64,17 @@ public class ExShowSeedInfo implements IClientOutgoingPacket if (s == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(s.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(s.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(s.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java index e628099700..eb6e686e10 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java @@ -32,13 +32,10 @@ public class ExShowSeedMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_MAP_INFO.writeId(packet); - packet.writeD(2); // seed count - // Seed of Destruction packet.writeD(1); // id 1? Grand Crusade packet.writeD(2770 + GraciaSeedsManager.getInstance().getSoDState()); // sys msg id - // Seed of Infinity packet.writeD(2); // id 2? Grand Crusade // Manager not implemented yet diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index 4fd891a466..373c314eba 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -62,10 +62,8 @@ public class ExShowSeedSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getSeedId()); // seed id diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 1994402da2..269bec5b97 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -47,7 +47,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _cropsItems.put(cropId, item); } } - for (CropProcure crop : CastleManorManager.getInstance().getCropProcure(_manorId, false)) { if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) @@ -61,7 +60,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_cropsItems.size()); // size for (Item item : _cropsItems.values()) @@ -70,9 +68,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket packet.writeD(item.getObjectId()); // Object id packet.writeD(item.getId()); // crop id packet.writeD(seed.getLevel()); // seed level - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(1)); // reward 1 id - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(2)); // reward 2 id if (_castleCrops.containsKey(item.getId())) { @@ -85,9 +83,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket else { packet.writeD(0xFFFFFFFF); // manor - packet.writeQ(0x00); // buy residual - packet.writeQ(0x00); // buy price - packet.writeC(0x00); // reward + packet.writeQ(0); // buy residual + packet.writeQ(0); // buy price + packet.writeC(0); // reward } packet.writeQ(item.getCount()); // my crops } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index db4bccc928..b61d5b2301 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -40,7 +40,6 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { @@ -50,17 +49,17 @@ public class ExShowSentPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getReceiverName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); - packet.writeD(0x01); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(msg.isUnread() ? 1 : 0); + packet.writeD(1); + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(0); } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java index 0e4e9fd2ef..0dca57f2f8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java @@ -48,7 +48,6 @@ public class ExShowTerritory implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TERRITORY.writeId(packet); - packet.writeD(_vertices.size()); packet.writeD(_minZ); packet.writeD(_maxZ); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java index 4e284f82c5..86e1009bbf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java @@ -46,7 +46,6 @@ public class ExShowTrace implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TRACE.writeId(packet); - packet.writeH(0); // type broken in H5 packet.writeD(0); // time broken in H5 packet.writeH(_locations.size()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java index 3245767ed7..836a5c9624 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java @@ -44,7 +44,6 @@ public class ExShowUsm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_USM.writeId(packet); - packet.writeD(_videoId); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java index 4acdffa842..1f1a14c31b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java @@ -34,7 +34,6 @@ public class ExShowVariationCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_CANCEL_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java index 3a2298019e..9870424e26 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java @@ -35,7 +35,6 @@ public class ExShowVariationMakeWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_MAKE_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java index 169827bab3..86211c8d97 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java @@ -44,10 +44,9 @@ public class ExSpawnEmitter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SPAWN_EMITTER.writeId(packet); - packet.writeD(_npcObjectId); packet.writeD(_playerObjectId); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java index 620800c1c4..534549b4fe 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java @@ -36,7 +36,6 @@ public class ExStartScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_START_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java index 0bd990cf34..babac59129 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java index 0e2689d598..d3e67afe99 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipObjId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java index 44b064113f..f5b3e1340f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java @@ -36,7 +36,6 @@ public class ExStopScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index 8029930c9a..367ac79be4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -66,7 +66,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket } OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet); - packet.writeD(_inventory); packet.writeD(_warehouse); // packet.writeD(_freight); // Removed with 152. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java index 3293a5b557..57563ca2f9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java @@ -39,7 +39,6 @@ public class ExSubPledgeSkillAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUB_PLEDGET_SKILL_ADD.writeId(packet); - packet.writeD(_type); packet.writeD(_skillId); packet.writeD(_skillLevel); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java index d61dfa20ab..816d6f16a6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java @@ -97,7 +97,6 @@ public class ExSubjobInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUBJOB_INFO.writeId(packet); - packet.writeC(_type); packet.writeD(_currClassId); packet.writeD(_currRace); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java index 85616016c7..b7a152629d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java @@ -38,7 +38,6 @@ public class ExTacticalSign implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TACTICAL_SIGN.writeId(packet); - packet.writeD(_target.getObjectId()); packet.writeD(_tokenId); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java index 3486e6281d..9e03a8bd0a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java @@ -39,7 +39,6 @@ public class ExTeleportToLocationActivate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_TO_LOCATION_ACTIVATE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java index a214c53a0f..7bcddd964d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java @@ -27,6 +27,7 @@ public class ExUISetting implements IClientOutgoingPacket { public static final String UI_KEY_MAPPING_VAR = "UI_KEY_MAPPING"; public static final String SPLIT_VAR = " "; + private final byte[] _uiKeyMapping; public ExUISetting(Player player) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java index 187770cfc8..eff4285a8b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java @@ -37,7 +37,6 @@ public class ExUnReadMailCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_UN_READ_MAIL_COUNT.writeId(packet); - packet.writeD(_mailUnreadCount); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java index f992b3c937..e59c651371 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java @@ -41,7 +41,6 @@ public class ExUseSharedGroupItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USE_SHARED_GROUP_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeD(_grpId); packet.writeD(_remainingTime); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java index 474fcc5208..f49d451587 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class ExUserInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getTransformationId()); - final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); final boolean isInvisible = _player.isInvisible(); packet.writeD(abnormalVisualEffects.size() + (isInvisible ? 1 : 0)); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java index b841449ab3..1069a64e3e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java @@ -36,12 +36,9 @@ public class ExUserInfoCubic implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_CUBIC.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(_player.getCubics().size()); - _player.getCubics().keySet().forEach(packet::writeH); - packet.writeD(_player.getAgathionId()); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java index 3e4afb995b..6ef31d6117 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java @@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExUserInfoEquipSlot extends AbstractMaskPacket { private final Player _player; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -66,11 +65,9 @@ public class ExUserInfoEquipSlot extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_EQUIP_SLOT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(InventorySlot.values().length); // 152 packet.writeB(_masks); - final PlayerInventory inventory = _player.getInventory(); for (InventorySlot slot : InventorySlot.values()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java index 3eb1cf9578..d655e48843 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java @@ -36,7 +36,6 @@ public class ExUserInfoInvenWeight implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_INVEN_WEIGHT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java index 91e0e92338..16aa81e9c0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java @@ -44,7 +44,6 @@ public class ExValidateLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java index 727267c9d5..50cb4025e4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java @@ -35,7 +35,6 @@ public class ExVariationCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_CANCEL_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java index 5cdc1b8d0e..4fde190ae2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java @@ -32,14 +32,13 @@ public class ExVariationResult implements IClientOutgoingPacket { _option1 = option1; _option2 = option2; - _success = success ? 0x01 : 0x00; + _success = success ? 1 : 0; } @Override public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_RESULT.writeId(packet); - packet.writeD(_option1); packet.writeD(_option2); packet.writeD(_success); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java index db0acfd5ff..60fb57c0b3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java @@ -41,10 +41,9 @@ public class ExVitalityEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_EFFECT_INFO.writeId(packet); - packet.writeD(_points); packet.writeD(_vitalityBonus); // Vitality Bonus - packet.writeH(0x00); // Vitality additional bonus in % + packet.writeH(0); // Vitality additional bonus in % packet.writeH(_vitalityItemsRemaining); // How much vitality items remaining for use packet.writeH(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java index 3cd9d26602..9a401c2321 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java @@ -35,7 +35,6 @@ public class ExVitalityPointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_POINT_INFO.writeId(packet); - packet.writeD(_vitalityPoints); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java index 71baff96ea..c4c5539ca4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java @@ -45,7 +45,6 @@ public class ExVoteSystemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VOTE_SYSTEM_INFO.writeId(packet); - packet.writeD(_recomLeft); packet.writeD(_recomHave); packet.writeD(_bonusTime); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java index bc41adf7f2..8abcfc022e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java @@ -37,7 +37,6 @@ public class ExWorldChatCnt implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_WORLD_CHAT_CNT.writeId(packet); - packet.writeD(_points); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java index 5f935fe0dc..dc9c2288f8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java @@ -79,19 +79,17 @@ public class FakePlayerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // vehicleId + packet.writeD(0); // vehicleId packet.writeD(_objId); packet.writeS(_npc.getName()); - packet.writeH(_npc.getRace().ordinal()); - packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 0x01 : 0x00); + packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 1 : 0); packet.writeD(_fpcHolder.getClassId()); - - packet.writeD(0x00); // Inventory.PAPERDOLL_UNDER + packet.writeD(0); // Inventory.PAPERDOLL_UNDER packet.writeD(_fpcHolder.getEquipHead()); packet.writeD(_fpcHolder.getEquipRHand()); packet.writeD(_fpcHolder.getEquipLHand()); @@ -103,28 +101,22 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_fpcHolder.getEquipRHand()); // dual hand packet.writeD(_fpcHolder.getEquipHair()); packet.writeD(_fpcHolder.getEquipHair2()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderAugument()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } - packet.writeC(_fpcHolder.getArmorEnchantLevel()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderVisualId()) { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeC(_npc.getScriptValue()); // getPvpFlag() packet.writeD(_npc.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -135,16 +127,12 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_npc.getCollisionRadius()); packet.writeF(_npc.getCollisionHeight()); - packet.writeD(_fpcHolder.getHair()); packet.writeD(_fpcHolder.getHairColor()); packet.writeD(_fpcHolder.getFace()); - packet.writeS(_npc.getTemplate().getTitle()); - if (_clan != null) { packet.writeD(_clan.getId()); @@ -154,71 +142,51 @@ public class FakePlayerInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - - packet.writeC(0x01); // isSitting() ? 0x00 : 0x01 (at some initial tests it worked) - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); - packet.writeC(_npc.isInCombat() ? 0x01 : 0x00); - - packet.writeC(_npc.isAlikeDead() ? 0x01 : 0x00); - - packet.writeC(_npc.isInvisible() ? 0x01 : 0x00); - - packet.writeC(0x00); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount - packet.writeC(0x00); // getPrivateStoreType().getId() - - packet.writeH(0x00); // getCubics().size() + packet.writeC(1); // isSitting() ? 0 : 1 (at some initial tests it worked) + packet.writeC(_npc.isRunning() ? 1 : 0); + packet.writeC(_npc.isInCombat() ? 1 : 0); + packet.writeC(_npc.isAlikeDead() ? 1 : 0); + packet.writeC(_npc.isInvisible() ? 1 : 0); + packet.writeC(0); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount + packet.writeC(0); // getPrivateStoreType().getId() + packet.writeH(0); // getCubics().size() // getCubics().keySet().forEach(packet::writeH); - packet.writeC(0x00); - + packet.writeC(0); packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : 0); packet.writeH(_fpcHolder.getRecommends()); - packet.writeD(0x00); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 - + packet.writeD(0); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 packet.writeD(_fpcHolder.getClassId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(_fpcHolder.getWeaponEnchantLevel()); // isMounted() ? 0 : _enchantLevel - packet.writeC(_npc.getTeam().getId()); - - packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0x00); + packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0); packet.writeC(_fpcHolder.getNobleLevel()); - packet.writeC(_fpcHolder.isHero() ? 0x01 : 0x00); - - packet.writeC(_fpcHolder.isFishing() ? 0x01 : 0x00); - + packet.writeC(_fpcHolder.isHero() ? 1 : 0); + packet.writeC(_fpcHolder.isFishing() ? 1 : 0); packet.writeD(_fpcHolder.getBaitLocationX()); packet.writeD(_fpcHolder.getBaitLocationY()); packet.writeD(_fpcHolder.getBaitLocationZ()); - packet.writeD(_fpcHolder.getNameColor()); - packet.writeD(_heading); - packet.writeC(_fpcHolder.getPledgeStatus()); - packet.writeH(0x00); // getPledgeType() - + packet.writeH(0); // getPledgeType() packet.writeD(_fpcHolder.getTitleColor()); - - packet.writeC(0x00); // isCursedWeaponEquipped - - packet.writeD(0x00); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 - packet.writeD(0x00); // getTransformationDisplayId() + packet.writeC(0); // isCursedWeaponEquipped + packet.writeD(0); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 + packet.writeD(0); // getTransformationDisplayId() packet.writeD(_fpcHolder.getAgathionId()); - - packet.writeC(0x00); - - packet.writeD(0x00); // getCurrentCp() + packet.writeC(0); + packet.writeD(0); // getCurrentCp() packet.writeD(_npc.getMaxHp()); packet.writeD((int) Math.round(_npc.getCurrentHp())); packet.writeD(_npc.getMaxMp()); packet.writeD((int) Math.round(_npc.getCurrentMp())); - - packet.writeC(0x00); + packet.writeC(0); final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) @@ -229,9 +197,9 @@ public class FakePlayerInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(0x00); // cocPlayer.getPosition() - packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 0x01 : 0x00); - packet.writeC(0x00); // Used Ability Points + packet.writeC(0); // cocPlayer.getPosition() + packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 1 : 0); + packet.writeC(0); // Used Ability Points return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java index ae088538da..03223c8a3e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java @@ -62,7 +62,6 @@ public class FlyToLocation implements IClientOutgoingPacket _destY = destY; _destZ = destZ; _type = type; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -82,7 +81,6 @@ public class FlyToLocation implements IClientOutgoingPacket _flySpeed = flySpeed; _flyDelay = flyDelay; _animationSpeed = animationSpeed; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -103,7 +101,6 @@ public class FlyToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FLY_TO_LOCATION.writeId(packet); - packet.writeD(_chaObjId); packet.writeD(_destX); packet.writeD(_destY); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java index 1e52b0ef72..471d70f791 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java @@ -35,8 +35,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x01); + packet.writeC(1); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index ef1d37297e..2ee6ffbcd9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -50,25 +50,24 @@ public class GMHennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GMHENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON packet.writeH(_player.getHennaValue(BaseStat.MEN)); // equip MEN packet.writeH(_player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeH(_player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeH(0x00); // equip LUC - packet.writeH(0x00); // equip CHA + packet.writeH(0); // equip LUC + packet.writeH(0); // equip CHA packet.writeD(3); // Slots packet.writeD(_hennas.size()); // Size for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java index 38ca4c7be0..59bf0d9d93 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java @@ -38,7 +38,6 @@ public class GMHide implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_HIDE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index cd876896af..c2f0803303 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -50,7 +50,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -69,8 +68,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getINT()); packet.writeD(_player.getWIT()); packet.writeD(_player.getMEN()); - packet.writeD(0x00); // LUC - packet.writeD(0x00); // CHA + packet.writeD(0); // LUC + packet.writeD(0); // CHA packet.writeD(_player.getMaxHp()); packet.writeD((int) _player.getCurrentHp()); packet.writeD(_player.getMaxMp()); @@ -79,28 +78,24 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); packet.writeD(_player.getPkKills()); - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollObjectId(slot)); } - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); } - for (int slot = 0; slot < 11; slot++) { final VariationInstance augment = _player.getInventory().getPaperdollAugmentation(slot); packet.writeD(augment != null ? augment.getOption1Id() : 0); // Confirmed packet.writeD(augment != null ? augment.getOption2Id() : 0); // Confirmed } - packet.writeC(_player.getInventory().getTalismanSlots()); // CT2.3 packet.writeC(_player.getInventory().canEquipCloak() ? 1 : 0); // CT2.3 - packet.writeD(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeH(0); packet.writeD(_player.getPAtk()); packet.writeD(_player.getPAtkSpd()); packet.writeD(_player.getPDef()); @@ -108,18 +103,14 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAccuracy()); packet.writeD(_player.getCriticalHit()); packet.writeD(_player.getMAtk()); - packet.writeD(_player.getMAtkSpd()); packet.writeD(_player.getPAtkSpd()); - packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicEvasionRate()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name packet.writeD(_player.getReputation()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -135,8 +126,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeD(_player.isGM() ? 0x01 : 0x00); // builder level - + packet.writeD(_player.isGM() ? 1 : 0); // builder level packet.writeS(_player.getTitle()); packet.writeD(_player.getClanId()); // pledge id packet.writeD(_player.getClanCrestId()); // pledge crest id @@ -146,26 +136,19 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeC(_player.hasDwarvenCraft() ? 1 : 0); packet.writeD(_player.getPkKills()); packet.writeD(_player.getPvpKills()); - packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); - - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeC(321); - packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window - - packet.writeC(_player.isNoble() ? 0x01 : 0x00); - packet.writeC(_player.isHero() ? 0x01 : 0x00); - + packet.writeC(_player.isNoble() ? 1 : 0); + packet.writeC(_player.isHero() ? 1 : 0); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); - final AttributeType attackAttribute = _player.getAttackElement(); packet.writeH(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); @@ -175,8 +158,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket } packet.writeD(_player.getFame()); packet.writeD(_player.getVitalityPoints()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index 1d88596096..552b6e6168 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -37,14 +37,12 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_player.getName()); packet.writeD(_clan.getId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); @@ -52,15 +50,14 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 packet.writeD(_clan.getAllyCrestId()); // c2 packet.writeD(_clan.isAtWar() ? 1 : 0); // c3 - packet.writeD(0x00); // T3 Unknown - + packet.writeD(0); // T3 Unknown packet.writeD(_clan.getMembers().size()); for (ClanMember member : _clan.getMembers()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java index 93af10e254..3c155ff816 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -38,10 +38,8 @@ public class GMViewSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_SKILL_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_skills.size()); - final boolean isDisabled = (_player.getClan() != null) && (_player.getClan().getReputationScore() < 0); for (Skill skill : _skills) { @@ -49,7 +47,7 @@ public class GMViewSkillInfo implements IClientOutgoingPacket packet.writeH(skill.getDisplayLevel()); packet.writeH(skill.getSubLevel()); packet.writeD(skill.getDisplayId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(isDisabled && skill.isClanSkill() ? 1 : 0); packet.writeC(skill.isEnchantable() ? 1 : 0); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index f49138fafe..c909d5e6e1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -51,7 +51,6 @@ public class GMViewWarehouseWithdrawList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_WAREHOUSE_WITHDRAW_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java index d8c273f914..449271993b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java @@ -35,7 +35,6 @@ public class GameGuardQuery implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GAME_GUARD_QUERY.writeId(packet); - packet.writeD(0x27533DD9); packet.writeD(0x2E72A51D); packet.writeD(0x2017038B); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index b0c011b696..037b2e6b6b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -35,10 +35,8 @@ public class GetItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ITEM.writeId(packet); - packet.writeD(_playerId); packet.writeD(_item.getObjectId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java index f8c6126c87..5f4d7bf3ca 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java @@ -50,7 +50,6 @@ public class GetOffVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_OFF_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java index ffa8d5f310..77d1e6ba28 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java @@ -45,7 +45,6 @@ public class GetOnVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ON_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java index e5dcb9ded6..b1f5b588f9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java @@ -44,14 +44,13 @@ public class GmViewQuestInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_QUEST_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeH(_questList.size()); // quest count - for (Quest quest : _questList) { final QuestState qs = _player.getQuestState(quest.getName()); packet.writeD(quest.getId()); packet.writeD(qs == null ? 0 : qs.getCond()); } - packet.writeH(0x00); // some size + packet.writeH(0); // some size // for size; ddQQ return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 7e0614b359..3283ac802a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -51,7 +51,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeQ(_player.getAdena()); // activeChar current amount of Adena packet.writeD(3); // available equip slot packet.writeD(_hennaEquipList.size()); - for (Henna henna : _hennaEquipList) { // Player must have at least one dye in inventory @@ -62,8 +61,8 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); // item Id of the dye packet.writeQ(henna.getWearCount()); // amount of dyes required packet.writeQ(henna.getWearFee()); // amount of Adena required - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not - // packet.writeD(0x00); // Does not exist in Classic. + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // meet the requirement or not + // packet.writeD(0); // Does not exist in Classic. } } return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 0e6e64c7b2..23364ad722 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -50,25 +50,24 @@ public class HennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON packet.writeH(_player.getHennaValue(BaseStat.MEN)); // equip MEN packet.writeH(_player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeH(_player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeH(0x00); // equip LUC - packet.writeH(0x00); // equip CHA + packet.writeH(0); // equip LUC + packet.writeH(0); // equip CHA packet.writeD(3 - _player.getHennaEmptySlots()); // Slots packet.writeD(_hennas.size()); // Size for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); } - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 658087380a..9a22f0a564 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -40,12 +40,11 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_ITEM_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getWearCount()); // total amount of dye require packet.writeQ(_henna.getWearFee()); // total amount of Adena require to draw symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to draw or not 0 is false and 1 is true + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to draw or not 0 is false and 1 is true packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() + _player.getHennaValue(BaseStat.INT)); // equip INT @@ -59,7 +58,7 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket packet.writeH(_player.getDEX() + _player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeD(_player.getWIT()); // current WIT packet.writeH(_player.getWIT() + _player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 3800940bac..162812f30b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -40,12 +40,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getCancelCount()); // total amount of dye require packet.writeQ(_henna.getCancelFee()); // total amount of Adena require to remove symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to remove or not + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to remove or not packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() - _player.getHennaValue(BaseStat.INT)); // equip INT @@ -59,11 +58,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket packet.writeH(_player.getDEX() - _player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeD(_player.getWIT()); // current WIT packet.writeH(_player.getWIT() - _player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeD(0x00); // current LUC - packet.writeH(0x00); // equip LUC - packet.writeD(0x00); // current CHA - packet.writeH(0x00); // equip CHA - packet.writeD(0x00); + packet.writeD(0); // current LUC + packet.writeH(0); // equip LUC + packet.writeD(0); // current CHA + packet.writeH(0); // equip CHA + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 3a780986a0..d9f092b327 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -37,11 +37,9 @@ public class HennaRemoveList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); - packet.writeD(0x03); // seems to be max size + packet.writeD(3); // seems to be max size packet.writeD(3 - _player.getHennaEmptySlots()); - for (Henna henna : _player.getHennaList()) { if (henna != null) @@ -50,7 +48,7 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); packet.writeQ(henna.getCancelCount()); packet.writeQ(henna.getCancelFee()); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index b5c8628b50..f2a9cf1822 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -89,14 +89,12 @@ public interface IClientOutgoingPacket extends IOutgoingPacket Inventory.PAPERDOLL_ARTIFACT20, Inventory.PAPERDOLL_ARTIFACT21, }; - int[] PAPERDOLL_ORDER_AUGMENT = new int[] { Inventory.PAPERDOLL_RHAND, Inventory.PAPERDOLL_LHAND, Inventory.PAPERDOLL_RHAND }; - int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 0c54e810f0..3378827f34 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -46,7 +46,6 @@ public class InventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index c4598a72e6..cef69ecb6f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -59,8 +59,8 @@ public class ItemList extends AbstractItemPacket } else { - packet.writeC(0x01); // _showWindow ? 0x01 : 0x00 - packet.writeD(0x00); + packet.writeC(1); // _showWindow ? 1 : 0 + packet.writeD(0); packet.writeD(_items.size()); } writeInventoryBlock(packet, _player.getInventory()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java index b32b4df4a3..c3b9918230 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java @@ -32,9 +32,8 @@ public class JoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PARTY.writeId(packet); - packet.writeD(_response); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java index 65e06efeb7..f347f7efcd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java @@ -32,7 +32,6 @@ public class JoinPledge implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PLEDGE.writeId(packet); - packet.writeD(_pledgeId); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index 96f6d7c34d..996622b9e9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -35,17 +35,16 @@ public class KeyPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VERSION_CHECK.writeId(packet); - packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok for (int i = 0; i < 8; i++) { packet.writeC(_key[i]); // key } - packet.writeD(0x01); + packet.writeD(1); packet.writeD(Config.SERVER_ID); // server id - packet.writeC(0x01); - packet.writeD(0x00); // obfuscation key - packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 0x01 : 0x00); // isClassic + packet.writeC(1); + packet.writeD(0); // obfuscation key + packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 1 : 0); // isClassic return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java index 484c10f0c4..62424fd03a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java @@ -40,7 +40,6 @@ public class L2FriendSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_SAY.writeId(packet); - packet.writeD(0); // ?? packet.writeS(_receiver); packet.writeS(_sender); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java index b875edb772..790d599b5b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java @@ -32,11 +32,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ListPartyWaiting implements IClientOutgoingPacket { + private static final int NUM_PER_PAGE = 64; + private final List _rooms = new LinkedList<>(); private final int _size; - private static final int NUM_PER_PAGE = 64; - public ListPartyWaiting(PartyMatchingRoomLevelType type, int location, int page, int requestorLevel) { final List rooms = MatchingRoomManager.getInstance().getPartyMathchingRooms(location, type, requestorLevel); @@ -57,7 +57,6 @@ public class ListPartyWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_PARTY_WATING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java index 4f8f9adc64..bb0ac61dbd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java @@ -54,7 +54,6 @@ public class LoginFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LOGIN_FAIL.writeId(packet); - packet.writeD(_success); packet.writeD(_reason); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java index 18a522c315..6743e3e66f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java @@ -32,7 +32,6 @@ public class MagicSkillCanceld implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_CANCELED.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java index d56de10079..7ab29cc1a8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java @@ -66,7 +66,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // MagicSkillUse castingType packet.writeD(_objectId); packet.writeD(_skillId); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java index 3df8463279..a86626cfa6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java @@ -84,7 +84,6 @@ public class MagicSkillUse implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_USE.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // Casting bar type: 0 - default, 1 - default up, 2 - blue, 3 - green, 4 - red. packet.writeD(_creature.getObjectId()); packet.writeD(_target.getObjectId()); @@ -111,7 +110,7 @@ public class MagicSkillUse implements IClientOutgoingPacket packet.writeD(_target.getX()); packet.writeD(_target.getY()); packet.writeD(_target.getZ()); - packet.writeD(_actionId >= 0 ? 0x01 : 0x00); // 1 when ID from RequestActionUse is used + packet.writeD(_actionId >= 0 ? 1 : 0); // 1 when ID from RequestActionUse is used packet.writeD(_actionId >= 0 ? _actionId : 0); // ID from RequestActionUse. Used to set cooldown on summon skills. return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java index 6b710c692e..12e2488f24 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java @@ -37,11 +37,9 @@ public class ManagePledgePower implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet); - packet.writeD(_rank); packet.writeD(_action); packet.writeD(_clan.getRankPrivs(_rank).getBitmask()); - return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 95f4b6f201..4e2ab3f00b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -42,11 +42,9 @@ public class MonRaceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MON_RACE_INFO.writeId(packet); - packet.writeD(_unknown1); packet.writeD(_unknown2); - packet.writeD(0x08); - + packet.writeD(8); for (int i = 0; i < 8; i++) { packet.writeD(_monsters[i].getObjectId()); // npcObjectID @@ -68,7 +66,7 @@ public class MonRaceInfo implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java index 0093b3edc9..e6386921ff 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java @@ -45,13 +45,10 @@ public class MoveToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_xDst); packet.writeD(_yDst); packet.writeD(_zDst); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java index b1fb3ea003..59103c6c4c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java @@ -48,7 +48,6 @@ public class MoveToLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java index 30ff3c96af..aa261f924f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java @@ -50,11 +50,9 @@ public class MoveToPawn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_PAWN.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetId); packet.writeD(_distance); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index e1da19cc8f..50ff0191b8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -58,18 +58,16 @@ public class MultiSellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.MULTI_SELL_LIST.writeId(packet); - - packet.writeC(0x00); // Helios + packet.writeC(0); // Helios packet.writeD(_list.getId()); // list id - packet.writeC(0x00); // GOD Unknown + packet.writeC(0); // GOD Unknown packet.writeD(1 + (_index / PAGE_SIZE)); // page started from 1 - packet.writeD(_finished ? 0x01 : 0x00); // finished + packet.writeD(_finished ? 1 : 0); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - packet.writeC(0x00); // Grand Crusade - packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window - packet.writeD(0x20); // Helios - Always 32 - + packet.writeC(0); // Grand Crusade + packet.writeC(_list.isChanceMultisell() ? 1 : 0); // new multisell window + packet.writeD(32); // Helios - Always 32 while (_size-- > 0) { ItemInfo itemEnchantment = _list.getItemEnchantment(_index); @@ -86,19 +84,15 @@ public class MultiSellList extends AbstractItemPacket } } } - packet.writeD(_index); // Entry ID. Start from 1. packet.writeC(entry.isStackable() ? 1 : 0); - // Those values will be passed down to MultiSellChoose packet. packet.writeH(itemEnchantment != null ? itemEnchantment.getEnchantLevel() : 0); // enchant level writeItemAugment(packet, itemEnchantment); writeItemElemental(packet, itemEnchantment); writeItemEnsoulOptions(packet, itemEnchantment); - packet.writeH(entry.getProducts().size()); packet.writeH(entry.getIngredients().size()); - for (ItemChanceHolder product : entry.getProducts()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(product.getId()); @@ -122,7 +116,6 @@ public class MultiSellList extends AbstractItemPacket writeItemElemental(packet, displayItemEnchantment); writeItemEnsoulOptions(packet, displayItemEnchantment); } - for (ItemChanceHolder ingredient : entry.getIngredients()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(ingredient.getId()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java index 6e85f5348c..cd46aac3aa 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java @@ -45,11 +45,10 @@ public class MyTargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MY_TARGET_SELECTED.writeId(packet); - - packet.writeD(0x01); // Grand Crusade + packet.writeD(1); // Grand Crusade packet.writeD(_objectId); packet.writeH(_color); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java index 1901ad1297..166c5c1e00 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java @@ -36,7 +36,6 @@ public class NewCharacterSuccess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NEW_CHARACTER_SUCCESS.writeId(packet); - packet.writeD(_chars.size()); for (PlayerTemplate chr : _chars) { @@ -44,31 +43,24 @@ public class NewCharacterSuccess implements IClientOutgoingPacket { continue; } - // TODO: Unhardcode these packet.writeD(chr.getRace().ordinal()); packet.writeD(chr.getClassId().getId()); - packet.writeD(99); packet.writeD(chr.getBaseSTR()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseDEX()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseCON()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseINT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseWIT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseMEN()); packet.writeD(1); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java index be1605f679..6061ea26ef 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java @@ -38,7 +38,6 @@ public class NicknameChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NICK_NAME_CHANGED.writeId(packet); - packet.writeD(_objectId); packet.writeS(_title); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index f9cd107e2c..3e4837b4a4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -54,24 +54,20 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public NpcHtmlMessage(int npcObjId, int itemId) { super(npcObjId); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } public NpcHtmlMessage(int npcObjId, int itemId, String html) { super(npcObjId, html); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } @@ -79,11 +75,10 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java index 61f195e35d..05489103cb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java @@ -47,10 +47,8 @@ public class NpcInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -58,7 +56,6 @@ public class NpcInfo extends AbstractMaskPacket private int _clanId = 0; private int _statusMask = 0; private final Set _abnormalVisualEffects; - private String[] _localisation; public void setLang(String lang) @@ -101,112 +98,90 @@ public class NpcInfo extends AbstractMaskPacket { addComponentType(NpcInfoType.HEADING); } - if ((npc.getStat().getPAtkSpd() > 0) || (npc.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (npc.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((npc.getLeftHandItem() > 0) || (npc.getRightHandItem() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (npc.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (npc.getDisplayEffect() > 0) { addComponentType(NpcInfoType.DISPLAY_EFFECT); } - if (npc.isInsideZone(ZoneId.WATER) || npc.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (npc.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (npc.getCloneObjId() > 0) { addComponentType(NpcInfoType.CLONE); } - if (npc.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (npc.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (npc.getCurrentHp() <= npc.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (npc.getCurrentMp() <= npc.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (npc.getTemplate().isUsingServerSideName()) { addComponentType(NpcInfoType.NAME); } - if (npc.getTemplate().isUsingServerSideTitle() || (npc.isMonster() && (Config.SHOW_NPC_LEVEL || Config.SHOW_NPC_AGGRESSION)) || npc.isChampion() || npc.isTrap()) { addComponentType(NpcInfoType.TITLE); } - if (npc.getNameString() != null) { addComponentType(NpcInfoType.NAME_NPCSTRINGID); } - if (npc.getTitleString() != null) { addComponentType(NpcInfoType.TITLE_NPCSTRINGID); } - if (_npc.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (!_abnormalVisualEffects.isEmpty() || npc.isInvisible()) { addComponentType(NpcInfoType.ABNORMALS); } - if (npc.getEnchantEffect() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (npc.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (npc.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (npc.getClanId() > 0) { final Clan clan = ClanTable.getInstance().getClan(npc.getClanId()); @@ -220,14 +195,11 @@ public class NpcInfo extends AbstractMaskPacket addComponentType(NpcInfoType.CLAN); } } - addComponentType(NpcInfoType.COLOR_EFFECT); - if (npc.getPvpFlag() > 0) { addComponentType(NpcInfoType.PVP_FLAG); } - // TODO: Confirm me if (npc.isInCombat()) { @@ -245,8 +217,7 @@ public class NpcInfo extends AbstractMaskPacket { _statusMask |= 0x08; } - - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -296,27 +267,23 @@ public class NpcInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO.writeId(packet); - packet.writeD(_npc.getObjectId()); - packet.writeC(_npc.isShowSummonAnimation() ? 0x02 : 0x00); // // 0=teleported 1=default 2=summoned + packet.writeC(_npc.isShowSummonAnimation() ? 2 : 0); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 0x01 : 0x00); + packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { String title = _npc.getTitle(); - // Localisation related. if ((_localisation != null) && !_localisation[1].equals("")) { @@ -329,10 +296,8 @@ public class NpcInfo extends AbstractMaskPacket title = title.replace(NpcData.getInstance().getTemplate(_npc.getId()).getTitle(), _localisation[1]); } } - packet.writeS(title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -351,7 +316,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -366,20 +331,20 @@ public class NpcInfo extends AbstractMaskPacket if (containsMask(NpcInfoType.EQUIPPED)) { packet.writeD(_npc.getRightHandItem()); - packet.writeD(0x00); // Armor id? + packet.writeD(0); // Armor id? packet.writeD(_npc.getLeftHandItem()); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_npc.isDead() ? 0x00 : 0x01); + packet.writeC(_npc.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); + packet.writeC(_npc.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 0x01 : _npc.isFlying() ? 0x02 : 0x00); + packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -391,7 +356,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_npc.isFlying() ? 0x01 : 0x00); + packet.writeD(_npc.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { @@ -427,12 +392,12 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(0x00); // 2 - do some animation on spawn + packet.writeC(0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -464,12 +429,10 @@ public class NpcInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java index c95a8e5274..923e9cebad 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class NpcInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_npc.getObjectId()); packet.writeD(_npc.getTransformationDisplayId()); - final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size()); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java index a294edc57a..2a0ba41eeb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java @@ -38,7 +38,6 @@ public class NpcQuestHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NPC_QUEST_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_questId); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java index d3328ade97..fc6d0d4a3a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java @@ -106,7 +106,6 @@ public class NpcSay implements IClientOutgoingPacket { _parameters = new ArrayList<>(); } - for (String item : params) { if ((item != null) && (item.length() > 0)) @@ -127,11 +126,9 @@ public class NpcSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_SAY.writeId(packet); - packet.writeD(_objectId); packet.writeD(_textType.getClientId()); packet.writeD(_npcId); - // Localisation related. if (_lang != null) { @@ -147,7 +144,6 @@ public class NpcSay implements IClientOutgoingPacket } } } - packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java index 356e3f48a9..ac61f9d247 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java @@ -33,11 +33,10 @@ public class ObservationMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_START.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me packet.writeD(0xc0); // TODO: Find me return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java index 5c0a0766b3..896ccea02b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java @@ -33,7 +33,6 @@ public class ObservationReturn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_END.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java index c2f7ab404f..173772c870 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java @@ -37,7 +37,6 @@ public class OnEventTrigger implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EVENT_TRIGGER.writeId(packet); - packet.writeD(_emitterId); packet.writeC(_enabled); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index fbb5c84dfe..37d4fea9cf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -45,7 +45,6 @@ public class PackageSendableList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java index a53f589386..e24d63f717 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java @@ -39,7 +39,6 @@ public class PackageToList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_TO_LIST.writeId(packet); - packet.writeD(_players.size()); for (Entry entry : _players.entrySet()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 655c7abcd1..44b23b37f4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -55,7 +55,6 @@ public class PartyMemberPosition implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); - packet.writeD(locations.size()); for (Entry entry : locations.entrySet()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java index 9e275ec246..c9d3595037 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java @@ -36,7 +36,6 @@ public class PartyRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java index b9c7d06769..8c97cac6b5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java @@ -36,12 +36,10 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ADD.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); // c3 packet.writeD(_party.getDistributionType().getId()); // c3 packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); - packet.writeD((int) _member.getCurrentCp()); // c4 packet.writeD(_member.getMaxCp()); // c4 packet.writeD((int) _member.getCurrentHp()); @@ -51,7 +49,7 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket packet.writeD(_member.getVitalityPoints()); packet.writeC(_member.getLevel()); packet.writeH(_member.getClassId().getId()); - packet.writeC(0x00); + packet.writeC(0); packet.writeH(_member.getRace().ordinal()); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java index 65d0c60c2e..5ad91f5463 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java @@ -37,21 +37,17 @@ public class PartySmallWindowAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ALL.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); packet.writeC(_party.getDistributionType().getId()); packet.writeC(_party.getMemberCount() - 1); - for (Player member : _party.getMembers()) { if ((member != null) && (member != _exclude)) { packet.writeD(member.getObjectId()); packet.writeS(member.getName()); - packet.writeD((int) member.getCurrentCp()); // c4 packet.writeD(member.getMaxCp()); // c4 - packet.writeD((int) member.getCurrentHp()); packet.writeD(member.getMaxHp()); packet.writeD((int) member.getCurrentMp()); @@ -59,7 +55,7 @@ public class PartySmallWindowAll implements IClientOutgoingPacket packet.writeD(member.getVitalityPoints()); packet.writeC(member.getLevel()); packet.writeH(member.getClassId().getId()); - packet.writeC(0x01); // Unk + packet.writeC(1); // Unk packet.writeH(member.getRace().ordinal()); final Summon pet = member.getPet(); packet.writeD(member.getServitors().size() + (pet != null ? 1 : 0)); // Summon size, one only atm diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java index 94a8a5a2ce..09ce132af4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java @@ -33,7 +33,6 @@ public class PartySmallWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_DELETE.writeId(packet); - packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java index c53c6c7779..e9ea2efbbe 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java @@ -42,7 +42,6 @@ public class PartySmallWindowUpdate extends AbstractMaskPacket _summon.getStat().getExp()) { packet.writeQ(_summon.getStat().getExp()); // 0% absolute value @@ -160,9 +148,7 @@ public class PetInfo implements IClientOutgoingPacket { packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value } - packet.writeQ(_summon.getExpForNextLevel()); // 100% absoulte value - packet.writeD(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight packet.writeD(_summon.getMaxLoad()); // max weight it can carry packet.writeD(_summon.getPAtk()); // patk @@ -178,25 +164,20 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD((int) _summon.getStat().getMoveSpeed()); // speed packet.writeD(_summon.getPAtkSpd()); // atkspeed packet.writeD(_summon.getMAtkSpd()); // casting speed - packet.writeC(0); // TODO: Check me, might be ride status packet.writeC(_summon.getTeam().getId()); // Confirmed packet.writeC(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed packet.writeC(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed - - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. - + packet.writeD(0); // TODO: Find me + packet.writeD(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. packet.writeC(_summon.getOwner().getSummonPoints()); // Used Summon Points packet.writeC(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points - final Set aves = _summon.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeH(aves.size()); // Confirmed for (AbnormalVisualEffect ave : aves) { packet.writeH(ave.getClientId()); // Confirmed } - packet.writeC(_statusMask); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 5b43daa74b..1f60ec39d1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -46,7 +46,6 @@ public class PetInventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.PET_INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index e4cf35779f..16dc83b7ed 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -35,7 +35,6 @@ public class PetItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java index fdb00ddbb1..913f65d470 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java @@ -38,7 +38,6 @@ public class PetStatusShow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_SHOW.writeId(packet); - packet.writeD(_summonType); packet.writeD(_summonObjectId); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 25c2c74292..823a8c405a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -52,7 +52,6 @@ public class PetStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_UPDATE.writeId(packet); - packet.writeD(_summon.getSummonType()); packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getX()); @@ -69,7 +68,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket packet.writeQ(_summon.getStat().getExp()); packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value packet.writeQ(_summon.getExpForNextLevel()); // 100% absolute value - packet.writeD(0x01); // TODO: Find me! + packet.writeD(1); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java index 4bc3570779..0898b01f67 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java @@ -63,7 +63,6 @@ public class PlaySound implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLAY_SOUND.writeId(packet); - packet.writeD(_unknown1); // unknown 0 for quest and ship; packet.writeS(_soundFile); packet.writeD(_unknown3); // unknown 0 for quest; 1 for ship; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java index fbe57d4aaf..5108fe7e1b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java @@ -44,7 +44,6 @@ public class PledgeCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java index aa11b1213e..6805f64d7c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java @@ -34,7 +34,6 @@ public class PledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_INFO.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getId()); packet.writeS(_clan.getName()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java index 72f2c71838..193ee17589 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java @@ -36,12 +36,10 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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 - // clan or subpledge name if (_member.getPledgeType() != 0) { @@ -51,7 +49,6 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket { packet.writeS(_member.getClan().getName()); } - packet.writeS(_member.getApprenticeOrSponsorName()); // name of this member's apprentice/sponsor return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java index eefd482979..6aa5067c8f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java @@ -36,7 +36,6 @@ public class PledgeReceivePowerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_POWER_INFO.writeId(packet); - packet.writeD(_member.getPowerGrade()); // power grade packet.writeS(_member.getName()); packet.writeD(_member.getClan().getRankPrivs(_member.getPowerGrade()).getBitmask()); // privileges diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 818c38a076..01f71eea17 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -40,8 +40,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_SUB_PLEDGE_CREATED.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); packet.writeD(_subPledge.getId()); packet.writeS(_subPledge.getName()); packet.writeS(getLeaderName()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java index 4d0efeb82a..7649947064 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java @@ -43,7 +43,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(packet); - packet.writeD(_tab); // page packet.writeD(_clanList.size()); for (ClanWar clanWar : _clanList) @@ -53,7 +52,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket { continue; } - packet.writeS(clan.getName()); packet.writeD(clanWar.getState().ordinal()); // type: 0 = Declaration, 1 = Blood Declaration, 2 = In War, 3 = Victory, 4 = Defeat, 5 = Tie, 6 = Error packet.writeD(clanWar.getRemainingTime()); // Time if friends to start remaining diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java index 2cbbdbf046..80d10fcb66 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java @@ -34,26 +34,25 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_INFO_UPDATE.writeId(packet); - // sending empty data so client will ask all the info in response ;) packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getLevel()); // clan level packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); // castle state ? + packet.writeD(0); // castle state ? packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); // clan reputation score - packet.writeD(0x00); // ? - packet.writeD(0x00); // ? + packet.writeD(0); // ? + packet.writeD(0); // ? packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); // c5 packet.writeD(_clan.getAllyCrestId()); // c5 packet.writeD(_clan.isAtWar() ? 1 : 0); // c5 - packet.writeD(0x00); // TODO: Find me! - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java index ae26e50dbb..2fa9f26d4a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java @@ -51,12 +51,11 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ADD.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); - packet.writeD(0x00); - packet.writeD(0x01); + packet.writeD(0); + packet.writeD(1); packet.writeD(_isOnline); // 1 = online 0 = offline packet.writeD(_pledgeType); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index c5ea7b284b..a1be315cf4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -41,7 +41,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket { _clan = clan; _pledge = pledge; - _pledgeId = _pledge == null ? 0x00 : _pledge.getId(); + _pledgeId = _pledge == null ? 0 : _pledge.getId(); _leaderName = pledge == null ? clan.getLeaderName() : CharNameTable.getInstance().getNameById(pledge.getLeaderId()); _name = pledge == null ? clan.getName() : pledge.getName(); _members = _clan.getMembers(); @@ -65,31 +65,28 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(packet); - - packet.writeD(_isSubPledge ? 0x00 : 0x01); + packet.writeD(_isSubPledge ? 0 : 1); packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_pledgeId); packet.writeS(_name); packet.writeS(_leaderName); - packet.writeD(_clan.getCrestId()); // crest id .. is used again packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); // 0 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(0); // 0 packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.isAtWar() ? 1 : 0); // new c3 - packet.writeD(0x00); // Territory castle ID + packet.writeD(0); // Territory castle ID packet.writeD(_clan.getSubPledgeMembersCount(_pledgeId)); - for (ClanMember m : _members) { if (m.getPledgeType() != _pledgeId) @@ -107,8 +104,8 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket } else { - packet.writeD(0x01); // no visible effect - packet.writeD(0x01); // packet.writeD(1); + packet.writeD(1); // no visible effect + packet.writeD(1); // packet.writeD(1); } packet.writeD(m.isOnline() ? m.getObjectId() : 0); // objectId = online 0 = offline packet.writeD(m.getSponsor() != 0 ? 1 : 0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java index 0fd387e419..154bcc610d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java @@ -32,7 +32,6 @@ public class PledgeShowMemberListDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_DELETE.writeId(packet); - packet.writeS(_player); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java index c61f412ed0..7b8c7c516b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java @@ -66,7 +66,6 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index 4e89797e45..09f70ea024 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -62,14 +62,14 @@ public class PledgeSkillList implements IClientOutgoingPacket { packet.writeD(sk.getDisplayId()); packet.writeH(sk.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } for (SubPledgeSkill sk : _subSkills) { packet.writeD(sk._subType); // Clan Sub-unit types packet.writeD(sk._skillId); packet.writeH(sk._skillLevel); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java index f3b8d4c26c..a94601294f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java @@ -37,7 +37,6 @@ public class PledgeSkillListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST_ADD.writeId(packet); - packet.writeD(_id); packet.writeD(_level); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java index 9e1b4843ac..5f32f2bf54 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java @@ -33,15 +33,14 @@ public class PledgeStatusChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_STATUS_CHANGED.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getLeaderId()); packet.writeD(_clan.getId()); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getAllyId()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.getCrestLargeId()); - packet.writeD(0x00); // pledge type ? + packet.writeD(0); // pledge type ? return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java index 5b56d0b28d..41d0f9f7d8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java @@ -44,12 +44,10 @@ public class PrivateStoreListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_LIST.writeId(packet); - packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); // Viewer's item count? + packet.writeD(0); // Viewer's item count? packet.writeD(_items.size()); - int slotNumber = 0; for (TradeItem item : _items) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 67b6ba8d94..d72050283e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -43,11 +43,10 @@ public class PrivateStoreListSell extends AbstractItemPacket else { OutgoingPackets.PRIVATE_STORE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index d05590cbde..df056c2e43 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -60,13 +60,13 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket { packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); + packet.writeD(0); for (Item item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item2 : _buyList) { writeItem(packet, item2); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index d8768104a4..6bbabb282b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -63,13 +63,13 @@ public class PrivateStoreManageListSell extends AbstractItemPacket packet.writeD(_objId); packet.writeD(_packageSale ? 1 : 0); packet.writeQ(_playerAdena); - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item2 : _sellList) { writeItem(packet, item2); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java index 8a5b9eef92..0d7bcbea16 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgBuy implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java index b00bd2add2..8fdb5701b8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgSell implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java index c3958367e8..5ddaa46ba0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java @@ -40,7 +40,6 @@ public class RadarControl implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RADAR_CONTROL.writeId(packet); - packet.writeD(_showRadar); packet.writeD(_type); // maybe type packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java index 3918894601..5d67413b6f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java @@ -43,10 +43,8 @@ public class RecipeBookItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_BOOK_ITEM_LIST.writeId(packet); - - packet.writeD(_isDwarvenCraft ? 0x00 : 0x01); // 0 = Dwarven - 1 = Common + packet.writeD(_isDwarvenCraft ? 0 : 1); // 0 = Dwarven - 1 = Common packet.writeD(_maxMp); - if (_recipes == null) { packet.writeD(0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 59ec218c84..9f460fe896 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -55,11 +55,10 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeD((int) _player.getCurrentMp()); packet.writeD(_player.getMaxMp()); packet.writeD(_success ? 1 : 0); // item creation success/failed - packet.writeC(0x00); - packet.writeQ(0x00); + packet.writeC(0); + packet.writeQ(0); return true; } - PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java index 4474a37c03..f4db5be9df 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java @@ -35,15 +35,14 @@ public class RecipeShopItemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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); - packet.writeQ(0x00); - packet.writeC(0x00); // Trigger offering window if 1 - packet.writeQ(0x00); + packet.writeQ(0); + packet.writeC(0); // Trigger offering window if 1 + packet.writeQ(0); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java index 75e45f5877..38b0b8ea4e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java @@ -43,7 +43,6 @@ public class RecipeShopManageList implements IClientOutgoingPacket { _recipes = _seller.getCommonRecipeBook(); } - if (_seller.hasManufactureShop()) { final Iterator it = _seller.getManufactureItems().values().iterator(); @@ -63,11 +62,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MANAGE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD((int) _seller.getAdena()); - packet.writeD(_isDwarven ? 0x00 : 0x01); - + packet.writeD(_isDwarven ? 0 : 1); if (_recipes == null) { packet.writeD(0); @@ -83,10 +80,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket packet.writeD(count); } } - if (!_seller.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -94,7 +90,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket for (ManufactureItem item : _seller.getManufactureItems().values()) { packet.writeD(item.getRecipeId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeQ(item.getCost()); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java index c025b5e4ed..2b9bc5b6e7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java @@ -33,7 +33,6 @@ public class RecipeShopMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MSG.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeS(_player.getStoreName()); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java index a243a18bfe..2d1965d17b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java @@ -36,14 +36,13 @@ public class RecipeShopSellList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_SELL_LIST.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD((int) _manufacturer.getCurrentMp()); // Creator's MP packet.writeD(_manufacturer.getMaxMp()); // Creator's MP packet.writeQ(_buyer.getAdena()); // Buyer Adena if (!_manufacturer.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -51,12 +50,11 @@ public class RecipeShopSellList implements IClientOutgoingPacket for (ManufactureItem temp : _manufacturer.getManufactureItems().values()) { packet.writeD(temp.getRecipeId()); - packet.writeD(0x00); // unknown + packet.writeD(0); // unknown packet.writeQ(temp.getCost()); - - packet.writeQ(0x00); // Classic - 166 - packet.writeQ(0x00); // Classic - 166 - packet.writeC(0x00); // Classic - 166 + packet.writeQ(0); // Classic - 166 + packet.writeQ(0); // Classic - 166 + packet.writeC(0); // Classic - 166 } } return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 74700e29b0..269e14d50b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -88,7 +88,6 @@ public class RelationChanged implements IClientOutgoingPacket { return; } - final Relation r = new Relation(); r._objId = activeChar.getObjectId(); r._relation = relation; @@ -102,7 +101,6 @@ public class RelationChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RELATION_CHANGED.writeId(packet); - packet.writeC(_mask); if (_multi == null) { @@ -122,7 +120,6 @@ public class RelationChanged implements IClientOutgoingPacket private void writeRelation(PacketWriter packet, Relation relation) { packet.writeD(relation._objId); - if ((_mask & SEND_DEFAULT) != SEND_DEFAULT) { packet.writeD(relation._relation); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java index b4e9dc25c5..4477cfb705 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java @@ -35,7 +35,6 @@ public class RequestEnchant implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java index 4ef15fb74c..7a0a6cbe58 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java @@ -33,7 +33,6 @@ public class Revive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.REVIVE.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java index 9c409601e3..b9ddf7733f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java @@ -42,7 +42,6 @@ public class Ride implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RIDE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_mounted); packet.writeD(_rideType); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 813ce03f4d..13ef62f55f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -49,11 +49,9 @@ public class SellListProcure implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SELL_LIST_PROCURE.writeId(packet); - packet.writeQ(_money); // money - packet.writeD(0x00); // lease ? + packet.writeD(0); // lease ? packet.writeH(_sellList.size()); // list size - for (Entry entry : _sellList.entrySet()) { final Item item = entry.getKey(); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java index baa37a8507..75b5b07854 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java @@ -39,12 +39,10 @@ public class SendMacroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MACRO_LIST.writeId(packet); - packet.writeC(_updateType.getId()); - packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0x00); // modified, created or deleted macro's id + packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0); // modified, created or deleted macro's id packet.writeC(_count); // count of Macros packet.writeC(_macro != null ? 1 : 0); // unknown - if ((_macro != null) && (_updateType != MacroUpdateType.DELETE)) { packet.writeD(_macro.getId()); // Macro ID @@ -52,9 +50,7 @@ public class SendMacroList implements IClientOutgoingPacket packet.writeS(_macro.getDescr()); // Desc packet.writeS(_macro.getAcronym()); // acronym packet.writeD(_macro.getIcon()); // icon - packet.writeC(_macro.getCommands().size()); // count - int i = 1; for (MacroCmd cmd : _macro.getCommands()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java index 47fada25be..21622b5f19 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java @@ -32,7 +32,6 @@ public class SendTradeRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_REQUEST.writeId(packet); - packet.writeD(_senderId); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java index 69aa749406..1513a0e3d1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java @@ -55,7 +55,6 @@ public class ServerObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SERVER_OBJECT_INFO.writeId(packet); - packet.writeD(_activeChar.getObjectId()); packet.writeD(_displayId + 1000000); packet.writeS(_name); // name @@ -70,8 +69,8 @@ public class ServerObjectInfo implements IClientOutgoingPacket packet.writeF(_collisionHeight); packet.writeD((int) (_isAttackable ? _activeChar.getCurrentHp() : 0)); packet.writeD(_isAttackable ? _activeChar.getMaxHp() : 0); - packet.writeD(0x01); // object type - packet.writeD(0x00); // special effects + packet.writeD(1); // object type + packet.writeD(0); // special effects return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java index 88b370ad8b..0164e5c4a2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java @@ -34,7 +34,6 @@ public class SetSummonRemainTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SET_SUMMON_REMAIN_TIME.writeId(packet); - packet.writeD(_maxTime); packet.writeD(_remainingTime); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java index db28b72acf..016f5a0c9a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java @@ -38,7 +38,6 @@ public class ShopPreviewInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_INFO.writeId(packet); - packet.writeD(Inventory.PAPERDOLL_TOTALSLOTS); // Slots packet.writeD(getFromList(Inventory.PAPERDOLL_UNDER)); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index df50db952f..a55186f551 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -51,11 +51,9 @@ public class ShopPreviewList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_LIST.writeId(packet); - packet.writeD(5056); packet.writeQ(_money); // current money packet.writeD(_listId); - int newlength = 0; for (Product product : _list) { @@ -65,23 +63,20 @@ public class ShopPreviewList implements IClientOutgoingPacket } } packet.writeH(newlength); - for (Product product : _list) { if ((product.getItem().getCrystalType().getLevel() <= _expertise) && product.getItem().isEquipable()) { packet.writeD(product.getItemId()); packet.writeH(product.getItem().getType2()); // item type2 - if (product.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { packet.writeQ(product.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } else { - packet.writeQ(0x00); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand + packet.writeQ(0); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } - packet.writeQ(Config.WEAR_PRICE); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 298301ed0d..b13080ff28 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -40,7 +40,6 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_BUFF_STATUS_UPDATE.writeId(packet); - packet.writeD(_skillId); packet.writeH(_skillLevel); packet.writeH(_skillSubLevel); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index c6a67fb97c..b8624ce4cd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -33,7 +33,6 @@ public class ShortCutInit implements IClientOutgoingPacket { return; } - _shortCuts = player.getAllShortCuts(); } @@ -41,24 +40,22 @@ public class ShortCutInit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); packet.writeD(sc.getSlot() + (sc.getPage() * 12)); - switch (sc.getType()) { case ITEM: { packet.writeD(sc.getId()); - packet.writeD(0x01); // Enabled or not + packet.writeD(1); // Enabled or not packet.writeD(sc.getSharedReuseGroup()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeQ(0x00); // Augment id - packet.writeD(0x00); // Visual id + packet.writeD(0); + packet.writeD(0); + packet.writeQ(0); // Augment id + packet.writeD(0); // Visual id break; } case SKILL: @@ -67,8 +64,8 @@ public class ShortCutInit implements IClientOutgoingPacket packet.writeH(sc.getLevel()); packet.writeH(sc.getSubLevel()); packet.writeD(sc.getSharedReuseGroup()); - packet.writeC(0x00); // C5 - packet.writeD(0x01); // C6 + packet.writeC(0); // C5 + packet.writeD(1); // C6 break; } case ACTION: @@ -77,7 +74,7 @@ public class ShortCutInit implements IClientOutgoingPacket case BOOKMARK: { packet.writeD(sc.getId()); - packet.writeD(0x01); // C6 + packet.writeD(1); // C6 } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java index 43d61af661..f099eab47e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java @@ -37,7 +37,6 @@ public class ShortCutRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_REGISTER.writeId(packet); - packet.writeD(_shortcut.getType().ordinal()); packet.writeD(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client switch (_shortcut.getType()) @@ -47,10 +46,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeD(_shortcut.getId()); packet.writeD(_shortcut.getCharacterType()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeD(0x00); // unknown - packet.writeD(0x00); // unknown - packet.writeD(0x00); // item augment id - packet.writeD(0x00); // TODO: Find me, item visual id ? + packet.writeD(0); // unknown + packet.writeD(0); // unknown + packet.writeD(0); // item augment id + packet.writeD(0); // TODO: Find me, item visual id ? break; } case SKILL: @@ -59,10 +58,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeH(_shortcut.getLevel()); packet.writeH(_shortcut.getSubLevel()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeC(0x00); // C5 + packet.writeC(0); // C5 packet.writeD(_shortcut.getCharacterType()); - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me + packet.writeD(0); // TODO: Find me break; } case ACTION: diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java index d6f71b5f70..cfae3b3fad 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java @@ -54,7 +54,6 @@ public class ShowBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - packet.writeC(_showBoard); // c4 1 to show community 00 to hide packet.writeS("bypass _bbshome"); // top packet.writeS("bypass _bbsgetfav"); // favorite diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java index 4b62a7001b..4d62e99d7a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java @@ -32,7 +32,6 @@ public class ShowCalculator implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_CALC.writeId(packet); - packet.writeD(_calculatorId); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java index 55f58d5375..4574762467 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java @@ -32,9 +32,8 @@ public class ShowMiniMap implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_MINIMAP.writeId(packet); - packet.writeD(_mapId); - packet.writeC(0x00); // Seven Signs state + packet.writeC(0); // Seven Signs state return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java index 303eab4e8a..97100d09d2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java @@ -34,7 +34,6 @@ public class ShowPCCafeCouponShowUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_PCCAFE_COUPON_SHOW_UI.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java index d86958e586..0a0f3ae861 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java @@ -35,7 +35,6 @@ public class ShowXMasSeal implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_XMAS_SEAL.writeId(packet); - packet.writeD(_item); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java index 66eccc7fbf..1baa030c4d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java @@ -28,9 +28,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = ca
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Attackers Clans?
* d = Number of Attackers Clans
* { //repeats
@@ -58,11 +58,10 @@ public class SiegeAttackerList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _castle.getSiege().getAttackerClans().size(); if (size > 0) { @@ -76,12 +75,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -90,8 +88,8 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index 5d5c831f14..8afd1f38ce 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -29,9 +29,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = 0xcb
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Defending Clans?
* d = Number of Defending Clans
* { //repeats
@@ -60,16 +60,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // Unknown - packet.writeD(0x01); // Unknown - packet.writeD(0x00); // Unknown - + packet.writeD(0); // Unknown + packet.writeD(1); // Unknown + packet.writeD(0); // Unknown final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0); packet.writeD(size); packet.writeD(size); - // Add owners final Clan ownerClan = _castle.getOwner(); if (ownerClan != null) @@ -78,14 +75,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket packet.writeS(ownerClan.getName()); packet.writeS(ownerClan.getLeaderName()); packet.writeD(ownerClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.OWNER.ordinal()); packet.writeD(ownerClan.getAllyId()); packet.writeS(ownerClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(ownerClan.getAllyCrestId()); } - // List of confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans()) { @@ -94,19 +90,17 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(defendingClan.getAllyCrestId()); } - // List of not confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans()) { @@ -115,12 +109,11 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER_PENDING.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 0a3fe46cb7..dfeefdaecf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -59,13 +59,11 @@ public class SiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_INFO.writeId(packet); - if (_castle != null) { packet.writeD(_castle.getResidenceId()); - final int ownerId = _castle.getOwnerId(); - packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 0x01 : 0x00); + packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0); packet.writeD(ownerId); if (ownerId > 0) { @@ -89,7 +87,6 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { @@ -97,7 +94,7 @@ public class SiegeInfo implements IClientOutgoingPacket cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis()); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(Config.SIEGE_HOUR_LIST.size()); for (int hour : Config.SIEGE_HOUR_LIST) { @@ -108,7 +105,7 @@ public class SiegeInfo implements IClientOutgoingPacket else { packet.writeD((int) (_castle.getSiegeDate().getTimeInMillis() / 1000)); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index d11b3817c0..3c4c475339 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -51,12 +51,11 @@ public class SkillCoolTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SKILL_COOL_TIME.writeId(packet); - packet.writeD(_skillReuseTimeStamps.size()); for (TimeStamp ts : _skillReuseTimeStamps) { packet.writeD(ts.getSkillId()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD((int) ts.getReuse() / 1000); packet.writeD((int) Math.max(ts.getStamp() - _currentTime, 0) / 1000); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index de54232b51..ed4615c403 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -41,10 +41,9 @@ public class Snoop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SNOOP.writeId(packet); - packet.writeD(_convoId); packet.writeS(_name); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_type.getClientId()); packet.writeS(_speaker); packet.writeS(_msg); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java index 37827bdf6c..52f15519a5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java @@ -37,10 +37,9 @@ public class SocialAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SOCIAL_ACTION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_actionId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index fd7e43a153..19066f5f85 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -33,16 +33,15 @@ public class SpawnItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPAWN_ITEM.writeId(packet); - packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeD(_item.isStackable() ? 0x01 : 0x00); + packet.writeD(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java index ccae75b850..04f3ad716c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java @@ -110,7 +110,6 @@ public class SpecialCamera implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPECIAL_CAMERA.writeId(packet); - packet.writeD(_id); packet.writeD(_force); packet.writeD(_angle1); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java index cdd3821740..281756e793 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java @@ -34,7 +34,6 @@ public class StartPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_PLEDGE_WAR.writeId(packet); - packet.writeS(_playerName); packet.writeS(_pledgeName); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java index 48b4238eea..27fb4f606b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java @@ -38,7 +38,6 @@ public class StartRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_side); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java index b4f421df36..067bdeb082 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java @@ -72,7 +72,6 @@ public class StaticObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATIC_OBJECT.writeId(packet); - packet.writeD(_staticObjectId); packet.writeD(_objectId); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index 928b54aa48..40836e4af8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -46,7 +46,6 @@ public class StatusUpdate implements IClientOutgoingPacket public void addUpdate(StatusUpdateType type, int level) { _updates.put(type, level); - if (_isPlayable) { switch (type) @@ -75,10 +74,9 @@ public class StatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATUS_UPDATE.writeId(packet); - packet.writeD(_objectId); // casterId - packet.writeD(_isVisible ? _casterObjectId : 0x00); - packet.writeC(_isVisible ? 0x01 : 0x00); + packet.writeD(_isVisible ? _casterObjectId : 0); + packet.writeC(_isVisible ? 1 : 0); packet.writeC(_updates.size()); for (Entry entry : _updates.entrySet()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java index 9919307366..cf2b71df5a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java @@ -53,7 +53,6 @@ public class StopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java index 50fdc3fe4c..78fdb5d70c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java @@ -43,7 +43,6 @@ public class StopMoveInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java index 9c828c3962..b254cad8b1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java @@ -34,7 +34,6 @@ public class StopPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java index b0392de226..ca69cd5346 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java @@ -36,7 +36,6 @@ public class StopRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FINISH_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_speed); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index c1feb37b2f..2d92796c75 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -43,10 +43,8 @@ public class SummonInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class SummonInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class SummonInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,11 +154,9 @@ public class SummonInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - // Show red aura? - // if (_statusMask != 0) + // if (_statusMask != 0x00) // { // addComponentType(NpcInfoType.VISUAL_STATE); // } @@ -229,28 +206,24 @@ public class SummonInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.SUMMON_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -269,7 +242,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -285,19 +258,19 @@ public class SummonInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -309,20 +282,20 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -346,12 +319,12 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -381,12 +354,10 @@ public class SummonInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java index 864462f76f..6f88551204 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java @@ -34,7 +34,6 @@ public class SurrenderPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SURRENDER_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 55902e07e1..bbd7706dbe 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -162,7 +162,6 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } - _params[_paramIndex++] = param; } @@ -268,7 +267,6 @@ public class SystemMessage implements IClientOutgoingPacket { return addString(item.getName()); } - append(new SMParam(TYPE_ITEM_NAME, id)); return this; } @@ -396,7 +394,6 @@ public class SystemMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SYSTEM_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -409,13 +406,12 @@ public class SystemMessage implements IClientOutgoingPacket params[i] = _params[i].getValue(); } packet.writeH(SystemMessageId.S1_2.getId()); - packet.writeC(0x01); + packet.writeC(1); packet.writeC(TYPE_TEXT); packet.writeS(sml.getLocalisation(params)); return true; } } - packet.writeH(getId()); packet.writeC(_params.length); for (SMParam param : _params) @@ -425,9 +421,7 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } - packet.writeC(param.getType()); - switch (param.getType()) { case TYPE_ELEMENT_NAME: diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java index a91da07e77..d357efbb0e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java @@ -47,13 +47,12 @@ public class TargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_SELECTED.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java index 3dadd249f6..3d7208c06f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java @@ -42,12 +42,11 @@ public class TargetUnselected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_UNSELECTED.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index 943b5078b6..13f9b9565a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -41,14 +41,13 @@ public class TeleportToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TELEPORT_TO_LOCATION.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // Fade 0, Instant 1. + packet.writeD(0); // Fade 0, Instant 1. packet.writeD(_heading); - packet.writeD(0x00); // Unknown. + packet.writeD(0); // Unknown. return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java index cb82f2da59..8d09576d9d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java @@ -32,7 +32,6 @@ public class TradeDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_DONE.writeId(packet); - packet.writeD(_num); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java index 716ed2a099..6a94d2463f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java @@ -41,9 +41,9 @@ public class TradeOtherAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java index 3d0ef0b501..7907f3d498 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java @@ -41,9 +41,9 @@ public class TradeOwnAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c59568bf1d..3822108c5a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -58,7 +58,6 @@ public class TradeStart extends AbstractItemPacket { _mask |= 0x08; } - // Does not shows level if (_partner.isGM()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java index f8e2a191de..e5ec2376cc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java @@ -44,10 +44,10 @@ public class TradeUpdate extends AbstractItemPacket { OutgoingPackets.TRADE_UPDATE.writeId(packet); packet.writeC(_sendType); - packet.writeD(0x01); + packet.writeD(1); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2); writeItem(packet, _item, _count); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java index c7102ca385..728020c0b1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java @@ -32,7 +32,6 @@ public class TutorialEnableClientEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_ENABLE_CLIENT_EVENT.writeId(packet); - packet.writeD(_eventId); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java index 92ac75afcf..7cc33a0f80 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java @@ -48,7 +48,6 @@ public class TutorialShowHtml extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_HTML.writeId(packet); - packet.writeD(_type); packet.writeS(getHtml()); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java index 75a57be38b..2ee62835db 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java @@ -37,7 +37,6 @@ public class TutorialShowQuestionMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_QUESTION_MARK.writeId(packet); - packet.writeC(_markType); packet.writeD(_markId); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index efea6902e3..e6ab8f9305 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class UserInfo extends AbstractMaskPacket { private Player _player; - private int _relation; private int _runSpd; private int _walkSpd; @@ -47,14 +46,12 @@ public class UserInfo extends AbstractMaskPacket private int _enchantLevel; private int _armorEnchant; private String _title; - private final byte[] _masks = new byte[] { (byte) 0x00, (byte) 0x00, (byte) 0x00 }; - private int _initSize = 5; public UserInfo(Player player) @@ -78,6 +75,7 @@ public class UserInfo extends AbstractMaskPacket _enchantLevel = player.getInventory().getWeaponEnchant(); _armorEnchant = player.getInventory().getArmorMinEnchant(); _title = player.getTitle(); + if (player.isGM() && player.isInvisible()) { _title = "[Invisible]"; @@ -133,29 +131,25 @@ public class UserInfo extends AbstractMaskPacket } OutgoingPackets.USER_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_initSize); packet.writeH(24); packet.writeB(_masks); - if (containsMask(UserInfoType.RELATION)) { packet.writeD(_relation); } - if (containsMask(UserInfoType.BASIC_INFO)) { packet.writeH(16 + (_player.getAppearance().getVisibleName().length() * 2)); packet.writeString(_player.getName()); - packet.writeC(_player.isGM() ? 0x01 : 0x00); + packet.writeC(_player.isGM() ? 1 : 0); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } - if (containsMask(UserInfoType.BASE_STATS)) { packet.writeH(18); @@ -165,10 +159,9 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getINT()); packet.writeH(_player.getWIT()); packet.writeH(_player.getMEN()); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); } - if (containsMask(UserInfoType.MAX_HPCPMP)) { packet.writeH(14); @@ -176,7 +169,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMaxMp()); packet.writeD(_player.getMaxCp()); } - if (containsMask(UserInfoType.CURRENT_HPMPCP_EXP_SP)) { packet.writeH(38); @@ -187,32 +179,28 @@ public class UserInfo extends AbstractMaskPacket packet.writeQ(_player.getExp()); packet.writeF((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel()))); } - if (containsMask(UserInfoType.ENCHANTLEVEL)) { packet.writeH(4); packet.writeC(_enchantLevel); packet.writeC(_armorEnchant); } - if (containsMask(UserInfoType.APPAREANCE)) { packet.writeH(15); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); } - if (containsMask(UserInfoType.STATUS)) { packet.writeH(6); packet.writeC(_player.getMountType().ordinal()); packet.writeC(_player.getPrivateStoreType().getId()); packet.writeC(_player.hasDwarvenCraft() || (_player.getSkillLevel(248) > 0) ? 1 : 0); - packet.writeC(0x00); + packet.writeC(0); } - if (containsMask(UserInfoType.STATS)) { packet.writeH(56); @@ -231,18 +219,16 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); } - if (containsMask(UserInfoType.ELEMENTALS)) { packet.writeH(14); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); } - if (containsMask(UserInfoType.POSITION)) { packet.writeH(18); @@ -251,7 +237,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getZ()); packet.writeD(_player.isInVehicle() ? _player.getVehicle().getObjectId() : 0); } - if (containsMask(UserInfoType.SPEED)) { packet.writeH(18); @@ -264,28 +249,24 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_flyRunSpd); packet.writeH(_flyWalkSpd); } - if (containsMask(UserInfoType.MULTIPLIER)) { packet.writeH(18); packet.writeF(_moveMultiplier); packet.writeF(_player.getAttackSpeedMultiplier()); } - if (containsMask(UserInfoType.COL_RADIUS_HEIGHT)) { packet.writeH(18); packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); } - if (containsMask(UserInfoType.ATK_ELEMENTAL)) { packet.writeH(5); - packet.writeC(0x00); - packet.writeH(0x00); + packet.writeC(0); + packet.writeH(0); } - if (containsMask(UserInfoType.CLAN)) { packet.writeH(32 + (_title.length() * 2)); @@ -295,12 +276,11 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getClanCrestLargeId()); packet.writeD(_player.getClanCrestId()); packet.writeD(_player.getClanPrivileges().getBitmask()); - packet.writeC(_player.isClanLeader() ? 0x01 : 0x00); + packet.writeC(_player.isClanLeader() ? 1 : 0); packet.writeD(_player.getAllyId()); packet.writeD(_player.getAllyCrestId()); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); } - if (containsMask(UserInfoType.SOCIAL)) { packet.writeH(22); @@ -314,69 +294,61 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); } - if (containsMask(UserInfoType.VITA_FAME)) { packet.writeH(15); packet.writeD(_player.getVitalityPoints()); - packet.writeC(0x00); // Vita Bonus + packet.writeC(0); // Vita Bonus packet.writeD(_player.getFame()); packet.writeD(_player.getRaidbossPoints()); } - if (containsMask(UserInfoType.SLOTS)) { packet.writeH(12); // 152 packet.writeC(_player.getInventory().getTalismanSlots()); packet.writeC(_player.getInventory().getBroochJewelSlots()); packet.writeC(_player.getTeam().getId()); - packet.writeD(0x00); - + packet.writeD(0); if (_player.getInventory().getAgathionSlots() > 0) { - packet.writeC(0x01); // Charm slots + packet.writeC(1); // Charm slots packet.writeC(_player.getInventory().getAgathionSlots() - 1); packet.writeC(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152 } else { - packet.writeC(0x00); // Charm slots - packet.writeC(0x00); + packet.writeC(0); // Charm slots + packet.writeC(0); packet.writeC(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152 } } - if (containsMask(UserInfoType.MOVEMENTS)) { packet.writeH(4); packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); - packet.writeC(_player.isRunning() ? 0x01 : 0x00); + packet.writeC(_player.isRunning() ? 1 : 0); } - if (containsMask(UserInfoType.COLOR)) { packet.writeH(10); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); } - if (containsMask(UserInfoType.INVENTORY_LIMIT)) { packet.writeH(9); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); packet.writeH(_player.getInventoryLimit()); packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); } - if (containsMask(UserInfoType.TRUE_HERO)) { packet.writeH(9); - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeC(_player.isTrueHero() ? 100 : 0x00); + packet.writeD(0); + packet.writeH(0); + packet.writeC(_player.isTrueHero() ? 100 : 0); } - if (containsMask(UserInfoType.ATT_SPIRITS)) // 152 { packet.writeH(26); @@ -387,7 +359,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD((int) _player.getEarthSpiritDefense()); packet.writeD(_player.getActiveElementalSpiritType()); } - return true; } @@ -404,7 +375,6 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x10; // Party leader } } - if (clan != null) { relation |= 0x20; // Clan member @@ -413,12 +383,10 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x40; // Clan leader } } - if (player.isInSiege()) { relation |= 0x80; // In siege } - return relation; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java index 283bcf1614..90c416726a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java @@ -36,7 +36,6 @@ public class ValidateLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java index 4d8f9683d0..83f72bf981 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java @@ -40,7 +40,6 @@ public class ValidateLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java index b684e70bdc..71367cd26d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java @@ -36,7 +36,6 @@ public class VehicleCheckLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_CHECK_LOCATION.writeId(packet); - packet.writeD(_boat.getObjectId()); packet.writeD(_boat.getX()); packet.writeD(_boat.getY()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java index a4a5780f30..5b565c08b7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java @@ -46,7 +46,6 @@ public class VehicleDeparture implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_DEPARTURE.writeId(packet); - packet.writeD(_objId); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java index ec611028bf..4a995a6352 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java @@ -44,7 +44,6 @@ public class VehicleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java index 207a6fd899..bf629dcbbc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java @@ -42,7 +42,6 @@ public class VehicleStarted implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_START.writeId(packet); - packet.writeD(_objectId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 35ca986d35..5eb9eb7ab9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -30,6 +30,7 @@ public class WareHouseDepositList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; public static final int FREIGHT = 1; + private final int _sendType; private final long _playerAdena; private final List _items = new ArrayList<>(); @@ -49,7 +50,6 @@ public class WareHouseDepositList extends AbstractItemPacket _sendType = sendType; _whType = type; _playerAdena = player.getAdena(); - final boolean isPrivate = _whType == PRIVATE; for (Item temp : player.getInventory().getAvailableItems(true, isPrivate, false)) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 7af1cd273c..5ece99310a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -32,6 +32,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private final int _sendType; private Player _player; private long _playerAdena; @@ -60,7 +61,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } - _items = _player.getActiveWarehouse().getItems(); for (Item item : _items) { @@ -78,15 +78,15 @@ public class WareHouseWithdrawalList extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeH(0x00); + packet.writeH(0); packet.writeD(_invSize); packet.writeD(_items.size()); for (Item item : _items) { writeItem(packet, item); packet.writeD(item.getObjectId()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } else diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java index 5f2dd05f3b..aea1476fb2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java @@ -35,8 +35,7 @@ public class ExDivideAdenaCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_CANCEL.writeId(packet); - - packet.writeC(0x00); // TODO: Find me + packet.writeC(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java index 6af912cebf..de4e955aba 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java @@ -46,9 +46,8 @@ public class ExDivideAdenaDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_DONE.writeId(packet); - - packet.writeC(_isPartyLeader ? 0x01 : 0x00); - packet.writeC(_isCCLeader ? 0x01 : 0x00); + packet.writeC(_isPartyLeader ? 1 : 0); + packet.writeC(_isCCLeader ? 1 : 0); packet.writeD(_memberCount); packet.writeQ(_distributedAdenaCount); packet.writeQ(_adenaCount); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index 549def456e..84b5fead76 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -43,7 +43,6 @@ public class ExChooseShapeShiftingItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_SHAPE_SHIFTING_ITEM.writeId(packet); - packet.writeD(_targetType != null ? _targetType.ordinal() : 0); packet.writeD(_type != null ? _type.ordinal() : 0); packet.writeD(_itemId); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java index 33fb439aa5..ba55887a1a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java @@ -45,7 +45,6 @@ public class ExCuriousHouseMemberUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_UPDATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_maxHp); packet.writeD(_maxCp); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java index 8ad3659725..be2d29d864 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPacket { - public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0x00); - public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(0x01); + public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0); + public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(1); private final int _result; @@ -39,7 +39,6 @@ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPa public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_EXTRACTION_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java index ec82cc14f3..e84d7a7255 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; public static final ExPutShapeShiftingTargetItemResult FAILED = new ExPutShapeShiftingTargetItemResult(RESULT_FAILED, 0); @@ -43,7 +43,6 @@ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_resultId); packet.writeQ(_price); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java index f4d3118cc4..038eae0042 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExShapeShiftingResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; - public static final int RESULT_CLOSE = 0x02; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; + public static final int RESULT_CLOSE = 2; public static final ExShapeShiftingResult FAILED = new ExShapeShiftingResult(RESULT_FAILED, 0, 0); public static final ExShapeShiftingResult CLOSE = new ExShapeShiftingResult(RESULT_CLOSE, 0, 0); @@ -47,7 +47,6 @@ public class ExShapeShiftingResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHAPE_SHIFTING_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_targetItemId); packet.writeD(_extractItemId); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java index eaf0d209fd..4b48b09002 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java @@ -38,7 +38,7 @@ public class ExConfirmVipAttendanceCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CONFIRM_VIP_ATTENDANCE_CHECK.writeId(packet); - packet.writeC(_available ? 0x01 : 0x00); // can receive reward today? 1 else 0 + packet.writeC(_available ? 1 : 0); // can receive reward today? 1 else 0 packet.writeC(_index); // active reward index packet.writeD(0); packet.writeD(0); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java index 9d61fe68d6..dd94df023f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java @@ -45,10 +45,10 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket OutgoingPackets.EX_VIP_ATTENDANCE_ITEM_LIST.writeId(packet); packet.writeC(_available ? _index + 1 : _index); // index to receive? packet.writeC(_index); // last received index? - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeC(0x01); - packet.writeC(_available ? 0x01 : 0x00); // player can receive reward today? + packet.writeD(0); + packet.writeD(0); + packet.writeC(1); + packet.writeC(_available ? 1 : 0); // player can receive reward today? packet.writeC(250); packet.writeC(AttendanceRewardData.getInstance().getRewardsCount()); // reward size int rewardCounter = 0; @@ -57,11 +57,11 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket rewardCounter++; packet.writeD(reward.getId()); packet.writeQ(reward.getCount()); - packet.writeC(0x01); // is unknown? - packet.writeC((rewardCounter % 7) == 0 ? 0x01 : 0x00); // is last in row? + packet.writeC(1); // is unknown? + packet.writeC((rewardCounter % 7) == 0 ? 1 : 0); // is last in row? } - packet.writeC(0x00); - packet.writeD(0x00); + packet.writeC(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java index 4c3ae253ea..c79b68becc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java @@ -39,7 +39,6 @@ public class ExResponseCommissionBuyInfo extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_INFO.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java index ddfa8b6db1..c1d29735b8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java @@ -40,7 +40,6 @@ public class ExResponseCommissionBuyItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_ITEM.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java index aa4bbbde24..01e4782408 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java @@ -39,7 +39,6 @@ public class ExResponseCommissionDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_DELETE.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java index e7e3c39816..b915574175 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java @@ -55,7 +55,6 @@ public class ExResponseCommissionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_INFO.writeId(packet); - packet.writeD(_result); packet.writeD(_itemId); packet.writeQ(_presetPricePerUnit); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java index 4963393b42..a012b3ab30 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java @@ -64,7 +64,6 @@ public class ExResponseCommissionList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_LIST.writeId(packet); - packet.writeD(_replyType.getClientId()); switch (_replyType) { @@ -73,13 +72,11 @@ public class ExResponseCommissionList extends AbstractItemPacket { packet.writeD((int) Instant.now().getEpochSecond()); packet.writeD(_chunkId); - int chunkSize = _items.size() - _listIndexStart; if (chunkSize > MAX_CHUNK_SIZE) { chunkSize = MAX_CHUNK_SIZE; } - packet.writeD(chunkSize); for (int i = _listIndexStart; i < (_listIndexStart + chunkSize); i++) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java index b1b0a97d7a..183547af06 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java @@ -39,7 +39,6 @@ public class ExResponseCommissionRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_REGISTER.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java index 74d8a95587..b68386e4ed 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java @@ -35,8 +35,7 @@ public class ExShowCommission implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_COMMISSION.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java index 0c267ecf34..11b1ff1e0a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExEnchantFail implements IClientOutgoingPacket { public static final ExEnchantFail STATIC_PACKET = new ExEnchantFail(0, 0); + private final int _itemOne; private final int _itemTwo; @@ -39,7 +40,6 @@ public class ExEnchantFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_FAIL.writeId(packet); - packet.writeD(_itemOne); packet.writeD(_itemTwo); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java index 71ba811ed5..87d29a8e7c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java @@ -36,7 +36,6 @@ public class ExEnchantSucess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SUCESS.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java index eb4eb8b26c..ec67d50fb6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java @@ -39,7 +39,6 @@ public class ExGetCrystalizingEstimation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - packet.writeD(_items.size()); for (ItemChanceHolder holder : _items) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java index ac16c14f5b..ebf5b64751 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java @@ -43,18 +43,18 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket } OutgoingPackets.EX_CONNECTED_TIME_AND_GETTABLE_REWARD.writeId(packet); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_oneDayRewardAvailableCount); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index 8667d9144f..57acfedd38 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -62,7 +62,6 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket } OutgoingPackets.EX_ONE_DAY_RECEIVE_REWARD_LIST.writeId(packet); - packet.writeD(_dayRemainTime); packet.writeD(_weekRemainTime); packet.writeD(_monthRemainTime); @@ -75,7 +74,7 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket packet.writeH(reward.getId()); final int status = reward.getStatus(_player); packet.writeC(status); - packet.writeC(reward.getRequiredCompletions() > 1 ? 0x01 : 0x00); + packet.writeC(reward.getRequiredCompletions() > 1 ? 1 : 0); packet.writeD(reward.getParams().getInt("level", -1) == -1 ? (status == 1 ? 0 : reward.getProgress(_player)) : _player.getLevel()); packet.writeD(reward.getRequiredCompletions()); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java index f0d1fb0d65..03c8bc9b68 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java @@ -43,9 +43,7 @@ abstract class AbstractElementalSpiritPacket implements IClientOutgoingPacket packet.writeD(spirit.getMaxCharacteristics()); packet.writeD(spirit.getMaxCharacteristics()); packet.writeD(spirit.getMaxCharacteristics()); - packet.writeC(1); // unk - for (int j = 0; j < 1; j++) { packet.writeH(2); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java index 3a53a42a95..53c6d5b3e9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java @@ -45,16 +45,14 @@ public class ElementalSpiritAbsorbInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_ABSORB_INFO.writeId(packet); - final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type)); if (spirit == null) { - packet.writeC(0x00); - packet.writeC(0x00); + packet.writeC(0); + packet.writeC(0); return true; } - - packet.writeC(0x01); + packet.writeC(1); packet.writeC(_type); packet.writeC(spirit.getStage()); packet.writeQ(spirit.getExperience()); @@ -62,7 +60,6 @@ public class ElementalSpiritAbsorbInfo implements IClientOutgoingPacket packet.writeQ(spirit.getExperienceToNextLevel()); // MaxExp packet.writeD(spirit.getLevel()); packet.writeD(spirit.getMaxLevel()); - final List absorbItems = spirit.getAbsorbItems(); packet.writeD(absorbItems.size()); // AbsorbCount for (ElementalSpiritAbsorbItemHolder absorbItem : absorbItems) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java index 430c43f891..7012b8a7a2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java @@ -44,7 +44,6 @@ public class ElementalSpiritEvolutionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_EVOLUTION_INFO.writeId(packet); - final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type)); if (spirit == null) { @@ -52,13 +51,11 @@ public class ElementalSpiritEvolutionInfo implements IClientOutgoingPacket packet.writeD(0); return true; } - packet.writeC(_type); packet.writeD(spirit.getNpcId()); - packet.writeD(0x01); // unk + packet.writeD(1); // unk packet.writeD(spirit.getStage()); packet.writeF(100); // chance ?? - final List items = spirit.getItemsToEvolve(); packet.writeD(items.size()); for (ItemHolder item : items) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java index c14deecea5..e6adc10453 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java @@ -41,7 +41,6 @@ public class ElementalSpiritExtractInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_EXTRACT_INFO.writeId(packet); - final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type)); if (spirit == null) { @@ -49,15 +48,12 @@ public class ElementalSpiritExtractInfo implements IClientOutgoingPacket packet.writeC(0); return true; } - packet.writeC(_type); // active elemental spirit packet.writeC(1); // is extract ? - packet.writeC(1); // cost count // for each cost count packet.writeD(57); // item id packet.writeD(1000000); // item count - packet.writeD(spirit.getExtractItem()); packet.writeD(spirit.getExtractAmount()); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java index 15fa123db6..ba363bf243 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java @@ -41,7 +41,6 @@ public class ElementalSpiritInfo extends AbstractElementalSpiritPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_INFO.writeId(packet); - final ElementalSpirit[] spirits = _player.getSpirits(); if (spirits == null) { @@ -50,20 +49,16 @@ public class ElementalSpiritInfo extends AbstractElementalSpiritPacket packet.writeC(0); return true; } - packet.writeC(_type); // show spirit info window 1; Change type 2; Only update 0 packet.writeC(_spiritType); - packet.writeC(spirits.length); // spirit count - for (ElementalSpirit spirit : spirits) { packet.writeC(spirit.getType()); - packet.writeC(0x01); // spirit active ? + packet.writeC(1); // spirit active ? // if active writeSpiritInfo(packet, spirit); } - packet.writeD(1); // Reset talent items count for (int j = 0; j < 1; j++) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java index bc05ef3212..66488267d4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java @@ -38,7 +38,6 @@ public class ExElementalSpiritGetExp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_GET_EXP.writeId(packet); - packet.writeC(_type); packet.writeQ(_experience); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java index 7f380efe99..8f5cfd3c98 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java @@ -41,7 +41,6 @@ public abstract class UpdateElementalSpiritPacket extends AbstractElementalSpiri { packet.writeC(_update ? 1 : 0); packet.writeC(_type); - if (_update) { final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type)); @@ -49,7 +48,6 @@ public abstract class UpdateElementalSpiritPacket extends AbstractElementalSpiri { return; } - packet.writeC(_type); writeSpiritInfo(packet, spirit); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java index 23b770e406..ebe77fa654 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java @@ -29,7 +29,7 @@ public class ExShowUpgradeSystem extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_UPGRADE_SYSTEM.writeId(packet); - packet.writeH(0x01); + packet.writeH(1); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java index fa605b548a..a99ad7f4e3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java @@ -52,7 +52,7 @@ public class ExFishingStart implements IClientOutgoingPacket packet.writeD(_baitLocation.getX()); packet.writeD(_baitLocation.getY()); packet.writeD(_baitLocation.getZ()); - packet.writeC(0x01); // 0 = newbie, 1 = normal, 2 = night + packet.writeC(1); // 0 = newbie, 1 = normal, 2 = night return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java index 046ad04cb6..74501fe7ff 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java @@ -49,7 +49,6 @@ public class ExUserInfoFishing implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_FISHING.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_isFishing ? 1 : 0); if (_baitLocation == null) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index dc0e3e05bc..336a384bcc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -47,9 +47,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FRIEND_DETAIL_INFO.writeId(packet); - packet.writeD(_objectId); - if (_friend == null) { packet.writeS(_name); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java index 0d4bb47ff0..a90b7b6083 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java @@ -33,8 +33,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x00); + packet.writeC(0); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java index 9add9c9caa..d24139644c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java @@ -49,7 +49,6 @@ public class FriendAddRequestResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_charId); packet.writeS(_charName); @@ -57,7 +56,7 @@ public class FriendAddRequestResult implements IClientOutgoingPacket packet.writeD(_charObjectId); packet.writeD(_charLevel); packet.writeD(_charClassId); - packet.writeH(0x00); // Always 0 on retail + packet.writeH(0); // Always 0 on retail return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java index a135944662..13a7d01967 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java @@ -86,12 +86,10 @@ public class FriendList implements IClientOutgoingPacket } continue; } - if (player1.isOnline()) { online = true; } - classid = player1.getClassId().getId(); level = player1.getLevel(); _info.add(new FriendInfo(objId, name, online, classid, level)); @@ -102,14 +100,13 @@ public class FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._classid); packet.writeD(info._level); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java index 07c23f9fd2..1bb4142e34 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java @@ -38,7 +38,6 @@ public class FriendRemove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_REMOVE.writeId(packet); - packet.writeD(_responce); packet.writeS(_charName); return true; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java index e8dbddcd63..a3990c0879 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java @@ -52,7 +52,6 @@ public class FriendStatus implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_STATUS.writeId(packet); - packet.writeD(_type); packet.writeS(_name); switch (_type) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java index 8752104e06..78da5850b8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java @@ -50,7 +50,6 @@ public class L2Friend implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND.writeId(packet); - packet.writeD(_action ? 1 : 3); // 1-add 3-remove packet.writeD(_objid); packet.writeS(_name); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java index b69a253635..e50693cb11 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java @@ -81,17 +81,16 @@ public class L2FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._level); packet.writeD(info._classId); - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java index 677c09091f..706c179a9c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java @@ -37,7 +37,6 @@ public class ExMentorAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_ADD.writeId(packet); - packet.writeS(_mentor.getName()); packet.writeD(_mentor.getActiveClass()); packet.writeD(_mentor.getLevel()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java index 4722a9cab3..18c1cdeedf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java @@ -64,9 +64,8 @@ public class ExMentorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_LIST.writeId(packet); - packet.writeD(_type); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mentees.size()); for (Mentee mentee : _mentees) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java index d739dd94b7..2283920b98 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ListMenteeWaiting implements IClientOutgoingPacket { private static final int PLAYERS_PER_PAGE = 64; + private final List _possibleCandiates = new ArrayList<>(); private final int _page; @@ -51,18 +52,15 @@ public class ListMenteeWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_MENTEE_WAITING.writeId(packet); - - packet.writeD(0x01); // always 1 in retail + packet.writeD(1); // always 1 in retail if (_possibleCandiates.isEmpty()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } - packet.writeD(_possibleCandiates.size()); packet.writeD(_possibleCandiates.size() % PLAYERS_PER_PAGE); - for (Player player : _possibleCandiates) { if ((1 <= (PLAYERS_PER_PAGE * _page)) && (1 > (PLAYERS_PER_PAGE * (_page - 1)))) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java index fd8875aedd..c5a96dd099 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java @@ -34,12 +34,12 @@ public class ExPledgeBonusList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_BONUS_LIST.writeId(packet); - packet.writeC(0x00); // 140 + packet.writeC(0); // 140 ClanRewardData.getInstance().getClanRewardBonuses(ClanRewardType.MEMBERS_ONLINE).stream().sorted(Comparator.comparingInt(ClanRewardBonus::getLevel)).forEach(bonus -> { packet.writeD(bonus.getSkillReward().getSkillId()); }); - packet.writeC(0x01); // 140 + packet.writeC(1); // 140 ClanRewardData.getInstance().getClanRewardBonuses(ClanRewardType.HUNTING_MONSTERS).stream().sorted(Comparator.comparingInt(ClanRewardBonus::getLevel)).forEach(bonus -> { packet.writeD(bonus.getItemReward().getId()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java index 81fd4fe6aa..ac4f03e25c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java @@ -50,7 +50,6 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Player: " + _player + " attempting to write to a null clan!"); return false; } - final ClanRewardBonus highestMembersOnlineBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.MEMBERS_ONLINE); final ClanRewardBonus highestHuntingBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.HUNTING_MONSTERS); final ClanRewardBonus membersOnlineBonus = ClanRewardType.MEMBERS_ONLINE.getAvailableBonus(clan); @@ -75,25 +74,22 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Couldn't find item reward for highest available hunting bonus!!"); return false; } - // General OP Code OutgoingPackets.EX_PLEDGE_BONUS_OPEN.writeId(packet); - // Members online bonus packet.writeD(highestMembersOnlineBonus.getRequiredAmount()); packet.writeD(clan.getMaxOnlineMembers()); - packet.writeC(0x00); // 140 - packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0x00); - packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 0x01 : 0x00); - + packet.writeC(0); // 140 + packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0); + packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 1 : 0); // Hunting bonus packet.writeD(highestHuntingBonus.getRequiredAmount()); packet.writeD(clan.getHuntingPoints()); - packet.writeC(0x00); // 140 - packet.writeD(huntingBonus != null ? highestHuntingBonus.getItemReward().getId() : 0x00); - packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 0x01 : 0x00); + packet.writeC(0); // 140 + packet.writeD(huntingBonus != null ? highestHuntingBonus.getItemReward().getId() : 0); + packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index fb735b8925..e75426e598 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -69,7 +69,6 @@ public class ExBRBuyProduct implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUY_PRODUCT.writeId(packet); - packet.writeD(_reply); return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java index 742b3eba9d..91a186b81d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java @@ -39,10 +39,9 @@ public class ExBRGamePoint implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_GAME_POINT.writeId(packet); - packet.writeD(_charId); packet.writeQ(_charPoints); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java index 50f21df46a..e36f2ff502 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java @@ -45,7 +45,6 @@ public class ExBRProductInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_INFO.writeId(packet); - packet.writeD(_item.getBrId()); packet.writeD(_item.getPrice()); packet.writeD(_item.getItems().size()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java index dc851ffd43..0f042ba043 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java @@ -45,9 +45,8 @@ public class ExBRProductList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); // Adena - packet.writeQ(0x00); // Hero coins + packet.writeQ(0); // Hero coins packet.writeC(_type); // Type 0 - Home, 1 - History, 2 - Favorites packet.writeD(_primeList.size()); for (PrimeShopGroup brItem : _primeList) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java index b23e9fa8a9..f4406c1407 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java @@ -38,7 +38,6 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RAID_BOSS_SPAWN_INFO.writeId(packet); - packet.writeD(_bossIds.size()); // alive count for (int id : _bossIds) // alive ids { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java index 2463589c81..c09b3e899d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java @@ -47,18 +47,15 @@ public class ExFlyMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_mapId); - packet.writeD(_locations.size()); for (SayuneEntry loc : _locations) { packet.writeD(loc.getId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(loc.getX()); packet.writeD(loc.getY()); packet.writeD(loc.getZ()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java index 03fc6b580d..70b3fb25d2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java @@ -47,16 +47,13 @@ public class ExFlyMoveBroadcast implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE_BROADCAST.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); packet.writeD(_mapId); - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD(_currentLoc.getX()); packet.writeD(_currentLoc.getY()); packet.writeD(_currentLoc.getZ()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java index cfe11a27e0..49e5d86910 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java @@ -35,7 +35,6 @@ public class ExNotifyFlyMoveStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_FLY_MOVE_START.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java index d5640a47ef..0efa37ae8c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java @@ -51,7 +51,6 @@ public class ExMoveToLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_SUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_targetX); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java index 0cbe2c3e02..a0314c39aa 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java @@ -46,7 +46,6 @@ public class ExShuttleGetOff implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_OFF.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java index 5211bef5ba..061bcafed9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java @@ -43,7 +43,6 @@ public class ExShuttleGetOn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_ON.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java index 97d54a9019..c8aee1fde7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java @@ -43,7 +43,6 @@ public class ExShuttleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHUTTLE_INFO.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD(_shuttle.getX()); packet.writeD(_shuttle.getY()); @@ -60,8 +59,8 @@ public class ExShuttleInfo implements IClientOutgoingPacket packet.writeD(loc.getY()); packet.writeD(loc.getZ()); } - packet.writeD(stop.isDoorOpen() ? 0x01 : 0x00); - packet.writeD(stop.hasDoorChanged() ? 0x01 : 0x00); + packet.writeD(stop.isDoorOpen() ? 1 : 0); + packet.writeD(stop.hasDoorChanged() ? 1 : 0); } return true; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java index 6ba38f29a1..28b33b998e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java @@ -43,7 +43,6 @@ public class ExShuttleMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_MOVE.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD((int) _shuttle.getStat().getMoveSpeed()); packet.writeD((int) _shuttle.getStat().getRotationSpeed()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java index bf2b6ea6eb..6c31189d6a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java @@ -44,7 +44,6 @@ public class ExStopMoveInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_SHUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java index f7f6849732..8492f42a6e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java @@ -44,7 +44,6 @@ public class ExValidateLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_SHUTTLE.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipProductList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipProductList.java index e2ced450b3..562f88d22b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipProductList.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipProductList.java @@ -45,13 +45,11 @@ public class ReceiveVipProductList implements IClientOutgoingPacket } final Collection products = PrimeShopData.getInstance().getPrimeItems().values(); final PrimeShopGroup gift = PrimeShopData.getInstance().getVipGiftOfTier(_player.getVipTier()); - OutgoingPackets.RECIVE_VIP_PRODUCT_LIST.writeId(packet); packet.writeQ(_player.getAdena()); packet.writeQ(_player.getGoldCoin()); // Gold Coin Amount packet.writeQ(_player.getSilverCoin()); // Silver Coin Amount packet.writeC(1); // Show Reward tab - if (gift != null) { packet.writeD(products.size() + 1); @@ -61,7 +59,6 @@ public class ReceiveVipProductList implements IClientOutgoingPacket { packet.writeD(products.size()); } - for (PrimeShopGroup product : products) { writeProduct(product, packet); @@ -79,7 +76,6 @@ public class ReceiveVipProductList implements IClientOutgoingPacket buffer.writeC(product.getPanelType()); // NEW - 6; HOT - 5 ... Unk buffer.writeC(product.getVipTier()); buffer.writeC(10); - buffer.writeC(product.getItems().size()); for (PrimeShopItem item : product.getItems()) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java index 1d59c6d002..e7654ed911 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java @@ -60,7 +60,7 @@ public class AccountKicked implements IOutgoingPacket { OutgoingPackets.ACCOUNT_KICKED.writeId(packet); packet.writeD(_reason.getCode()); - return true; } } + diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 2e3a1f6163..1fe813e393 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: response + * Format: d d: response */ public class GGAuth implements IOutgoingPacket { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/network/serverpackets/Init.java index 4b3f71f30e..d725f45ca2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/network/serverpackets/Init.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/network/serverpackets/Init.java @@ -52,7 +52,6 @@ public class Init implements IOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.INIT.writeId(packet); - packet.writeD(_sessionId); // session id packet.writeD(0x0000c621); // protocol revision diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index 8c534554a8..f4dcd22b00 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: the failure reason + * Format: d d: the failure reason */ public class LoginFail implements IOutgoingPacket { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/BaseRecievePacket.java index c682cb741d..a6ed15ce32 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/BaseRecievePacket.java @@ -73,7 +73,7 @@ public abstract class BaseRecievePacket try { result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE); - result = result.substring(0, result.indexOf(0x00)); + result = result.substring(0, result.indexOf(0)); _off += (result.length() * 2) + 2; } catch (Exception e) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/BaseSendablePacket.java index a9d918de4c..8fa8491cbf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/network/BaseSendablePacket.java @@ -117,16 +117,16 @@ public abstract class BaseSendablePacket public byte[] getBytes() { // if (this instanceof Init) - // writeD(0x00); // reserve for XOR initial key + // writeD(0); // reserve for XOR initial key - writeD(0x00); // reserve for checksum + writeD(0); // reserve for checksum final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++) { - writeC(0x00); + writeC(0); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/AttackType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/AttackType.java index 6064b10ed7..e9983f15e3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/AttackType.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/AttackType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum AttackType { - MISSED(0x01), - BLOCKED(0x02), - CRITICAL(0x04), - SHOT_USED(0x08); + MISSED(1), + BLOCKED(2), + CRITICAL(4), + SHOT_USED(8); private final int _mask; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/GroupType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/GroupType.java index 954aaace8b..916a14fd05 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/GroupType.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/GroupType.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum GroupType implements IUpdateTypeComponent { - NONE(0x01), - PARTY(0x02), - COMMAND_CHANNEL(0x04); + NONE(1), + PARTY(2), + COMMAND_CHANNEL(4); private int _mask; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/ItemListType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/ItemListType.java index 2d38c8f5b1..c80234439f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/ItemListType.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/ItemListType.java @@ -23,11 +23,11 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum ItemListType implements IUpdateTypeComponent { - AUGMENT_BONUS(0x01), - ELEMENTAL_ATTRIBUTE(0x02), - ENCHANT_EFFECT(0x04), - VISUAL_ID(0x08), - SOUL_CRYSTAL(0x10); + AUGMENT_BONUS(1), + ELEMENTAL_ATTRIBUTE(2), + ENCHANT_EFFECT(4), + VISUAL_ID(8), + SOUL_CRYSTAL(16); private final int _mask; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java index b3d08596c6..29403b783d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum MacroUpdateType { - ADD(0x01), - LIST(0x01), - MODIFY(0x02), - DELETE(0x00); + ADD(1), + LIST(1), + MODIFY(2), + DELETE(0); private final int _id; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java index 86c6159869..7776721c0f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java @@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum PartySmallWindowUpdateType implements IUpdateTypeComponent { - CURRENT_CP(0x01), - MAX_CP(0x02), - CURRENT_HP(0x04), - MAX_HP(0x08), - CURRENT_MP(0x10), - MAX_MP(0x20), - LEVEL(0x40), - CLASS_ID(0x80), - PARTY_SUBSTITUTE(0x100), - VITALITY_POINTS(0x200); + CURRENT_CP(1), + MAX_CP(2), + CURRENT_HP(4), + MAX_HP(8), + CURRENT_MP(16), + MAX_MP(32), + LEVEL(64), + CLASS_ID(128), + PARTY_SUBSTITUTE(256), + VITALITY_POINTS(512); private final int _mask; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 00bb331778..667ce7f17c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.Broadcast; import org.l2jmobius.gameserver.util.Util; /** - * Fromat:(ch) dddddc + * Format:(ch) dddddc * @author -Wooden- */ public class RequestExMagicSkillUseGround implements IClientIncomingPacket diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java index 8744393432..033095e74d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java @@ -39,7 +39,6 @@ public class AbnormalStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ABNORMAL_STATUS_UPDATE.writeId(packet); - packet.writeH(_effects.size()); for (BuffInfo info : _effects) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 1b8ddb2042..bec794bef3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -44,7 +44,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; } @@ -60,7 +59,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; setHtml(html); } @@ -77,13 +75,11 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } - if (!html.contains(""; return; } - _html = html; } @@ -96,7 +92,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } - setHtml(content); return true; } @@ -138,12 +133,10 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { player.clearHtmlActions(getScope()); } - if (_disabledValidation) { return; } - if (player != null) { Util.buildHtmlActionCache(player, getScope(), _npcObjId, _html); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index e9cd6a88b8..b99d4d3348 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -86,8 +86,8 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket= 0) || (item.getAttributeDefence(AttributeType.FIRE) > 0) || (item.getAttributeDefence(AttributeType.WATER) > 0) || (item.getAttributeDefence(AttributeType.WIND) > 0) || (item.getAttributeDefence(AttributeType.EARTH) > 0) || (item.getAttributeDefence(AttributeType.HOLY) > 0) || (item.getAttributeDefence(AttributeType.DARK) > 0)) { mask |= ItemListType.ELEMENTAL_ATTRIBUTE.getMask(); } - if (item.getEnchantOptions() != null) { for (int id : item.getEnchantOptions()) @@ -184,17 +182,14 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket 0) { mask |= ItemListType.VISUAL_ID.getMask(); } - if (((item.getSoulCrystalOptions() != null) && !item.getSoulCrystalOptions().isEmpty()) || ((item.getSoulCrystalSpecialOptions() != null) && !item.getSoulCrystalSpecialOptions().isEmpty())) { mask |= ItemListType.SOUL_CRYSTAL.getMask(); } - return mask; } @@ -262,7 +257,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); packet.writeC(removeSkills.size()); for (Skill removed : removeSkills) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java index 8fa6259f64..6451dffd02 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ActionFailed implements IClientOutgoingPacket { public static final ActionFailed STATIC_PACKET = new ActionFailed(); - private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); + private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); static { for (SkillCastingType castingType : SkillCastingType.values()) @@ -57,7 +57,6 @@ public class ActionFailed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ACTION_FAIL.writeId(packet); - packet.writeD(_castingType); // MagicSkillUse castingType return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java index 6e868368c9..30ce58da60 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java @@ -44,9 +44,8 @@ public class AgitDecoInfo implements IClientOutgoingPacket { continue; } - packet.writeC(_residense.hasFunction(type) ? 0x01 : 0x00); + packet.writeC(_residense.hasFunction(type) ? 1 : 0); } - // Unknown packet.writeD(0); // TODO: Find me! packet.writeD(0); // TODO: Find me! diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java index 6cb71fc985..4683fb30f0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java @@ -44,7 +44,6 @@ public class AllianceInfo implements IClientOutgoingPacket _name = leader.getAllyName(); _leaderC = leader.getName(); _leaderP = leader.getLeaderName(); - final Collection allies = ClanTable.getInstance().getClanAllies(allianceId); _allies = new ClanInfo[allies.size()]; int idx = 0; @@ -57,7 +56,6 @@ public class AllianceInfo implements IClientOutgoingPacket total += ci.getTotal(); online += ci.getOnline(); } - _total = total; _online = online; } @@ -66,18 +64,16 @@ public class AllianceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_INFO.writeId(packet); - packet.writeS(_name); packet.writeD(_total); packet.writeD(_online); packet.writeS(_leaderC); packet.writeS(_leaderP); - packet.writeD(_allies.length); for (ClanInfo aci : _allies) { packet.writeS(aci.getClan().getName()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(aci.getClan().getLevel()); packet.writeS(aci.getClan().getLeaderName()); packet.writeD(aci.getTotal()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java index f9d08f6600..186fd12e81 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java @@ -44,7 +44,6 @@ public class AllyCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java index 6218f1717f..1ae4653f91 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java @@ -38,7 +38,6 @@ public class AskJoinAlly implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_ALLIANCE.writeId(packet); - packet.writeD(_requestorObjId); packet.writeS(null); // Ally Name ? packet.writeS(null); // TODO: Find me! diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java index a66bb3cd33..b9cfbe81b9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java @@ -39,7 +39,6 @@ public class AskJoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_PARTY.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 05c420ff59..227ab571be 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -45,7 +45,6 @@ public class Attack implements IClientOutgoingPacket _attackerObjId = attacker.getObjectId(); _attackerLoc = new Location(attacker); _targetLoc = new Location(target); - final Player player = attacker.getActingPlayer(); if (player == null) { @@ -111,7 +110,6 @@ public class Attack implements IClientOutgoingPacket final Iterator it = _hits.iterator(); final Hit firstHit = it.next(); OutgoingPackets.ATTACK.writeId(packet); - packet.writeD(_attackerObjId); packet.writeD(firstHit.getTargetId()); packet.writeD(_soulshotVisualSubstitute); // Ertheia @@ -121,13 +119,11 @@ public class Attack implements IClientOutgoingPacket packet.writeD(_attackerLoc.getX()); packet.writeD(_attackerLoc.getY()); packet.writeD(_attackerLoc.getZ()); - packet.writeH(_hits.size() - 1); while (it.hasNext()) { writeHit(packet, it.next()); } - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java index bd6878eb42..8b85fe85e3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java @@ -35,7 +35,6 @@ public class AutoAttackStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_START.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java index e767d1877a..a294b1e212 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java @@ -35,7 +35,6 @@ public class AutoAttackStop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_STOP.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java index 3f329415df..0c79677eae 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java @@ -38,7 +38,6 @@ public class BlockListPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BLOCK_LIST.writeId(packet); - packet.writeD(_playersId.size()); for (int playerId : _playersId) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index f610cdc6aa..d95f0543b9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -45,8 +45,7 @@ public class BuyList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x00); // Type BUY + packet.writeD(0); // Type BUY packet.writeQ(_money); // current money packet.writeD(_listId); packet.writeD(_inventorySlots); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index cd25af908d..7cb2bf4425 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -50,36 +50,34 @@ public class BuyListSeed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BUY_LIST_SEED.writeId(packet); - packet.writeQ(_money); // current money - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeD(_manorId); // manor id - if (!_list.isEmpty()) { packet.writeH(_list.size()); // list length for (SeedProduction s : _list) { - packet.writeC(0x00); // mask item 0 to print minimal item information + packet.writeC(0); // mask item 0 to print minimal item information packet.writeD(s.getId()); // ObjectId packet.writeD(s.getId()); // ItemId packet.writeC(0xFF); // T1 packet.writeQ(s.getAmount()); // Quantity - packet.writeC(0x05); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item - packet.writeC(0x00); // Filler (always 0) - packet.writeH(0x00); // Equipped : 00-No, 01-yes - packet.writeQ(0x00); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand - packet.writeH(0x00); // Enchant level (pet level shown in control item) + packet.writeC(5); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item + packet.writeC(0); // Filler (always 0) + packet.writeH(0); // Equipped : 00-No, 01-yes + packet.writeQ(0); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand + packet.writeH(0); // Enchant level (pet level shown in control item) packet.writeD(-1); packet.writeD(-9999); - packet.writeC(0x01); // GOD Item enabled = 1 disabled (red) = 0 + packet.writeC(1); // GOD Item enabled = 1 disabled (red) = 0 packet.writeQ(s.getPrice()); // price } _list.clear(); } else { - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java index 3a7b67af23..f3dc872dca 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java @@ -32,8 +32,7 @@ public class CSShowComBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - - packet.writeC(0x01); // c4 1 to show community 00 to hide + packet.writeC(1); // c4 1 to show community 00 to hide packet.writeB(_html); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java index eacc27aa07..b18dac4cc3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java @@ -36,7 +36,6 @@ public class CameraMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CAMERA_MODE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java index 1682f5bc62..adea754676 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java @@ -39,7 +39,6 @@ public class ChairSit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAIR_SIT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_staticObjectId); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java index 2bc31a285a..de141fa067 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java @@ -38,7 +38,6 @@ public class ChangeMoveType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_MOVE_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_running ? RUN : WALK); packet.writeD(0); // c2 diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index 73277d923d..fbe5e39e2e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -22,17 +22,17 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ChangeWaitType implements IClientOutgoingPacket { + public static final int WT_SITTING = 0; + public static final int WT_STANDING = 1; + public static final int WT_START_FAKEDEATH = 2; + public static final int WT_STOP_FAKEDEATH = 3; + private final int _objectId; private final int _moveType; private final int _x; private final int _y; private final int _z; - public static final int WT_SITTING = 0; - public static final int WT_STANDING = 1; - public static final int WT_START_FAKEDEATH = 2; - public static final int WT_STOP_FAKEDEATH = 3; - public ChangeWaitType(Creature creature, int newMoveType) { _objectId = creature.getObjectId(); @@ -46,7 +46,6 @@ public class ChangeWaitType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_WAIT_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_moveType); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index 41180bac50..aa2e7b2eaa 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -30,7 +30,6 @@ public class CharCreateFail implements IClientOutgoingPacket public static final int REASON_CREATE_NOT_ALLOWED = 0x05; // "Characters cannot be created from this server." public static final int REASON_CHOOSE_ANOTHER_SVR = 0x06; // "Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please // choose another server." - private final int _error; public CharCreateFail(int errorCode) @@ -42,7 +41,6 @@ public class CharCreateFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index f0e99885ad..768617e558 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -31,8 +31,7 @@ public class CharCreateOk implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_SUCCESS.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index bed289ca0a..1674eef343 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -33,7 +33,6 @@ public class CharDeleteFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_DELETE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 7632f16d7b..d7ed7babe0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -34,6 +34,22 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { + private static final int[] PAPERDOLL_ORDER = new int[] + { + Inventory.PAPERDOLL_UNDER, + Inventory.PAPERDOLL_HEAD, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_LHAND, + Inventory.PAPERDOLL_GLOVES, + Inventory.PAPERDOLL_CHEST, + Inventory.PAPERDOLL_LEGS, + Inventory.PAPERDOLL_FEET, + Inventory.PAPERDOLL_CLOAK, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_HAIR, + Inventory.PAPERDOLL_HAIR2 + }; + private final Player _player; private final Clan _clan; private int _objId; @@ -56,22 +72,6 @@ public class CharInfo implements IClientOutgoingPacket private int _vehicleId = 0; private final boolean _gmSeeInvis; - private static final int[] PAPERDOLL_ORDER = new int[] - { - Inventory.PAPERDOLL_UNDER, - Inventory.PAPERDOLL_HEAD, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_LHAND, - Inventory.PAPERDOLL_GLOVES, - Inventory.PAPERDOLL_CHEST, - Inventory.PAPERDOLL_LEGS, - Inventory.PAPERDOLL_FEET, - Inventory.PAPERDOLL_CLOAK, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_HAIR, - Inventory.PAPERDOLL_HAIR2 - }; - public CharInfo(Player player, boolean gmSeeInvis) { _player = player; @@ -120,17 +120,15 @@ public class CharInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); // Confirmed packet.writeD(_y); // Confirmed packet.writeD(_z); // Confirmed packet.writeD(_vehicleId); // Confirmed packet.writeD(_objId); // Confirmed packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed - packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) @@ -154,10 +152,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.getPvpFlag()); packet.writeD(_player.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -168,53 +164,40 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); - packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeS(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle()); - packet.writeD(_player.getAppearance().getVisibleClanId()); packet.writeD(_player.getAppearance().getVisibleClanCrestId()); packet.writeD(_player.getAppearance().getVisibleAllyId()); packet.writeD(_player.getAppearance().getVisibleAllyCrestId()); - - packet.writeC(_player.isSitting() ? 0x00 : 0x01); // Confirmed - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // Confirmed - packet.writeC(_player.isInCombat() ? 0x01 : 0x00); // Confirmed - - packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 0x01 : 0x00); // Confirmed - - packet.writeC(_player.isInvisible() ? 0x01 : 0x00); - + packet.writeC(_player.isSitting() ? 0 : 1); // Confirmed + packet.writeC(_player.isRunning() ? 1 : 0); // Confirmed + packet.writeC(_player.isInCombat() ? 1 : 0); // Confirmed + packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 1 : 0); // Confirmed + packet.writeC(_player.isInvisible() ? 1 : 0); packet.writeC(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount packet.writeC(_player.getPrivateStoreType().getId()); // Confirmed packet.writeH(_player.getCubics().size()); // Confirmed _player.getCubics().keySet().forEach(packet::writeH); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); // Confirmed packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); packet.writeH(_player.getRecomHave()); // Confirmed packet.writeD(_player.getMountNpcId() == 0 ? 0 : _player.getMountNpcId() + 1000000); - packet.writeD(_player.getClassId().getId()); // Confirmed - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeC(_player.isMounted() ? 0 : _enchantLevel); // Confirmed - packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeD(_player.getClanCrestLargeId()); packet.writeC(_player.isNoble() ? 1 : 0); // Confirmed packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 2 : 0); // 152 - Value for enabled changed to 2? packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed - final ILocational baitLocation = _player.getFishing().getBaitLocation(); if (baitLocation != null) { @@ -230,29 +213,21 @@ public class CharInfo implements IClientOutgoingPacket } packet.writeD(_player.getAppearance().getNameColor()); // Confirmed - packet.writeD(_heading); // Confirmed - packet.writeC(_player.getPledgeClass()); packet.writeH(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); // Confirmed - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - - packet.writeC(0x00); // nPvPRestrainStatus - + packet.writeC(0); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentHp())); // Confirmed packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - - packet.writeC(0x00); // cBRLectureMark + packet.writeC(0); // cBRLectureMark final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed @@ -264,14 +239,15 @@ public class CharInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } + packet.writeC(_player.isTrueHero() ? 100 : 0); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); // Hair accessory + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); // Hair accessory packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points + packet.writeD(0); + packet.writeD(0); - packet.writeD(0x00); - packet.writeD(0x00); + // Rank. packet.writeC(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : 0); - return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 7187b73184..11f5f4df52 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -40,17 +40,16 @@ public class CharSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTED.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getTitle()); packet.writeD(_sessionId); packet.writeD(_player.getClanId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x01); // active ?? + packet.writeD(1); // active ?? packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -62,25 +61,20 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_player.getReputation()); packet.writeD(_player.getPkKills()); packet.writeD(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_player.getClassId().getId()); - packet.writeB(new byte[16]); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeB(new byte[28]); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 9590634dc2..bf6e2d3b99 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -44,10 +44,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { private static final Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); - private final String _loginName; - private final int _sessionId; - private int _activeId; - private final List _characterPackages; private static final int[] PAPERDOLL_ORDER = new int[] { @@ -112,7 +108,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_ARTIFACT20, // 152 Inventory.PAPERDOLL_ARTIFACT21 // 152 }; - private static final int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, @@ -126,6 +121,11 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_HAIR2, }; + private final String _loginName; + private final int _sessionId; + private int _activeId; + private final List _characterPackages; + /** * Constructor for CharSelectionInfo. * @param loginName @@ -156,17 +156,14 @@ public class CharSelectionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.size(); packet.writeD(size); // Created character count - packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) - packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 0x01 : 0x00); // if 1 can't create new char - packet.writeC(0x01); // 0=can't play, 1=can play free until level 85, 2=100% free play - packet.writeD(0x02); // if 1, Korean client - packet.writeC(0x00); // Gift message for inactive accounts // 152 - packet.writeC(0x00); // Balthus Knights, if 1 suggests premium account - + packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 1 : 0); // if 1 can't create new char + packet.writeC(1); // 0=can't play, 1=can play free until level 85, 2=100% free play + packet.writeD(2); // if 1, Korean client + packet.writeC(0); // Gift message for inactive accounts // 152 + packet.writeC(0); // Balthus Knights, if 1 suggests premium account long lastAccess = 0; if (_activeId == -1) { @@ -179,7 +176,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - for (int i = 0; i < size; i++) { final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); @@ -187,90 +183,73 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name packet.writeD(_sessionId); // Account ID - packet.writeD(0x00); // Clan ID - packet.writeD(0x00); // Builder level - + packet.writeD(0); // Clan ID + packet.writeD(0); // Builder level packet.writeD(charInfoPackage.getSex()); // Sex packet.writeD(charInfoPackage.getRace()); // Race packet.writeD(charInfoPackage.getBaseClassId()); - - packet.writeD(0x01); // GameServerName - + packet.writeD(1); // GameServerName packet.writeD(charInfoPackage.getX()); packet.writeD(charInfoPackage.getY()); packet.writeD(charInfoPackage.getZ()); packet.writeF(charInfoPackage.getCurrentHp()); packet.writeF(charInfoPackage.getCurrentMp()); - packet.writeQ(charInfoPackage.getSp()); packet.writeQ(charInfoPackage.getExp()); packet.writeF((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel()))); // High // Five packet.writeD(charInfoPackage.getLevel()); - packet.writeD(charInfoPackage.getReputation()); packet.writeD(charInfoPackage.getPkKills()); packet.writeD(charInfoPackage.getPvPKills()); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); // Ertheia - packet.writeD(0x00); // Ertheia - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); // Ertheia + packet.writeD(0); // Ertheia for (int slot : getPaperdollOrder()) { packet.writeD(charInfoPackage.getPaperdollItemId(slot)); } - for (int slot : getPaperdollOrderVisualId()) { packet.writeD(charInfoPackage.getPaperdollItemVisualId(slot)); } - packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_CHEST)); // Upper Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_LEGS)); // Lower Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_HEAD)); // Headgear enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_GLOVES)); // Gloves enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_FEET)); // Boots enchant level - packet.writeD(charInfoPackage.getHairStyle()); packet.writeD(charInfoPackage.getHairColor()); packet.writeD(charInfoPackage.getFace()); - packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); - packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption1Id() : 0); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption2Id() : 0); - // packet.writeD(charInfoPackage.getTransformId()); // Used to display Transformations - packet.writeD(0x00); // Currently on retail when you are on character select you don't see your transformation. - - packet.writeD(0x00); // Pet NpcId - packet.writeD(0x00); // Pet level - packet.writeD(0x00); // Pet Food - packet.writeD(0x00); // Pet Food Level - packet.writeF(0x00); // Current pet HP - packet.writeF(0x00); // Current pet MP - + packet.writeD(0); // Currently on retail when you are on character select you don't see your transformation. + packet.writeD(0); // Pet NpcId + packet.writeD(0); // Pet level + packet.writeD(0); // Pet Food + packet.writeD(0); // Pet Food Level + packet.writeF(0); // Current pet HP + packet.writeF(0); // Current pet MP packet.writeD(charInfoPackage.getVitalityPoints()); // Vitality packet.writeD((int) Config.RATE_VITALITY_EXP_MULTIPLIER * 100); // Vitality Percent packet.writeD(charInfoPackage.getVitalityItemsUsed()); // Remaining vitality item uses - packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0x00 : 0x01); // Char is active or not - packet.writeC(charInfoPackage.isNoble() ? 0x01 : 0x00); - packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 0x02 : 0x00); // Hero glow - packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 0x01 : 0x00); // Show hair accessory if enabled + packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0 : 1); // Char is active or not + packet.writeC(charInfoPackage.isNoble() ? 1 : 0); + packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 2 : 0); // Hero glow + packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 1 : 0); // Show hair accessory if enabled } return true; } @@ -279,7 +258,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); - try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate")) { @@ -292,7 +270,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (charInfopackage != null) { characterList.add(charInfopackage); - final Player player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { @@ -306,7 +283,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return characterList; } @@ -348,7 +324,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { clan.removeClanMember(objectId, 0); } - GameClient.deleteCharByObjId(objectId); return null; } @@ -367,20 +342,16 @@ public class CharSelectionInfo implements IClientOutgoingPacket charInfopackage.setHairStyle(chardata.getInt("hairstyle")); charInfopackage.setHairColor(chardata.getInt("haircolor")); charInfopackage.setSex(chardata.getInt("sex")); - charInfopackage.setExp(chardata.getLong("exp")); charInfopackage.setSp(chardata.getLong("sp")); charInfopackage.setVitalityPoints(chardata.getInt("vitality_points")); charInfopackage.setClanId(chardata.getInt("clanid")); - charInfopackage.setRace(chardata.getInt("race")); - final int baseClassId = chardata.getInt("base_class"); final int activeClassId = chardata.getInt("classid"); charInfopackage.setX(chardata.getInt("x")); charInfopackage.setY(chardata.getInt("y")); charInfopackage.setZ(chardata.getInt("z")); - final int faction = chardata.getInt("faction"); if (faction == 1) { @@ -390,7 +361,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setEvil(); } - if (Config.MULTILANG_ENABLE) { String lang = chardata.getString("language"); @@ -400,22 +370,18 @@ public class CharSelectionInfo implements IClientOutgoingPacket } charInfopackage.setHtmlPrefix("data/lang/" + lang + "/"); } - // if is in subclass, load subclass exp, sp, level info if (baseClassId != activeClassId) { loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId); } - charInfopackage.setClassId(activeClassId); - // Get the augmentation id for equipped weapon int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); if (weaponObjId < 1) { weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); } - if (weaponObjId > 0) { try (Connection con = DatabaseFactory.getConnection(); @@ -441,7 +407,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } - // Check if the base class is set to zero and also doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly. if ((baseClassId == 0) && (activeClassId > 0)) { @@ -451,7 +416,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setBaseClassId(baseClassId); } - charInfopackage.setDeleteTimer(deletetime); charInfopackage.setLastAccess(chardata.getLong("lastAccess")); charInfopackage.setNoble(chardata.getInt("nobless") == 1); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java index 847e24db87..d59df7911a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java @@ -32,7 +32,6 @@ public class ChooseInventoryItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHOOSE_INVENTORY_ITEM.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java index 12a3940521..ac66c2fa0f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java @@ -32,7 +32,6 @@ public class ClientSetTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CLIENT_SET_TIME.writeId(packet); - packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // time in client minutes packet.writeD(6); // constant to match the server time( this determines the speed of the client clock) return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java index 43732f74fa..66a1f5e20d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java @@ -68,7 +68,6 @@ public class ConfirmDlg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CONFIRM_DLG.writeId(packet); - final SMParam[] params = _systemMessage.getParams(); packet.writeD(_systemMessage.getId()); packet.writeD(params.length); @@ -131,7 +130,6 @@ public class ConfirmDlg implements IClientOutgoingPacket } } } - packet.writeD(_time); packet.writeD(_requesterId); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index e11807bdba..63acd728ea 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -73,7 +73,6 @@ public class CreatureSay implements IClientOutgoingPacket _mask |= 0x08; } } - // Does not shows level if (sender.isGM()) { @@ -125,7 +124,6 @@ public class CreatureSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_sender == null ? 0 : _sender.getObjectId()); packet.writeD(_chatType.getClientId()); if (_senderName != null) @@ -156,7 +154,6 @@ public class CreatureSay implements IClientOutgoingPacket packet.writeS(s); } } - // Rank if ((_sender != null) && _sender.isPlayer()) { @@ -165,7 +162,6 @@ public class CreatureSay implements IClientOutgoingPacket { packet.writeC(0); // unknown clan byte } - final int rank = RankManager.getInstance().getPlayerGlobalRank(_sender.getActingPlayer()); if ((rank == 0) || (rank > 100)) { @@ -183,7 +179,6 @@ public class CreatureSay implements IClientOutgoingPacket { packet.writeC(3); } - if (clan != null) { packet.writeC(clan.getCastleId()); @@ -197,7 +192,6 @@ public class CreatureSay implements IClientOutgoingPacket { packet.writeC(0); } - return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index dfc40d995f..a307b06e4b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -38,9 +38,8 @@ public class DeleteObject implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DELETE_OBJECT.writeId(packet); - packet.writeD(_objectId); - packet.writeC(0x00); // c2 + packet.writeC(0); // c2 return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java index 982c8f3311..3b5917e55b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java @@ -50,7 +50,6 @@ public class Dice implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DICE.writeId(packet); - packet.writeD(_objectId); // object id of player packet.writeD(_itemId); // item id of dice (spade) 4625,4626,4627,4628 packet.writeD(_number); // number rolled diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 52daec99cc..609b485b51 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -57,7 +57,6 @@ public class Die implements IClientOutgoingPacket siegeClan = fort.getSiege().getAttackerClan(clan); isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan); } - // ClanHall check. if ((clan != null) && (clan.getHideoutId() > 0)) { @@ -92,12 +91,12 @@ public class Die implements IClientOutgoingPacket OutgoingPackets.DIE.writeId(packet); packet.writeD(_objectId); packet.writeQ(_flags); - packet.writeD(_isSweepable ? 0x01 : 0x00); - packet.writeD(0x00); // Feather item time. - packet.writeC(0x00); // Hide die animation. - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(_isSweepable ? 1 : 0); + packet.writeD(0); // Feather item time. + packet.writeC(0); // Hide die animation. + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java index 15404f9dee..5837faec19 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java @@ -33,7 +33,6 @@ public class DoorInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_INFO.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.getId()); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java index 54f8742a73..14d41afee7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java @@ -33,7 +33,6 @@ public class DoorStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_STATUS_UPDATE.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.isOpen() ? 0 : 1); packet.writeD(_door.getDamage()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index b12458e719..3035890956 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -40,20 +40,17 @@ public class DropItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DROP_ITEM.writeId(packet); - packet.writeD(_objectId); packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeC(_item.isStackable() ? 0x01 : 0x00); + packet.writeC(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - - packet.writeC(0x00); - // packet.writeD(0x01); if above C == true (1) then packet.readD() + packet.writeC(0); + // packet.writeD(1); if above C == true (1) then packet.readD() packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java index 631c43ba0c..99bd80d97e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java @@ -62,13 +62,12 @@ public class Earthquake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EARTHQUAKE.writeId(packet); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_intensity); packet.writeD(_duration); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 6063a54535..1a8b8ddfbb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -59,25 +59,20 @@ public class EnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_crystal); packet.writeQ(_count); - // Guessing. // With 166 options became 3x write integers instead of shorts and enchant level moved bellow. - // Commenting until actually knowing. // for (int option : _enchantOptions) // { // packet.writeD(option); // } - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_enchantLevel); // Confirmed. - return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java index d7be9824ff..ef78a83f25 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java @@ -42,7 +42,6 @@ public class EtcStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ETC_STATUS_UPDATE.writeId(packet); - packet.writeC(_player.getCharges()); // 1-7 increase force, level packet.writeD(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%) packet.writeC(0); // Weapon Grade Penalty [1-4] diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java index 5dca90f960..9f8d576148 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java @@ -24,13 +24,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class Ex2ndPasswordAck implements IClientOutgoingPacket { + // TODO: Enum + public static final int SUCCESS = 0; + public static final int WRONG_PATTERN = 1; + private final int _status; private final int _response; - // TODO: Enum - public static final int SUCCESS = 0x00; - public static final int WRONG_PATTERN = 0x01; - public Ex2ndPasswordAck(int status, int response) { _status = status; @@ -41,10 +41,9 @@ public class Ex2ndPasswordAck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_ACK.writeId(packet); - packet.writeC(_status); - packet.writeD(_response == WRONG_PATTERN ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(_response == WRONG_PATTERN ? 1 : 0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java index 48bde5161d..c86b5185d0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordCheck implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_NEW = 0x00; - public static final int PASSWORD_PROMPT = 0x01; - public static final int PASSWORD_OK = 0x02; + public static final int PASSWORD_NEW = 0; + public static final int PASSWORD_PROMPT = 1; + public static final int PASSWORD_OK = 2; private final int _windowType; @@ -40,9 +40,8 @@ public class Ex2ndPasswordCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_CHECK.writeId(packet); - packet.writeD(_windowType); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java index 1abf50ab01..f6731bf18f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordVerify implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_OK = 0x00; - public static final int PASSWORD_WRONG = 0x01; - public static final int PASSWORD_BAN = 0x02; + public static final int PASSWORD_OK = 0; + public static final int PASSWORD_WRONG = 1; + public static final int PASSWORD_BAN = 2; private final int _wrongTentatives; private final int _mode; @@ -42,7 +42,6 @@ public class Ex2ndPasswordVerify implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_VERIFY.writeId(packet); - packet.writeD(_mode); packet.writeD(_wrongTentatives); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java index 55abf718c5..db551344ef 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java @@ -45,10 +45,8 @@ public class ExAbnormalStatusUpdateFromTarget implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ABNORMAL_STATUS_UPDATE_FROM_TARGET.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeH(_effects.size()); - for (BuffInfo info : _effects) { packet.writeD(info.getSkill().getDisplayId()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java index c4b9cd8356..f3abd6ec5c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java @@ -41,7 +41,6 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRABLE_SKILL_LIST_BY_CLASS.writeId(packet); - packet.writeH(_type.getId()); packet.writeH(_learnable.size()); for (SkillLearn skill : _learnable) @@ -54,7 +53,7 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket packet.writeC(skill.getRequiredItems().size()); if (_type == AcquireSkillType.SUBPLEDGE) { - packet.writeH(0x00); + packet.writeH(0); } } return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java index fd0e2fc97c..8555bb6e86 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java @@ -61,7 +61,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_SKILL_INFO.writeId(packet); - packet.writeD(_id); packet.writeD(_level); packet.writeQ(_spCost); @@ -73,7 +72,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket packet.writeD(holder.getId()); packet.writeQ(holder.getCount()); } - packet.writeD(_skillRem.size()); for (Skill skill : _skillRem) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java index 29793f4d6c..ff8c526ec4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java @@ -36,7 +36,6 @@ public class ExAdenaInvenCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ADENA_INVEN_COUNT.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeH(_player.getInventory().getSize()); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java index 2aa2d85bc5..5ef11e0f1e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java @@ -50,13 +50,11 @@ public class ExAirShipInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_INFO.writeId(packet); - packet.writeD(_ship.getObjectId()); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(_captain); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); @@ -73,14 +71,13 @@ public class ExAirShipInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - packet.writeD(_ship.getFuel()); packet.writeD(_ship.getMaxFuel()); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java index 4cfc76bfba..8b37f4fc0a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java @@ -42,7 +42,6 @@ public class ExAirShipStopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_airShipId); packet.writeD(_playerId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java index 33c57712da..52958f931b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java @@ -37,12 +37,10 @@ public class ExAirShipTeleportList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_TELEPORT_LIST.writeId(packet); - packet.writeD(_dockId); if (_teleports != null) { packet.writeD(_teleports.length); - for (int i = 0; i < _teleports.length; i++) { packet.writeD(i - 1); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java index 392b228f0d..7918022c72 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java @@ -50,13 +50,12 @@ public class ExAlchemySkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_SKILL_LIST.writeId(packet); - packet.writeD(_skills.size()); for (Skill skill : _skills) { packet.writeD(skill.getId()); packet.writeD(skill.getLevel()); - packet.writeQ(0x00); // Always 0 on Naia, SP i guess? + packet.writeQ(0); // Always 0 on Naia, SP i guess? packet.writeC(skill.getId() == CommonSkill.ALCHEMY_CUBE.getId() ? 0 : 1); // This is type in flash, visible or not } return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java index 3d7ee12a81..1990e1e701 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java @@ -37,7 +37,6 @@ public class ExAskCoupleAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_COUPLE_ACTION.writeId(packet); - packet.writeD(_actionId); packet.writeD(_objectId); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java index 61cabedd98..45615daf5a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java @@ -39,9 +39,8 @@ public class ExAskJoinMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_MPCC.writeId(packet); - packet.writeS(_requestorName); // name of CCLeader - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java index 17fa9d028f..908022ff7e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java @@ -38,7 +38,6 @@ public class ExAskJoinPartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_PARTY_ROOM.writeId(packet); - packet.writeS(_charName); packet.writeS(_roomName); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java index 2a6b958dc9..1551840013 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java @@ -38,7 +38,6 @@ public class ExAskModifyPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_MODIFY_PARTY_LOOTING.writeId(packet); - packet.writeS(_requestor); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java index 958e7c3d06..fa62c8a207 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java @@ -45,7 +45,6 @@ public class ExAttributeEnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ATTRIBUTE_ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeC(_isWeapon); packet.writeH(_type); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java index 1a3a1ef3fe..3d65055b3c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java @@ -41,9 +41,8 @@ public class ExAutoSoulShot implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AUTO_SOUL_SHOT.writeId(packet); - packet.writeD(_itemId); - packet.writeD(_enable ? 0x01 : 0x00); + packet.writeD(_enable ? 1 : 0); packet.writeD(_type); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java index 8680c6bd7a..a8137347ec 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java @@ -37,8 +37,7 @@ public class ExBaseAttributeCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASE_ATTRIBUTE_CANCEL_RESULT.writeId(packet); - - packet.writeD(0x01); // result + packet.writeD(1); // result packet.writeD(_objId); packet.writeD(_attribute); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java index 3fd8588108..13ad96137d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java @@ -75,7 +75,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 1149, 1150, 1151, 1152, 1153, 1154, 1155 }; - public static final int[] DEFAULT_ACTION_LIST = { 0, 1, 2, 3, @@ -146,7 +145,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 5012, 5013, 5014, 5015 }; //@formatter:on - public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST); private final int[] _actionIds; @@ -160,7 +158,6 @@ public class ExBasicActionList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASIC_ACTION_LIST.writeId(packet); - packet.writeD(_actionIds.length); for (int _actionId : _actionIds) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java index 4c4fac8c91..d32dca4d21 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java @@ -34,13 +34,14 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBeautyItemList implements IClientOutgoingPacket { - private int _colorCount; - private final BeautyData _beautyData; - private final Map> _colorData = new HashMap<>(); private static final int HAIR_TYPE = 0; private static final int FACE_TYPE = 1; private static final int COLOR_TYPE = 2; + private int _colorCount; + private final BeautyData _beautyData; + private final Map> _colorData = new HashMap<>(); + public ExBeautyItemList(Player player) { _beautyData = BeautyShopData.getInstance().getBeautyData(player.getRace(), player.getAppearance().getSexType()); @@ -60,7 +61,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BEAUTY_ITEM_LIST.writeId(packet); - packet.writeD(HAIR_TYPE); packet.writeD(_beautyData.getHairList().size()); for (BeautyItem hair : _beautyData.getHairList().values()) @@ -72,7 +72,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(hair.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(FACE_TYPE); packet.writeD(_beautyData.getFaceList().size()); for (BeautyItem face : _beautyData.getFaceList().values()) @@ -84,7 +83,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(face.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(COLOR_TYPE); packet.writeD(_colorCount); for (Entry> entry : _colorData.entrySet()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java index 1825236886..6d4c45cb2b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java @@ -34,7 +34,6 @@ public class ExBirthdayPopup implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_BIRTH_DAY.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java index 7d2f17e697..43e525f05f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java @@ -26,6 +26,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBrBroadcastEventState implements IClientOutgoingPacket { + public static final int APRIL_FOOLS = 20090401; + public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) + public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) + public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) + public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) + private final int _eventId; private final int _eventState; private int _param0; @@ -36,12 +42,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket private String _param5; private String _param6; - public static final int APRIL_FOOLS = 20090401; - public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) - public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) - public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) - public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) - public ExBrBroadcastEventState(int eventId, int eventState) { _eventId = eventId; @@ -65,7 +65,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BROADCAST_EVENT_STATE.writeId(packet); - packet.writeD(_eventId); packet.writeD(_eventState); packet.writeD(_param0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java index 1fd7ec663a..c0683c8797 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java @@ -44,7 +44,6 @@ public class ExBrBuffEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUFF_EVENT_STATE.writeId(packet); - packet.writeD(_type); packet.writeD(_value); packet.writeD(_state); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java index 943aae8a62..8e009d7b09 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java @@ -43,7 +43,6 @@ public class ExBrLoadEventTopRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_LOAD_EVENT_TOP_RANKERS.writeId(packet); - packet.writeD(_eventId); packet.writeD(_day); packet.writeD(_count); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java index 0a0ddf31b8..291f7a6b55 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java @@ -36,9 +36,8 @@ public class ExBrPremiumState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PREMIUM_STATE.writeId(packet); - packet.writeD(_player.getObjectId()); - packet.writeC(_player.hasPremiumStatus() || (_player.getVipTier() > 0) ? 0x01 : 0x00); + packet.writeC(_player.hasPremiumStatus() || (_player.getVipTier() > 0) ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 381dd859ad..567cfc70f9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -59,10 +59,8 @@ public class ExBuySellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x01); // Type SELL + packet.writeD(1); // Type SELL packet.writeD(_inventorySlots); - if ((_sellList != null)) { packet.writeH(_sellList.size()); @@ -74,9 +72,8 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - if ((_refundList != null) && !_refundList.isEmpty()) { packet.writeH(_refundList.size()); @@ -90,10 +87,9 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - - packet.writeC(_done ? 0x01 : 0x00); + packet.writeC(_done ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java index 2b43c0ce4b..e0ec81e0e7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java @@ -39,7 +39,6 @@ public class ExCastleState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CASTLE_STATE.writeId(packet); - packet.writeD(_castleId); packet.writeD(_castleSide.ordinal()); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java index b7f90d261b..a8196c7a83 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java @@ -52,7 +52,6 @@ public class ExChangeClientEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_CLIENT_EFFECT_INFO.writeId(packet); - packet.writeD(_type); packet.writeD(_key); packet.writeD(_value); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java index 472abc88df..eea59162ee 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java @@ -37,7 +37,6 @@ public class ExChangeNpcState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NPC_STATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java index 8cdcb4460d..45f2805517 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java @@ -49,7 +49,6 @@ public class ExChangePostState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_POST_STATE.writeId(packet); - packet.writeD(_receivedBoard ? 1 : 0); packet.writeD(_changedMsgIds.length); for (int postId : _changedMsgIds) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java index fc58ec9a2e..d765ab54e0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java @@ -35,7 +35,6 @@ public class ExChangeToAwakenedClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_TO_AWAKENED_CLASS.writeId(packet); - packet.writeD(_classId); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index f51a3eb3ae..1e9b8e9dc8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -47,7 +47,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket throw new IllegalArgumentException("Undefined Atribute item: " + stone); } _level = ElementalAttributeData.getInstance().getMaxElementLevel(_itemId); - // Register only items that can be put an attribute stone/crystal for (Item item : player.getInventory().getItems()) { @@ -62,7 +61,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_INVENTORY_ATTRIBUTE_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeQ(_count); packet.writeD(_atribute == AttributeType.FIRE ? 1 : 0); // Fire diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java index a272d85469..238882cd11 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java @@ -35,7 +35,6 @@ public class ExCloseMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java index d2ecd70952..877bca760a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java @@ -34,7 +34,6 @@ public class ExClosePartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_PARTY_ROOM.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java index 27c112776b..1d02c972b5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java @@ -54,7 +54,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLOSSEUM_FENCE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_clientState); packet.writeD(_x); @@ -62,7 +61,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_width); packet.writeD(_length); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java index 766d3619ad..b72bef93e8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java @@ -37,9 +37,8 @@ public class ExConfirmAddingContact implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AGIT_AUCTION_CMD.writeId(packet); - packet.writeS(_charName); - packet.writeD(_added ? 0x01 : 0x00); + packet.writeD(_added ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java index beded32254..c832d507ed 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameAddPlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x01); - + packet.writeD(1); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java index 5f36f730d0..847ea93e6a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java @@ -45,9 +45,7 @@ public class ExCubeGameChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java index 66abbf4b75..a2f2e61ded 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java @@ -43,12 +43,10 @@ public class ExCubeGameChangeTeam implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x05); - + packet.writeD(5); packet.writeD(_player.getObjectId()); - packet.writeD(_fromRedTeam ? 0x01 : 0x00); - packet.writeD(_fromRedTeam ? 0x00 : 0x01); + packet.writeD(_fromRedTeam ? 1 : 0); + packet.writeD(_fromRedTeam ? 0 : 1); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java index 5273b2099a..136b439283 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java @@ -39,9 +39,7 @@ public class ExCubeGameChangeTimeToStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x03); - + packet.writeD(3); packet.writeD(_seconds); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java index f81a302941..9bdba49029 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java @@ -35,7 +35,6 @@ public class ExCubeGameCloseUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0xffffffff); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java index 259a0e9407..3177e7a488 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java @@ -40,11 +40,9 @@ public class ExCubeGameEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x01); - - packet.writeD(_isRedTeamWin ? 0x01 : 0x00); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(1); + packet.writeD(_isRedTeamWin ? 1 : 0); + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java index 4d89e621ce..8b96bb545f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java @@ -55,14 +55,11 @@ public class ExCubeGameExtendedChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeD(_playerPoints); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java index e5a00f1ab7..c084789f13 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameRemovePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java index 00be884d2f..35a3f289d1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java @@ -35,8 +35,7 @@ public class ExCubeGameRequestReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x04); + packet.writeD(4); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java index 1bc89e0c32..8b755dd3cc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java @@ -30,7 +30,6 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket // Players Lists private final List _bluePlayers; private final List _redPlayers; - // Common Values private final int _roomNumber; @@ -51,12 +50,9 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_roomNumber); packet.writeD(0xffffffff); - packet.writeD(_bluePlayers.size()); for (Player player : _bluePlayers) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java index 2f2c092c08..d000112787 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java @@ -31,7 +31,6 @@ public class ExCursedWeaponList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet); - final Set ids = CursedWeaponsManager.getInstance().getCursedWeaponsIds(); packet.writeD(ids.size()); ids.forEach(packet::writeD); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java index 2f60a1b80c..5bc7ff3238 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java @@ -39,7 +39,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet); - if (!_cursedWeaponInfo.isEmpty()) { packet.writeD(_cursedWeaponInfo.size()); @@ -47,7 +46,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { packet.writeD(w.id); packet.writeD(w.activated); - packet.writeD(w.pos.getX()); packet.writeD(w.pos.getY()); packet.writeD(w.pos.getZ()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java index a0ba15da9f..8bee464fb0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java @@ -41,7 +41,6 @@ public class ExDieInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIE_INFO.writeId(packet); - packet.writeH(_droppedItems.size()); for (Item item : _droppedItems) { @@ -49,17 +48,15 @@ public class ExDieInfo implements IClientOutgoingPacket packet.writeD(item.getEnchantLevel()); packet.writeD((int) item.getCount()); } - packet.writeD(_lastDamageTaken.size()); for (DamageTakenHolder damageHolder : _lastDamageTaken) { packet.writeS(damageHolder.getCreature().getName()); - packet.writeH(0x00); + packet.writeH(0); packet.writeD(damageHolder.getSkillId()); packet.writeF(damageHolder.getDamage()); - packet.writeD(0x00); + packet.writeD(0); } - return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java index f475a02b28..0456fb9dae 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java @@ -34,7 +34,6 @@ public class ExDissmissMPCCRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DISSMISS_MPCC_ROOM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java index 258010f717..c731b7c7a9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java @@ -37,7 +37,6 @@ public class ExDuelAskStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_ASK_START.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDuel); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java index 043c82c0db..e9a31bee57 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java @@ -38,7 +38,6 @@ public class ExDuelEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_END.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java index 264409b3d6..e1fa1cea88 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java @@ -38,7 +38,6 @@ public class ExDuelReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_READY.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java index 488aafcb7d..ecdd528a16 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java @@ -38,7 +38,6 @@ public class ExDuelStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_START.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java index 7df040c5e7..5ed0c09675 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java @@ -36,7 +36,6 @@ public class ExDuelUpdateUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_UPDATE_USER_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeD(_player.getClassId().getId()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 7ab055a3d8..f58c0573a8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExEnchantSkillInfo implements IClientOutgoingPacket { private final Set _routes; - private final int _skillId; private final int _skillLevel; private final int _skillSubLevel; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 41368a8efb..e4ee350e64 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -50,7 +50,6 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_INFO_DETAIL.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java index 5cedcd6284..1d32f0d725 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java @@ -43,7 +43,6 @@ public class ExEnchantSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_LIST.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skills.size()); for (Skill skill : _skills) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java index 6ab5e869f2..853d74039f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java @@ -38,7 +38,6 @@ public class ExEnchantSkillResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_RESULT.writeId(packet); - packet.writeD(_enchanted ? 1 : 0); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java index 7b7d2d008d..410bf16510 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java @@ -42,7 +42,6 @@ public class ExEventMatchMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_EVENT_MATCH_MESSAGE.writeId(packet); - packet.writeC(_type); packet.writeS(_message); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java index 7264e90233..1946758bf5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java @@ -37,11 +37,9 @@ public class ExGetBookMarkInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOOK_MARK_INFO.writeId(packet); - - packet.writeD(0x00); // Dummy + packet.writeD(0); // Dummy packet.writeD(_player.getBookMarkSlot()); packet.writeD(_player.getTeleportBookmarks().size()); - for (TeleportBookmark tpbm : _player.getTeleportBookmarks()) { packet.writeD(tpbm.getId()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java index 36e7bb81af..201e8eb49b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java @@ -42,15 +42,14 @@ public class ExGetBossRecord implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOSS_RECORD.writeId(packet); - packet.writeD(_ranking); packet.writeD(_totalPoints); if (_bossRecordInfo == null) { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } else { @@ -59,7 +58,7 @@ public class ExGetBossRecord implements IClientOutgoingPacket { packet.writeD(entry.getKey()); packet.writeD(entry.getValue()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? } } return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java index ea0a5f8b18..85ccad0758 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java @@ -41,7 +41,6 @@ public class ExGetOffAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_OFF_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java index f8e16a4191..9a02e49223 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java @@ -39,7 +39,6 @@ public class ExGetOnAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_ON_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java index 51197344a5..704b3212a1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExGetPremiumItemList implements IClientOutgoingPacket { private final Player _player; - private final Map _map; public ExGetPremiumItemList(Player player) @@ -43,7 +42,6 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_PREMIUM_ITEM_LIST.writeId(packet); - packet.writeD(_map.size()); for (Entry entry : _map.entrySet()) { @@ -51,7 +49,7 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket packet.writeQ(entry.getKey()); packet.writeD(item.getItemId()); packet.writeQ(item.getCount()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeS(item.getSender()); } return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index a005fa8ad8..0200bdee08 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -40,7 +40,6 @@ public class ExHeroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HERO_LIST.writeId(packet); - packet.writeD(_heroList.size()); for (StatSet hero : _heroList.values()) { @@ -51,7 +50,7 @@ public class ExHeroList implements IClientOutgoingPacket packet.writeS(hero.getString(Hero.ALLY_NAME, "")); packet.writeD(hero.getInt(Hero.ALLY_CREST, 0)); packet.writeD(hero.getInt(Hero.COUNT)); - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index d5b5430142..0baca7cd86 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -48,8 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); - - packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade + packet.writeC(_hide ? 0 : 1); // Grand Crusade packet.writeD(_currentTemplateId); packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java index 81db66b88f..323c0cdf1e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java @@ -35,7 +35,6 @@ public class ExIsCharNameCreatable implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_IS_CHAR_NAME_CREATABLE.writeId(packet); - packet.writeD(_allowed); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java index 2cea176d69..4eea62de37 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java @@ -39,11 +39,11 @@ public class ExItemAnnounce implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_ANNOUNCE.writeId(packet); - packet.writeC(0x00); // item icon + packet.writeC(0); // item icon packet.writeString(_player.getName()); // name of player packet.writeD(_item.getId()); // item id packet.writeD(_item.getEnchantLevel()); // enchant level - packet.writeC(0x00); // name of item + packet.writeC(0); // name of item return true; } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java index ecc751eab3..45def9e0be 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java @@ -38,7 +38,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { throw new NullPointerException(); } - if (currentAuction.getAuctionState() != ItemAuctionState.STARTED) { _timeRemaining = 0; @@ -47,7 +46,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { _timeRemaining = (int) (currentAuction.getFinishingTimeRemaining() / 1000); // in seconds } - _refresh = refresh; _currentAuction = currentAuction; _nextAuction = nextAuction; @@ -57,16 +55,12 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_AUCTION_INFO.writeId(packet); - - packet.writeC(_refresh ? 0x00 : 0x01); + packet.writeC(_refresh ? 0 : 1); packet.writeD(_currentAuction.getInstanceId()); - final ItemAuctionBid highestBid = _currentAuction.getHighestBid(); packet.writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid()); - packet.writeD(_timeRemaining); writeItem(packet, _currentAuction.getItemInfo()); - if (_nextAuction != null) { packet.writeQ(_nextAuction.getAuctionInitBid()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java index 53ad8abd58..1c5e38cbab 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListMpccWaiting implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _rooms = new LinkedList<>(); @@ -53,7 +54,6 @@ public class ExListMpccWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_MPCC_WAITING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 78f2fec636..eafea24fa6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _players = new LinkedList<>(); @@ -60,7 +61,6 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(packet); - packet.writeD(_size); packet.writeD(_players.size()); for (Player player : _players) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java index 786c616875..c8723a9fc0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java @@ -46,7 +46,6 @@ public class ExMPCCPartyInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCPARTY_INFO_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_LeaderOID); packet.writeD(_memberCount); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java index 4bf07f0133..08259e4e6c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java @@ -37,7 +37,6 @@ public class ExMPCCPartymasterList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_PARTYMASTER_LIST.writeId(packet); - packet.writeD(_leadersName.size()); _leadersName.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java index abbdc8fe76..f021ef5f1f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java @@ -36,7 +36,6 @@ public class ExMPCCRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java index 154e156270..2eec590cb4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java @@ -41,7 +41,6 @@ public class ExMPCCRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java index 06e3027bfc..a0e9d0a4b0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java @@ -37,7 +37,6 @@ public class ExMPCCShowPartyMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCSHOW_PARTY_MEMBER_INFO.writeId(packet); - packet.writeD(_party.getMemberCount()); for (Player pc : _party.getMembers()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java index e454a746f3..771b2f22cb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java @@ -49,7 +49,6 @@ public class ExMagicAttackInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAGIC_ATTACK_INFO.writeId(packet); - packet.writeD(_caster); packet.writeD(_target); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java index 9cfbeb5aee..1aaa5b6520 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java @@ -35,7 +35,6 @@ public class ExMailArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAIL_ARRIVED.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java index 983ff22b92..48156c0600 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java @@ -44,7 +44,6 @@ public class ExManageMpccRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MANAGE_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java index f710c006e8..9d7d14211e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java @@ -45,7 +45,6 @@ public class ExMoveToLocationAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_objId); packet.writeD(_tx); packet.writeD(_ty); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java index 3e3bdc9fed..87e44b51cd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java @@ -43,7 +43,6 @@ public class ExMoveToLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java index 7ab0d1c7da..3c1902892a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java @@ -40,11 +40,9 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet); - packet.writeS(_channel.getLeader().getName()); - packet.writeD(0x00); // Channel loot 0 or 1 + packet.writeD(0); // Channel loot 0 or 1 packet.writeD(_channel.getMemberCount()); - packet.writeD(_channel.getParties().size()); for (Party p : _channel.getParties()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java index 1536bd5f9b..f2a32bb6e8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java @@ -43,7 +43,6 @@ public class ExNeedToChangeName implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEED_TO_CHANGE_NAME.writeId(packet); - packet.writeD(_type); packet.writeD(_subType); packet.writeS(_name); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java index be9bec8559..d18b4606b3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java @@ -35,7 +35,6 @@ public class ExNevitAdventEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CHANNELING_EFFECT.writeId(packet); - packet.writeD(_timeLeft); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java index 3a0367c178..09f6250f51 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java @@ -35,7 +35,6 @@ public class ExNevitAdventPointInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_AGATHION_ENERGY_INFO.writeId(packet); - packet.writeD(_points); // 72 = 1%, max 7200 = 100% return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java index 88fdaae499..ef220d86de 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java @@ -37,9 +37,8 @@ public class ExNevitAdventTimeChange implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - // state 0 - pause 1 - started - packet.writeC(_paused ? 0x00 : 0x01); + packet.writeC(_paused ? 0 : 1); // left time in ms max is 16000 its 4m and state is automatically changed to quit packet.writeD(_time); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java index fccdf510cc..4025bf78fa 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java @@ -34,7 +34,6 @@ public class ExNewSkillToLearnByLevelUp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEW_SKILL_TO_LEARN_BY_LEVEL_UP.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java index 324c18a517..f2ce8614dc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java @@ -43,8 +43,7 @@ public class ExNoticePostArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTICE_POST_ARRIVED.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java index afe3719d9b..050c7ccea5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java @@ -43,8 +43,7 @@ public class ExNoticePostSent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_WRITE_POST.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java index 5d98c20b09..e0bd08d39a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java @@ -30,7 +30,6 @@ public class ExNotifyPremiumItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_PREMIUM_ITEM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java index 6cb3724448..ba3c0cfeaa 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java @@ -34,7 +34,6 @@ public class ExOlympiadMatchEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MATCH_END.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java index 264d5aa484..7ffd5ed3bd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java @@ -55,19 +55,15 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x00); // Type 0 = Match List, 1 = Match Result - + packet.writeD(0); // Type 0 = Match List, 1 = Match Result packet.writeD(_games.size()); - packet.writeD(0x00); - + packet.writeD(0); for (OlympiadGameTask curGame : _games) { final AbstractOlympiadGame game = curGame.getGame(); if (game != null) { packet.writeD(game.getStadiumId()); // Stadium Id (Arena 1 = 0) - if (game instanceof OlympiadGameNonClassed) { packet.writeD(1); @@ -80,8 +76,7 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket { packet.writeD(0); } - - packet.writeD(curGame.isRunning() ? 0x02 : 0x01); // (1 = Standby, 2 = Playing) + packet.writeD(curGame.isRunning() ? 2 : 1); // (1 = Standby, 2 = Playing) packet.writeS(game.getPlayerNames()[0]); // Player 1 Name packet.writeS(game.getPlayerNames()[1]); // Player 2 Name } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java index 712651603d..b387271fba 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java @@ -53,9 +53,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x01); // Type 0 = Match List, 1 = Match Result - + packet.writeD(1); // Type 0 = Match List, 1 = Match Result packet.writeD(_tie ? 1 : 0); // 0 - win, 1 - tie packet.writeS(_winnerList.get(0).getName()); packet.writeD(_winTeam); @@ -69,9 +67,8 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } - packet.writeD(_loseTeam); packet.writeD(_loserList.size()); for (OlympiadInfo info : _loserList) @@ -83,7 +80,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java index 34d81d1f53..712b9e06c6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java @@ -38,7 +38,6 @@ public class ExOlympiadMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MODE.writeId(packet); - packet.writeC(_mode); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java index ebea6c56f3..5b4f2c2523 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java @@ -53,7 +53,6 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_SPELLED_INFO.writeId(packet); - packet.writeD(_playerId); packet.writeD(_effects.size() + _effects2.size()); for (BuffInfo info : _effects) @@ -62,7 +61,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(info.getSkill().getDisplayId()); packet.writeH(info.getSkill().getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(info.getSkill().getAbnormalType().getClientId()); writeOptionalD(packet, info.getSkill().isAura() ? -1 : info.getTime()); } @@ -73,7 +72,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(skill.getDisplayId()); packet.writeH(skill.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(skill.getAbnormalType().getClientId()); packet.writeH(-1); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java index 18c34fe9de..ca473edfcf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java @@ -76,7 +76,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_USER_INFO.writeId(packet); - if (_player != null) { packet.writeC(_player.getOlympiadSide()); @@ -91,7 +90,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket packet.writeS(_par.getName()); packet.writeD(_par.getBaseClass()); } - packet.writeD(_curHp); packet.writeD(_maxHp); packet.writeD(_curCp); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java index e84d0251bd..7ec64cc8c3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java @@ -35,7 +35,6 @@ public class ExOpenMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OPEN_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java index 90349cc1a2..5661dc9f57 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java @@ -56,7 +56,6 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PCCAFE_POINT_INFO.writeId(packet); - packet.writeD(_points); // num points packet.writeD(_mAddPoint); // points inc display packet.writeC(_mPeriodType); // period(0=don't show window,1=acquisition,2=use points) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java index f7e8b4a99a..248a2f7d98 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_ADD.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java index 832bee0012..1f452f4bae 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_DELETE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_summon.getSummonType()); packet.writeD(_summon.getOwner().getObjectId()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java index 0646a67001..703694fa2f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_UPDATE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 0e3edb3ea7..e4c6b79ae0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -47,7 +47,6 @@ public class ExPartyRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2bffdec368..2ebf1dc7f0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -43,10 +43,8 @@ public class ExPetInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class ExPetInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class ExPetInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,9 +154,8 @@ public class ExPetInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -227,28 +205,24 @@ public class ExPetInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PET_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -267,7 +241,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -283,19 +257,19 @@ public class ExPetInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -307,20 +281,20 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -344,12 +318,12 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -379,12 +353,10 @@ public class ExPetInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java index 082f4c7662..0f72c05a3a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java @@ -34,7 +34,6 @@ public class ExPlayScene implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLAY_SCENE.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java index e98d317e14..7e3803bdaa 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java @@ -36,7 +36,6 @@ public class ExPledgeCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_COUNT.writeId(packet); - packet.writeD(_count); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java index 838029e284..4084de3481 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java @@ -38,7 +38,6 @@ public class ExPledgeDraftListSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_DRAFT_LIST_SEARCH.writeId(packet); - packet.writeD(_pledgeRecruitList.size()); for (PledgeWaitingInfo prl : _pledgeRecruitList) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java index fb956e9996..44e34004ea 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java @@ -25,11 +25,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExPledgeEmblem implements IClientOutgoingPacket { + private static final int TOTAL_SIZE = 65664; + private final int _crestId; private final int _clanId; private final byte[] _data; private final int _chunkId; - private static final int TOTAL_SIZE = 65664; public ExPledgeEmblem(int crestId, byte[] chunkedData, int clanId, int chunkId) { @@ -43,7 +44,6 @@ public class ExPledgeEmblem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clanId); packet.writeD(_crestId); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java index ed19bf976b..b32f8c0645 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitApplyInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_APPLY_INFO.writeId(packet); - packet.writeD(_status.ordinal()); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java index fc98b7b6f7..af4af9c9c1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitBoardDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_DETAIL.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClanId()); packet.writeD(_pledgeRecruitInfo.getKarma()); packet.writeS(_pledgeRecruitInfo.getInformation()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index b4d48373a6..eda808e754 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -34,7 +34,6 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket private final int _clanOnCurrentPage; private final int _startIndex; private final int _endIndex; - static final int CLAN_PER_PAGE = 12; public ExPledgeRecruitBoardSearch(List clanList, int currentPage) @@ -51,11 +50,9 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_SEARCH.writeId(packet); - packet.writeD(_currentPage); packet.writeD(_totalNumberOfPage); packet.writeD(_clanOnCurrentPage); - for (int i = _startIndex; i < _endIndex; i++) { packet.writeD(_clanList.get(i).getClanId()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 4ae5ffe316..b1f139226d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -40,7 +40,6 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java index 77080a3820..5844f220ec 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java @@ -39,7 +39,6 @@ public class ExPledgeWaitingList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST.writeId(packet); - packet.writeD(pledgePlayerRecruitInfos.size()); for (PledgeApplicantInfo recruitInfo : pledgePlayerRecruitInfos.values()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java index a9245c1309..6b88572057 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java @@ -30,7 +30,6 @@ public class ExPledgeWaitingListAlarm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_ALARM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java index 60997b3da0..28c3967119 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java @@ -40,7 +40,6 @@ public class ExPledgeWaitingListApplied implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_APPLIED.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClan().getId()); packet.writeS(_pledgeRecruitInfo.getClan().getName()); packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java index 66a06892c2..1f53d1bb38 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java @@ -36,7 +36,6 @@ public class ExPledgeWaitingUser implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_USER.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getPlayerId()); packet.writeS(_pledgeRecruitInfo.getMessage()); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java index 49bc9b0995..5f404779f5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java @@ -43,7 +43,6 @@ public class ExPrivateStoreSetWholeMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_objectId); packet.writeS(_msg); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java index cb5e8fbce9..ff996b5d0c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutCommissionResultForVariationMake implements IClientOutgoingPac public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_COMMISSION_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_gemstoneObjId); packet.writeD(_itemId); packet.writeQ(_gemstoneCount); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java index 81721e921f..098472b7ae 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantScrollItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SCROLL_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java index 871f377db2..ffea182a49 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java index c47a4bcff4..8016e128f4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java index c8b46be499..95c0c0e4e1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_INTENSIVE_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_refinerItemObjId); packet.writeD(_lifestoneItemId); packet.writeD(_gemstoneItemId); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 2128b2b19f..2970ca00a2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -41,13 +41,12 @@ public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_CANCEL.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); packet.writeD(_itemAug1); packet.writeD(_itemAug2); packet.writeQ(_price); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java index 80541e65cd..c25dd16b01 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java @@ -34,10 +34,9 @@ public class ExPutItemResultForVariationMake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java index fe5eb74eb0..bc8896164d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java @@ -56,13 +56,12 @@ public class ExQuestNpcLogList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_NPC_LOG_LIST.writeId(packet); - packet.writeD(_questId); packet.writeC(_npcLogList.size()); for (NpcLogListHolder holder : _npcLogList) { packet.writeD(holder.isNpcString() ? holder.getId() : holder.getId() + 1000000); - packet.writeC(holder.isNpcString() ? 0x01 : 0x00); + packet.writeC(holder.isNpcString() ? 1 : 0); packet.writeD(holder.getCount()); } return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java index 62d622caff..60616b256d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java @@ -35,7 +35,6 @@ public class ExRedSky implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RED_SKY.writeId(packet); - packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java index ce40b1a792..163faff855 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java @@ -36,7 +36,6 @@ public class ExRegenMax implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REGEN_MAX.writeId(packet); - packet.writeD(1); packet.writeD(_time); packet.writeD(_tickInterval); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java index d864795cd6..a17525576b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java @@ -34,7 +34,6 @@ public class ExRemoveEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REMOVE_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 57ed88ac29..4e479e75a6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -56,7 +56,6 @@ public class ExReplyReceivedPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_RECEIVED_POST.writeId(packet); - packet.writeD(_msg.getMailType().ordinal()); // GOD if (_msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED) { @@ -76,11 +75,10 @@ public class ExReplyReceivedPost extends AbstractItemPacket } packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown packet.writeS(_msg.getSenderName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -92,9 +90,8 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeQ(_msg.getReqAdena()); packet.writeD(_msg.hasAttachments() ? 1 : 0); packet.writeD(_msg.isReturned() ? 1 : 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 75f6596194..ed490eae91 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -54,14 +54,12 @@ public class ExReplySentPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_SENT_POST.writeId(packet); - - packet.writeD(0x00); // GOD + packet.writeD(0); // GOD packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); packet.writeS(_msg.getReceiverName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -73,11 +71,11 @@ public class ExReplySentPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeQ(_msg.getReqAdena()); - packet.writeD(_msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(_msg.isReturned() ? 0x01 : 00); + packet.writeD(_msg.hasAttachments() ? 1 : 0); + packet.writeD(_msg.isReturned() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index cc4f7ce1d8..e6a3f9bca2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -35,7 +35,6 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java index 2634aa1cdd..60201b177f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java @@ -35,7 +35,6 @@ public class ExRequestHackShield implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REQUEST_HACK_SHIELD.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java index c51ff31d0b..75e3b3a945 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java @@ -29,13 +29,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyList implements IClientOutgoingPacket { + public static final int SHOW_FACESHAPE = 1; + public static final int SHOW_HAIRSTYLE = 0; + private final Player _player; private final int _type; private final Map _beautyItem; - public static final int SHOW_FACESHAPE = 1; - public static final int SHOW_HAIRSTYLE = 0; - public ExResponseBeautyList(Player player, int type) { _player = player; @@ -54,7 +54,6 @@ public class ExResponseBeautyList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java index ca2ed360ab..4b19201833 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java @@ -25,16 +25,15 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket { + public static final int FAILURE = 0; + public static final int SUCCESS = 1; + public static final int CHANGE = 0; + public static final int RESTORE = 1; + private final Player _player; private final int _type; private final int _result; - public static final int FAILURE = 0; - public static final int SUCCESS = 1; - - public static final int CHANGE = 0; - public static final int RESTORE = 1; - public ExResponseBeautyRegistReset(Player player, int type, int result) { _player = player; @@ -46,7 +45,6 @@ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_REGIST_RESET.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java index 0e313ef3b7..c0922cfb04 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java @@ -36,10 +36,8 @@ public class ExResponseResetList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_RESET_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); - packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java index 01fe1945ef..a230033d67 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java @@ -37,7 +37,6 @@ public class ExRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ROTATION.writeId(packet); - packet.writeD(_charId); packet.writeD(_heading); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index c58ccfc233..2646a71e77 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -36,7 +36,6 @@ public class ExRpItemLink extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RP_ITEM_LINK.writeId(packet); - writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java index 04556bbed2..f0c6eba8e9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java @@ -34,7 +34,6 @@ public class ExSearchOrc implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEARCH_ORC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index 1e06cc2a3f..7a4dced122 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -38,7 +38,6 @@ public class ExSendManorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_MANOR_LIST.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java index b63c69f37e..2c25cc8bfc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java @@ -124,7 +124,6 @@ public class ExSendUIEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_UIEVENT.writeId(packet); - packet.writeD(_objectId); packet.writeD(_type); // 0 = show, 1 = hide (there is 2 = pause and 3 = resume also but they don't work well you can only pause count down and you cannot resume it because resume hides the counter). packet.writeD(0); // unknown diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java index 4378479707..716a3e8623 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java @@ -385,16 +385,13 @@ public class ExServerPrimitive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SERVER_PRIMITIVE.writeId(packet); - packet.writeS(_name); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(65535); // has to do something with display range and angle packet.writeD(65535); // has to do something with display range and angle - packet.writeD(_points.size() + _lines.size()); - for (Point point : _points) { packet.writeC(1); // Its the type in this case Point @@ -408,7 +405,6 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(point.getY()); packet.writeD(point.getZ()); } - for (Line line : _lines) { packet.writeC(2); // Its the type in this case Line diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java index fb32e199b2..51fb91b643 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java @@ -46,7 +46,6 @@ public class ExSetCompassZoneCode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_COMPASS_ZONE_CODE.writeId(packet); - packet.writeD(_zoneType); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java index 1d0fbae3a4..34dee8bda0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java @@ -38,7 +38,6 @@ public class ExSetPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_PARTY_LOOTING.writeId(packet); - packet.writeD(_result); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java index 7b14ec8412..4e491af9d1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java @@ -34,7 +34,6 @@ public class ExShowAdventurerGuideBook implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_ADVENTURER_GUIDE_BOOK.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index 82554fdc5f..1f8df76083 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -39,7 +39,6 @@ public class ExShowAgitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AGIT_INFO.writeId(packet); - final Collection clanHalls = ClanHallData.getInstance().getClanHalls(); packet.writeD(clanHalls.size()); clanHalls.forEach(clanHall -> diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index dd11ee0150..51e6646ff5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -44,7 +44,6 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BASE_ATTRIBUTE_CANCEL_WINDOW.writeId(packet); - packet.writeD(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java index 14e55d39f3..e22345c4fd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java @@ -25,13 +25,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExShowBeautyMenu implements IClientOutgoingPacket { - private final Player _player; - private final int _type; - // TODO: Enum public static final int MODIFY_APPEARANCE = 0; public static final int RESTORE_APPEARANCE = 1; + private final Player _player; + private final int _type; + public ExShowBeautyMenu(Player player, int type) { _player = player; @@ -42,7 +42,6 @@ public class ExShowBeautyMenu implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BEAUTY_MENU.writeId(packet); - packet.writeD(_type); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 15d011befc..b0d2b90494 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -41,7 +41,6 @@ public class ExShowCastleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CASTLE_INFO.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) @@ -65,8 +64,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } packet.writeD(castle.getTaxPercent(TaxType.BUY)); packet.writeD((int) (castle.getSiege().getSiegeDate().getTimeInMillis() / 1000)); - - packet.writeC(castle.getSiege().isInProgress() ? 0x01 : 0x00); // Grand Crusade + packet.writeC(castle.getSiege().isInProgress() ? 1 : 0); // Grand Crusade packet.writeC(castle.getSide().ordinal()); // Grand Crusade } return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java index aeb4079f3a..f9a6ebe0e7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java @@ -38,7 +38,6 @@ public class ExShowContactList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_SHOW_POST_FRIEND.writeId(packet); - packet.writeD(_contacts.size()); _contacts.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index a079ea3129..94b989b583 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -37,7 +37,6 @@ public class ExShowCropInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _crops = (nextPeriod && !manor.isManorApproved()) ? null : manor.getCropProcure(manorId, nextPeriod); } @@ -46,10 +45,9 @@ public class ExShowCropInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Crop Sales" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Crop Sales" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); + packet.writeD(0); if (_crops != null) { packet.writeD(_crops.size()); @@ -64,17 +62,17 @@ public class ExShowCropInfo implements IClientOutgoingPacket if (seed == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(seed.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(seed.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(seed.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index ebffd775d8..1f01ee7b87 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -62,10 +62,8 @@ public class ExShowCropSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getCropId()); // crop id diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index ee9fa9fd37..b625a1e4e7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -39,7 +39,6 @@ public class ExShowFortressInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_INFO.writeId(packet); - final Collection forts = FortManager.getInstance().getForts(); packet.writeD(forts.size()); for (Fort fort : forts) @@ -47,7 +46,7 @@ public class ExShowFortressInfo implements IClientOutgoingPacket final Clan clan = fort.getOwnerClan(); packet.writeD(fort.getResidenceId()); packet.writeS(clan != null ? clan.getName() : ""); - packet.writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00); + packet.writeD(fort.getSiege().isInProgress() ? 1 : 0); // Time of possession packet.writeD(fort.getOwnedTime()); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index f389b26ed5..678ab43e96 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -42,11 +42,9 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_MAP_INFO.writeId(packet); - packet.writeD(_fortress.getResidenceId()); packet.writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status packet.writeD(_fortress.getFortSize()); // barracks count - final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId()); if ((commanders != null) && !commanders.isEmpty() && _fortress.getSiege().isInProgress()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 27da99cf41..da186103ae 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -51,7 +51,6 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_SIEGE_INFO.writeId(packet); - packet.writeD(_fortId); // Fortress Id packet.writeD(_size); // Total Barracks Count if (_csize > 0) @@ -64,22 +63,22 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { case 0: { - packet.writeD(0x03); + packet.writeD(3); break; } case 1: { - packet.writeD(0x02); + packet.writeD(2); break; } case 2: { - packet.writeD(0x01); + packet.writeD(1); break; } case 3: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -92,27 +91,27 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket // TODO: once control room supported, update packet.writeD(0x0x) to support 5th room case 0: { - packet.writeD(0x05); + packet.writeD(5); break; } case 1: { - packet.writeD(0x04); + packet.writeD(4); break; } case 2: { - packet.writeD(0x03); + packet.writeD(3); break; } case 3: { - packet.writeD(0x02); + packet.writeD(2); break; } case 4: { - packet.writeD(0x01); + packet.writeD(1); break; } } @@ -124,7 +123,7 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { for (int i = 0; i < _size; i++) { - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java index f7aca7dffd..912839e242 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java @@ -41,8 +41,7 @@ public class ExShowManorDefaultInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_MANOR_DEFAULT_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" and "Crop Sales" buttons + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" and "Crop Sales" buttons packet.writeD(_crops.size()); for (Seed crop : _crops) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 1d3312d668..d03ce2a5fd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -52,10 +52,8 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet); - packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java index cf38d18c1c..f41999329f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java @@ -34,7 +34,6 @@ public class ExShowQuestInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_INFO.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java index 70f31e318f..0fa64c401d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java @@ -37,7 +37,6 @@ public class ExShowQuestMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_MARK.writeId(packet); - packet.writeD(_questId); packet.writeD(_questState); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index ab85228caf..1a6ee00a10 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ExShowReceivedPostList implements IClientOutgoingPacket { - private final List _inbox; - private static final int MESSAGE_FEE = 100; private static final int MESSAGE_FEE_PER_SLOT = 1000; + private final List _inbox; + public ExShowReceivedPostList(int objectId) { _inbox = MailManager.getInstance().getInbox(objectId); @@ -45,7 +45,6 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { @@ -64,18 +63,18 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getSenderName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); + packet.writeD(msg.isUnread() ? 1 : 0); packet.writeD(((msg.getMailType() == MailType.COMMISSION_ITEM_SOLD) || (msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED)) ? 0 : 1); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(msg.isReturned() ? 0x01 : 0x00); - packet.writeD(0x00); // SysString in some case it seems + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(msg.isReturned() ? 1 : 0); + packet.writeD(0); // SysString in some case it seems } } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(MESSAGE_FEE); packet.writeD(MESSAGE_FEE_PER_SLOT); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java index 9679468789..deebb99c8f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java @@ -33,6 +33,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; */ public class ExShowScreenMessage implements IClientOutgoingPacket { + // Positions + public static final byte TOP_LEFT = 1; + public static final byte TOP_CENTER = 2; + public static final byte TOP_RIGHT = 3; + public static final byte MIDDLE_LEFT = 4; + public static final byte MIDDLE_CENTER = 5; + public static final byte MIDDLE_RIGHT = 6; + public static final byte BOTTOM_CENTER = 7; + public static final byte BOTTOM_RIGHT = 8; + private final int _type; private final int _sysMessageId; private final int _unk1; @@ -48,15 +58,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket private List _parameters; // Localisation related. private String _lang; - // Positions - public static final byte TOP_LEFT = 0x01; - public static final byte TOP_CENTER = 0x02; - public static final byte TOP_RIGHT = 0x03; - public static final byte MIDDLE_LEFT = 0x04; - public static final byte MIDDLE_CENTER = 0x05; - public static final byte MIDDLE_RIGHT = 0x06; - public static final byte BOTTOM_CENTER = 0x07; - public static final byte BOTTOM_RIGHT = 0x08; public void setLang(String lang) { @@ -265,7 +266,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SCREEN_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -284,9 +284,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(sml.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -308,9 +308,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -318,7 +318,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket } } } - packet.writeD(_type); packet.writeD(_sysMessageId); packet.writeD(_position); @@ -326,9 +325,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java index 29ab5d355f..6123b08991 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java @@ -37,7 +37,6 @@ public class ExShowSeedInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _seeds = (nextPeriod && !manor.isManorApproved()) ? null : manor.getSeedProduction(manorId, nextPeriod); } @@ -46,16 +45,14 @@ public class ExShowSeedInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown if (_seeds == null) { packet.writeD(0); return true; } - packet.writeD(_seeds.size()); for (SeedProduction seed : _seeds) { @@ -67,17 +64,17 @@ public class ExShowSeedInfo implements IClientOutgoingPacket if (s == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(s.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(s.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(s.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java index e628099700..eb6e686e10 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java @@ -32,13 +32,10 @@ public class ExShowSeedMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_MAP_INFO.writeId(packet); - packet.writeD(2); // seed count - // Seed of Destruction packet.writeD(1); // id 1? Grand Crusade packet.writeD(2770 + GraciaSeedsManager.getInstance().getSoDState()); // sys msg id - // Seed of Infinity packet.writeD(2); // id 2? Grand Crusade // Manager not implemented yet diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index 4fd891a466..373c314eba 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -62,10 +62,8 @@ public class ExShowSeedSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getSeedId()); // seed id diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 1994402da2..269bec5b97 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -47,7 +47,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _cropsItems.put(cropId, item); } } - for (CropProcure crop : CastleManorManager.getInstance().getCropProcure(_manorId, false)) { if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) @@ -61,7 +60,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_cropsItems.size()); // size for (Item item : _cropsItems.values()) @@ -70,9 +68,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket packet.writeD(item.getObjectId()); // Object id packet.writeD(item.getId()); // crop id packet.writeD(seed.getLevel()); // seed level - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(1)); // reward 1 id - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(2)); // reward 2 id if (_castleCrops.containsKey(item.getId())) { @@ -85,9 +83,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket else { packet.writeD(0xFFFFFFFF); // manor - packet.writeQ(0x00); // buy residual - packet.writeQ(0x00); // buy price - packet.writeC(0x00); // reward + packet.writeQ(0); // buy residual + packet.writeQ(0); // buy price + packet.writeC(0); // reward } packet.writeQ(item.getCount()); // my crops } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index db4bccc928..b61d5b2301 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -40,7 +40,6 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { @@ -50,17 +49,17 @@ public class ExShowSentPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getReceiverName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); - packet.writeD(0x01); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(msg.isUnread() ? 1 : 0); + packet.writeD(1); + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(0); } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java index 0e4e9fd2ef..0dca57f2f8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java @@ -48,7 +48,6 @@ public class ExShowTerritory implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TERRITORY.writeId(packet); - packet.writeD(_vertices.size()); packet.writeD(_minZ); packet.writeD(_maxZ); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java index 4e284f82c5..86e1009bbf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java @@ -46,7 +46,6 @@ public class ExShowTrace implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TRACE.writeId(packet); - packet.writeH(0); // type broken in H5 packet.writeD(0); // time broken in H5 packet.writeH(_locations.size()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java index 3245767ed7..836a5c9624 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java @@ -44,7 +44,6 @@ public class ExShowUsm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_USM.writeId(packet); - packet.writeD(_videoId); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java index 4acdffa842..1f1a14c31b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java @@ -34,7 +34,6 @@ public class ExShowVariationCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_CANCEL_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java index 3a2298019e..9870424e26 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java @@ -35,7 +35,6 @@ public class ExShowVariationMakeWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_MAKE_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java index 169827bab3..86211c8d97 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java @@ -44,10 +44,9 @@ public class ExSpawnEmitter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SPAWN_EMITTER.writeId(packet); - packet.writeD(_npcObjectId); packet.writeD(_playerObjectId); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java index 620800c1c4..534549b4fe 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java @@ -36,7 +36,6 @@ public class ExStartScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_START_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java index 0bd990cf34..babac59129 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java index 0e2689d598..d3e67afe99 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipObjId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java index 44b064113f..f5b3e1340f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java @@ -36,7 +36,6 @@ public class ExStopScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index 8029930c9a..367ac79be4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -66,7 +66,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket } OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet); - packet.writeD(_inventory); packet.writeD(_warehouse); // packet.writeD(_freight); // Removed with 152. diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java index 3293a5b557..57563ca2f9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java @@ -39,7 +39,6 @@ public class ExSubPledgeSkillAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUB_PLEDGET_SKILL_ADD.writeId(packet); - packet.writeD(_type); packet.writeD(_skillId); packet.writeD(_skillLevel); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java index d61dfa20ab..816d6f16a6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java @@ -97,7 +97,6 @@ public class ExSubjobInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUBJOB_INFO.writeId(packet); - packet.writeC(_type); packet.writeD(_currClassId); packet.writeD(_currRace); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java index 85616016c7..b7a152629d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java @@ -38,7 +38,6 @@ public class ExTacticalSign implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TACTICAL_SIGN.writeId(packet); - packet.writeD(_target.getObjectId()); packet.writeD(_tokenId); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java index 3486e6281d..9e03a8bd0a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java @@ -39,7 +39,6 @@ public class ExTeleportToLocationActivate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_TO_LOCATION_ACTIVATE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java index a214c53a0f..7bcddd964d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java @@ -27,6 +27,7 @@ public class ExUISetting implements IClientOutgoingPacket { public static final String UI_KEY_MAPPING_VAR = "UI_KEY_MAPPING"; public static final String SPLIT_VAR = " "; + private final byte[] _uiKeyMapping; public ExUISetting(Player player) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java index 187770cfc8..eff4285a8b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java @@ -37,7 +37,6 @@ public class ExUnReadMailCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_UN_READ_MAIL_COUNT.writeId(packet); - packet.writeD(_mailUnreadCount); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java index f992b3c937..e59c651371 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java @@ -41,7 +41,6 @@ public class ExUseSharedGroupItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USE_SHARED_GROUP_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeD(_grpId); packet.writeD(_remainingTime); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java index 474fcc5208..f49d451587 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class ExUserInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getTransformationId()); - final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); final boolean isInvisible = _player.isInvisible(); packet.writeD(abnormalVisualEffects.size() + (isInvisible ? 1 : 0)); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java index b841449ab3..1069a64e3e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java @@ -36,12 +36,9 @@ public class ExUserInfoCubic implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_CUBIC.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(_player.getCubics().size()); - _player.getCubics().keySet().forEach(packet::writeH); - packet.writeD(_player.getAgathionId()); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java index 3e4afb995b..6ef31d6117 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java @@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExUserInfoEquipSlot extends AbstractMaskPacket { private final Player _player; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -66,11 +65,9 @@ public class ExUserInfoEquipSlot extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_EQUIP_SLOT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(InventorySlot.values().length); // 152 packet.writeB(_masks); - final PlayerInventory inventory = _player.getInventory(); for (InventorySlot slot : InventorySlot.values()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java index 3eb1cf9578..d655e48843 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java @@ -36,7 +36,6 @@ public class ExUserInfoInvenWeight implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_INVEN_WEIGHT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java index 91e0e92338..16aa81e9c0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java @@ -44,7 +44,6 @@ public class ExValidateLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java index 727267c9d5..50cb4025e4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java @@ -35,7 +35,6 @@ public class ExVariationCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_CANCEL_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java index 5cdc1b8d0e..4fde190ae2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java @@ -32,14 +32,13 @@ public class ExVariationResult implements IClientOutgoingPacket { _option1 = option1; _option2 = option2; - _success = success ? 0x01 : 0x00; + _success = success ? 1 : 0; } @Override public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_RESULT.writeId(packet); - packet.writeD(_option1); packet.writeD(_option2); packet.writeD(_success); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java index db0acfd5ff..60fb57c0b3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java @@ -41,10 +41,9 @@ public class ExVitalityEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_EFFECT_INFO.writeId(packet); - packet.writeD(_points); packet.writeD(_vitalityBonus); // Vitality Bonus - packet.writeH(0x00); // Vitality additional bonus in % + packet.writeH(0); // Vitality additional bonus in % packet.writeH(_vitalityItemsRemaining); // How much vitality items remaining for use packet.writeH(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java index 3cd9d26602..9a401c2321 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java @@ -35,7 +35,6 @@ public class ExVitalityPointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_POINT_INFO.writeId(packet); - packet.writeD(_vitalityPoints); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java index 71baff96ea..c4c5539ca4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java @@ -45,7 +45,6 @@ public class ExVoteSystemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VOTE_SYSTEM_INFO.writeId(packet); - packet.writeD(_recomLeft); packet.writeD(_recomHave); packet.writeD(_bonusTime); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java index bc41adf7f2..8abcfc022e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java @@ -37,7 +37,6 @@ public class ExWorldChatCnt implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_WORLD_CHAT_CNT.writeId(packet); - packet.writeD(_points); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java index 5f935fe0dc..dc9c2288f8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java @@ -79,19 +79,17 @@ public class FakePlayerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // vehicleId + packet.writeD(0); // vehicleId packet.writeD(_objId); packet.writeS(_npc.getName()); - packet.writeH(_npc.getRace().ordinal()); - packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 0x01 : 0x00); + packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 1 : 0); packet.writeD(_fpcHolder.getClassId()); - - packet.writeD(0x00); // Inventory.PAPERDOLL_UNDER + packet.writeD(0); // Inventory.PAPERDOLL_UNDER packet.writeD(_fpcHolder.getEquipHead()); packet.writeD(_fpcHolder.getEquipRHand()); packet.writeD(_fpcHolder.getEquipLHand()); @@ -103,28 +101,22 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_fpcHolder.getEquipRHand()); // dual hand packet.writeD(_fpcHolder.getEquipHair()); packet.writeD(_fpcHolder.getEquipHair2()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderAugument()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } - packet.writeC(_fpcHolder.getArmorEnchantLevel()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderVisualId()) { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeC(_npc.getScriptValue()); // getPvpFlag() packet.writeD(_npc.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -135,16 +127,12 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_npc.getCollisionRadius()); packet.writeF(_npc.getCollisionHeight()); - packet.writeD(_fpcHolder.getHair()); packet.writeD(_fpcHolder.getHairColor()); packet.writeD(_fpcHolder.getFace()); - packet.writeS(_npc.getTemplate().getTitle()); - if (_clan != null) { packet.writeD(_clan.getId()); @@ -154,71 +142,51 @@ public class FakePlayerInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - - packet.writeC(0x01); // isSitting() ? 0x00 : 0x01 (at some initial tests it worked) - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); - packet.writeC(_npc.isInCombat() ? 0x01 : 0x00); - - packet.writeC(_npc.isAlikeDead() ? 0x01 : 0x00); - - packet.writeC(_npc.isInvisible() ? 0x01 : 0x00); - - packet.writeC(0x00); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount - packet.writeC(0x00); // getPrivateStoreType().getId() - - packet.writeH(0x00); // getCubics().size() + packet.writeC(1); // isSitting() ? 0 : 1 (at some initial tests it worked) + packet.writeC(_npc.isRunning() ? 1 : 0); + packet.writeC(_npc.isInCombat() ? 1 : 0); + packet.writeC(_npc.isAlikeDead() ? 1 : 0); + packet.writeC(_npc.isInvisible() ? 1 : 0); + packet.writeC(0); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount + packet.writeC(0); // getPrivateStoreType().getId() + packet.writeH(0); // getCubics().size() // getCubics().keySet().forEach(packet::writeH); - packet.writeC(0x00); - + packet.writeC(0); packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : 0); packet.writeH(_fpcHolder.getRecommends()); - packet.writeD(0x00); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 - + packet.writeD(0); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 packet.writeD(_fpcHolder.getClassId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(_fpcHolder.getWeaponEnchantLevel()); // isMounted() ? 0 : _enchantLevel - packet.writeC(_npc.getTeam().getId()); - - packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0x00); + packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0); packet.writeC(_fpcHolder.getNobleLevel()); - packet.writeC(_fpcHolder.isHero() ? 0x01 : 0x00); - - packet.writeC(_fpcHolder.isFishing() ? 0x01 : 0x00); - + packet.writeC(_fpcHolder.isHero() ? 1 : 0); + packet.writeC(_fpcHolder.isFishing() ? 1 : 0); packet.writeD(_fpcHolder.getBaitLocationX()); packet.writeD(_fpcHolder.getBaitLocationY()); packet.writeD(_fpcHolder.getBaitLocationZ()); - packet.writeD(_fpcHolder.getNameColor()); - packet.writeD(_heading); - packet.writeC(_fpcHolder.getPledgeStatus()); - packet.writeH(0x00); // getPledgeType() - + packet.writeH(0); // getPledgeType() packet.writeD(_fpcHolder.getTitleColor()); - - packet.writeC(0x00); // isCursedWeaponEquipped - - packet.writeD(0x00); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 - packet.writeD(0x00); // getTransformationDisplayId() + packet.writeC(0); // isCursedWeaponEquipped + packet.writeD(0); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 + packet.writeD(0); // getTransformationDisplayId() packet.writeD(_fpcHolder.getAgathionId()); - - packet.writeC(0x00); - - packet.writeD(0x00); // getCurrentCp() + packet.writeC(0); + packet.writeD(0); // getCurrentCp() packet.writeD(_npc.getMaxHp()); packet.writeD((int) Math.round(_npc.getCurrentHp())); packet.writeD(_npc.getMaxMp()); packet.writeD((int) Math.round(_npc.getCurrentMp())); - - packet.writeC(0x00); + packet.writeC(0); final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) @@ -229,9 +197,9 @@ public class FakePlayerInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(0x00); // cocPlayer.getPosition() - packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 0x01 : 0x00); - packet.writeC(0x00); // Used Ability Points + packet.writeC(0); // cocPlayer.getPosition() + packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 1 : 0); + packet.writeC(0); // Used Ability Points return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java index ae088538da..03223c8a3e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java @@ -62,7 +62,6 @@ public class FlyToLocation implements IClientOutgoingPacket _destY = destY; _destZ = destZ; _type = type; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -82,7 +81,6 @@ public class FlyToLocation implements IClientOutgoingPacket _flySpeed = flySpeed; _flyDelay = flyDelay; _animationSpeed = animationSpeed; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -103,7 +101,6 @@ public class FlyToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FLY_TO_LOCATION.writeId(packet); - packet.writeD(_chaObjId); packet.writeD(_destX); packet.writeD(_destY); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java index 1e52b0ef72..471d70f791 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java @@ -35,8 +35,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x01); + packet.writeC(1); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index ef1d37297e..2ee6ffbcd9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -50,25 +50,24 @@ public class GMHennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GMHENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON packet.writeH(_player.getHennaValue(BaseStat.MEN)); // equip MEN packet.writeH(_player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeH(_player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeH(0x00); // equip LUC - packet.writeH(0x00); // equip CHA + packet.writeH(0); // equip LUC + packet.writeH(0); // equip CHA packet.writeD(3); // Slots packet.writeD(_hennas.size()); // Size for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java index 38ca4c7be0..59bf0d9d93 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java @@ -38,7 +38,6 @@ public class GMHide implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_HIDE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index cd876896af..c2f0803303 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -50,7 +50,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -69,8 +68,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getINT()); packet.writeD(_player.getWIT()); packet.writeD(_player.getMEN()); - packet.writeD(0x00); // LUC - packet.writeD(0x00); // CHA + packet.writeD(0); // LUC + packet.writeD(0); // CHA packet.writeD(_player.getMaxHp()); packet.writeD((int) _player.getCurrentHp()); packet.writeD(_player.getMaxMp()); @@ -79,28 +78,24 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); packet.writeD(_player.getPkKills()); - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollObjectId(slot)); } - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); } - for (int slot = 0; slot < 11; slot++) { final VariationInstance augment = _player.getInventory().getPaperdollAugmentation(slot); packet.writeD(augment != null ? augment.getOption1Id() : 0); // Confirmed packet.writeD(augment != null ? augment.getOption2Id() : 0); // Confirmed } - packet.writeC(_player.getInventory().getTalismanSlots()); // CT2.3 packet.writeC(_player.getInventory().canEquipCloak() ? 1 : 0); // CT2.3 - packet.writeD(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeH(0); packet.writeD(_player.getPAtk()); packet.writeD(_player.getPAtkSpd()); packet.writeD(_player.getPDef()); @@ -108,18 +103,14 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAccuracy()); packet.writeD(_player.getCriticalHit()); packet.writeD(_player.getMAtk()); - packet.writeD(_player.getMAtkSpd()); packet.writeD(_player.getPAtkSpd()); - packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicEvasionRate()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name packet.writeD(_player.getReputation()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -135,8 +126,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeD(_player.isGM() ? 0x01 : 0x00); // builder level - + packet.writeD(_player.isGM() ? 1 : 0); // builder level packet.writeS(_player.getTitle()); packet.writeD(_player.getClanId()); // pledge id packet.writeD(_player.getClanCrestId()); // pledge crest id @@ -146,26 +136,19 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeC(_player.hasDwarvenCraft() ? 1 : 0); packet.writeD(_player.getPkKills()); packet.writeD(_player.getPvpKills()); - packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); - - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeC(321); - packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window - - packet.writeC(_player.isNoble() ? 0x01 : 0x00); - packet.writeC(_player.isHero() ? 0x01 : 0x00); - + packet.writeC(_player.isNoble() ? 1 : 0); + packet.writeC(_player.isHero() ? 1 : 0); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); - final AttributeType attackAttribute = _player.getAttackElement(); packet.writeH(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); @@ -175,8 +158,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket } packet.writeD(_player.getFame()); packet.writeD(_player.getVitalityPoints()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index 1d88596096..552b6e6168 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -37,14 +37,12 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_player.getName()); packet.writeD(_clan.getId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); @@ -52,15 +50,14 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 packet.writeD(_clan.getAllyCrestId()); // c2 packet.writeD(_clan.isAtWar() ? 1 : 0); // c3 - packet.writeD(0x00); // T3 Unknown - + packet.writeD(0); // T3 Unknown packet.writeD(_clan.getMembers().size()); for (ClanMember member : _clan.getMembers()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java index 93af10e254..3c155ff816 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -38,10 +38,8 @@ public class GMViewSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_SKILL_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_skills.size()); - final boolean isDisabled = (_player.getClan() != null) && (_player.getClan().getReputationScore() < 0); for (Skill skill : _skills) { @@ -49,7 +47,7 @@ public class GMViewSkillInfo implements IClientOutgoingPacket packet.writeH(skill.getDisplayLevel()); packet.writeH(skill.getSubLevel()); packet.writeD(skill.getDisplayId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(isDisabled && skill.isClanSkill() ? 1 : 0); packet.writeC(skill.isEnchantable() ? 1 : 0); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index f49138fafe..c909d5e6e1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -51,7 +51,6 @@ public class GMViewWarehouseWithdrawList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_WAREHOUSE_WITHDRAW_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java index d8c273f914..449271993b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java @@ -35,7 +35,6 @@ public class GameGuardQuery implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GAME_GUARD_QUERY.writeId(packet); - packet.writeD(0x27533DD9); packet.writeD(0x2E72A51D); packet.writeD(0x2017038B); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index b0c011b696..037b2e6b6b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -35,10 +35,8 @@ public class GetItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ITEM.writeId(packet); - packet.writeD(_playerId); packet.writeD(_item.getObjectId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java index f8c6126c87..5f4d7bf3ca 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java @@ -50,7 +50,6 @@ public class GetOffVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_OFF_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java index ffa8d5f310..77d1e6ba28 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java @@ -45,7 +45,6 @@ public class GetOnVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ON_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java index e5dcb9ded6..b1f5b588f9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java @@ -44,14 +44,13 @@ public class GmViewQuestInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_QUEST_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeH(_questList.size()); // quest count - for (Quest quest : _questList) { final QuestState qs = _player.getQuestState(quest.getName()); packet.writeD(quest.getId()); packet.writeD(qs == null ? 0 : qs.getCond()); } - packet.writeH(0x00); // some size + packet.writeH(0); // some size // for size; ddQQ return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 7e0614b359..3283ac802a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -51,7 +51,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeQ(_player.getAdena()); // activeChar current amount of Adena packet.writeD(3); // available equip slot packet.writeD(_hennaEquipList.size()); - for (Henna henna : _hennaEquipList) { // Player must have at least one dye in inventory @@ -62,8 +61,8 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); // item Id of the dye packet.writeQ(henna.getWearCount()); // amount of dyes required packet.writeQ(henna.getWearFee()); // amount of Adena required - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not - // packet.writeD(0x00); // Does not exist in Classic. + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // meet the requirement or not + // packet.writeD(0); // Does not exist in Classic. } } return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 0e6e64c7b2..23364ad722 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -50,25 +50,24 @@ public class HennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON packet.writeH(_player.getHennaValue(BaseStat.MEN)); // equip MEN packet.writeH(_player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeH(_player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeH(0x00); // equip LUC - packet.writeH(0x00); // equip CHA + packet.writeH(0); // equip LUC + packet.writeH(0); // equip CHA packet.writeD(3 - _player.getHennaEmptySlots()); // Slots packet.writeD(_hennas.size()); // Size for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); } - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 658087380a..9a22f0a564 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -40,12 +40,11 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_ITEM_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getWearCount()); // total amount of dye require packet.writeQ(_henna.getWearFee()); // total amount of Adena require to draw symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to draw or not 0 is false and 1 is true + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to draw or not 0 is false and 1 is true packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() + _player.getHennaValue(BaseStat.INT)); // equip INT @@ -59,7 +58,7 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket packet.writeH(_player.getDEX() + _player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeD(_player.getWIT()); // current WIT packet.writeH(_player.getWIT() + _player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 3800940bac..162812f30b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -40,12 +40,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getCancelCount()); // total amount of dye require packet.writeQ(_henna.getCancelFee()); // total amount of Adena require to remove symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to remove or not + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to remove or not packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() - _player.getHennaValue(BaseStat.INT)); // equip INT @@ -59,11 +58,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket packet.writeH(_player.getDEX() - _player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeD(_player.getWIT()); // current WIT packet.writeH(_player.getWIT() - _player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeD(0x00); // current LUC - packet.writeH(0x00); // equip LUC - packet.writeD(0x00); // current CHA - packet.writeH(0x00); // equip CHA - packet.writeD(0x00); + packet.writeD(0); // current LUC + packet.writeH(0); // equip LUC + packet.writeD(0); // current CHA + packet.writeH(0); // equip CHA + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 3a780986a0..d9f092b327 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -37,11 +37,9 @@ public class HennaRemoveList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); - packet.writeD(0x03); // seems to be max size + packet.writeD(3); // seems to be max size packet.writeD(3 - _player.getHennaEmptySlots()); - for (Henna henna : _player.getHennaList()) { if (henna != null) @@ -50,7 +48,7 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); packet.writeQ(henna.getCancelCount()); packet.writeQ(henna.getCancelFee()); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index b5c8628b50..f2a9cf1822 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -89,14 +89,12 @@ public interface IClientOutgoingPacket extends IOutgoingPacket Inventory.PAPERDOLL_ARTIFACT20, Inventory.PAPERDOLL_ARTIFACT21, }; - int[] PAPERDOLL_ORDER_AUGMENT = new int[] { Inventory.PAPERDOLL_RHAND, Inventory.PAPERDOLL_LHAND, Inventory.PAPERDOLL_RHAND }; - int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 0c54e810f0..3378827f34 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -46,7 +46,6 @@ public class InventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index c4598a72e6..cef69ecb6f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -59,8 +59,8 @@ public class ItemList extends AbstractItemPacket } else { - packet.writeC(0x01); // _showWindow ? 0x01 : 0x00 - packet.writeD(0x00); + packet.writeC(1); // _showWindow ? 1 : 0 + packet.writeD(0); packet.writeD(_items.size()); } writeInventoryBlock(packet, _player.getInventory()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java index b32b4df4a3..c3b9918230 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java @@ -32,9 +32,8 @@ public class JoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PARTY.writeId(packet); - packet.writeD(_response); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java index 65e06efeb7..f347f7efcd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java @@ -32,7 +32,6 @@ public class JoinPledge implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PLEDGE.writeId(packet); - packet.writeD(_pledgeId); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index 96f6d7c34d..996622b9e9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -35,17 +35,16 @@ public class KeyPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VERSION_CHECK.writeId(packet); - packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok for (int i = 0; i < 8; i++) { packet.writeC(_key[i]); // key } - packet.writeD(0x01); + packet.writeD(1); packet.writeD(Config.SERVER_ID); // server id - packet.writeC(0x01); - packet.writeD(0x00); // obfuscation key - packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 0x01 : 0x00); // isClassic + packet.writeC(1); + packet.writeD(0); // obfuscation key + packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 1 : 0); // isClassic return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java index 484c10f0c4..62424fd03a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java @@ -40,7 +40,6 @@ public class L2FriendSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_SAY.writeId(packet); - packet.writeD(0); // ?? packet.writeS(_receiver); packet.writeS(_sender); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java index b875edb772..790d599b5b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java @@ -32,11 +32,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ListPartyWaiting implements IClientOutgoingPacket { + private static final int NUM_PER_PAGE = 64; + private final List _rooms = new LinkedList<>(); private final int _size; - private static final int NUM_PER_PAGE = 64; - public ListPartyWaiting(PartyMatchingRoomLevelType type, int location, int page, int requestorLevel) { final List rooms = MatchingRoomManager.getInstance().getPartyMathchingRooms(location, type, requestorLevel); @@ -57,7 +57,6 @@ public class ListPartyWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_PARTY_WATING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java index 4f8f9adc64..bb0ac61dbd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java @@ -54,7 +54,6 @@ public class LoginFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LOGIN_FAIL.writeId(packet); - packet.writeD(_success); packet.writeD(_reason); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java index 18a522c315..6743e3e66f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java @@ -32,7 +32,6 @@ public class MagicSkillCanceld implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_CANCELED.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java index d56de10079..7ab29cc1a8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java @@ -66,7 +66,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // MagicSkillUse castingType packet.writeD(_objectId); packet.writeD(_skillId); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java index 3df8463279..a86626cfa6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java @@ -84,7 +84,6 @@ public class MagicSkillUse implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_USE.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // Casting bar type: 0 - default, 1 - default up, 2 - blue, 3 - green, 4 - red. packet.writeD(_creature.getObjectId()); packet.writeD(_target.getObjectId()); @@ -111,7 +110,7 @@ public class MagicSkillUse implements IClientOutgoingPacket packet.writeD(_target.getX()); packet.writeD(_target.getY()); packet.writeD(_target.getZ()); - packet.writeD(_actionId >= 0 ? 0x01 : 0x00); // 1 when ID from RequestActionUse is used + packet.writeD(_actionId >= 0 ? 1 : 0); // 1 when ID from RequestActionUse is used packet.writeD(_actionId >= 0 ? _actionId : 0); // ID from RequestActionUse. Used to set cooldown on summon skills. return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java index 6b710c692e..12e2488f24 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java @@ -37,11 +37,9 @@ public class ManagePledgePower implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet); - packet.writeD(_rank); packet.writeD(_action); packet.writeD(_clan.getRankPrivs(_rank).getBitmask()); - return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 95f4b6f201..4e2ab3f00b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -42,11 +42,9 @@ public class MonRaceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MON_RACE_INFO.writeId(packet); - packet.writeD(_unknown1); packet.writeD(_unknown2); - packet.writeD(0x08); - + packet.writeD(8); for (int i = 0; i < 8; i++) { packet.writeD(_monsters[i].getObjectId()); // npcObjectID @@ -68,7 +66,7 @@ public class MonRaceInfo implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java index 0093b3edc9..e6386921ff 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java @@ -45,13 +45,10 @@ public class MoveToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_xDst); packet.writeD(_yDst); packet.writeD(_zDst); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java index b1fb3ea003..59103c6c4c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java @@ -48,7 +48,6 @@ public class MoveToLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java index 30ff3c96af..aa261f924f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java @@ -50,11 +50,9 @@ public class MoveToPawn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_PAWN.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetId); packet.writeD(_distance); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index e1da19cc8f..50ff0191b8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -58,18 +58,16 @@ public class MultiSellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.MULTI_SELL_LIST.writeId(packet); - - packet.writeC(0x00); // Helios + packet.writeC(0); // Helios packet.writeD(_list.getId()); // list id - packet.writeC(0x00); // GOD Unknown + packet.writeC(0); // GOD Unknown packet.writeD(1 + (_index / PAGE_SIZE)); // page started from 1 - packet.writeD(_finished ? 0x01 : 0x00); // finished + packet.writeD(_finished ? 1 : 0); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - packet.writeC(0x00); // Grand Crusade - packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window - packet.writeD(0x20); // Helios - Always 32 - + packet.writeC(0); // Grand Crusade + packet.writeC(_list.isChanceMultisell() ? 1 : 0); // new multisell window + packet.writeD(32); // Helios - Always 32 while (_size-- > 0) { ItemInfo itemEnchantment = _list.getItemEnchantment(_index); @@ -86,19 +84,15 @@ public class MultiSellList extends AbstractItemPacket } } } - packet.writeD(_index); // Entry ID. Start from 1. packet.writeC(entry.isStackable() ? 1 : 0); - // Those values will be passed down to MultiSellChoose packet. packet.writeH(itemEnchantment != null ? itemEnchantment.getEnchantLevel() : 0); // enchant level writeItemAugment(packet, itemEnchantment); writeItemElemental(packet, itemEnchantment); writeItemEnsoulOptions(packet, itemEnchantment); - packet.writeH(entry.getProducts().size()); packet.writeH(entry.getIngredients().size()); - for (ItemChanceHolder product : entry.getProducts()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(product.getId()); @@ -122,7 +116,6 @@ public class MultiSellList extends AbstractItemPacket writeItemElemental(packet, displayItemEnchantment); writeItemEnsoulOptions(packet, displayItemEnchantment); } - for (ItemChanceHolder ingredient : entry.getIngredients()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(ingredient.getId()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java index 6e85f5348c..cd46aac3aa 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java @@ -45,11 +45,10 @@ public class MyTargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MY_TARGET_SELECTED.writeId(packet); - - packet.writeD(0x01); // Grand Crusade + packet.writeD(1); // Grand Crusade packet.writeD(_objectId); packet.writeH(_color); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java index 1901ad1297..166c5c1e00 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java @@ -36,7 +36,6 @@ public class NewCharacterSuccess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NEW_CHARACTER_SUCCESS.writeId(packet); - packet.writeD(_chars.size()); for (PlayerTemplate chr : _chars) { @@ -44,31 +43,24 @@ public class NewCharacterSuccess implements IClientOutgoingPacket { continue; } - // TODO: Unhardcode these packet.writeD(chr.getRace().ordinal()); packet.writeD(chr.getClassId().getId()); - packet.writeD(99); packet.writeD(chr.getBaseSTR()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseDEX()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseCON()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseINT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseWIT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseMEN()); packet.writeD(1); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java index be1605f679..6061ea26ef 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java @@ -38,7 +38,6 @@ public class NicknameChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NICK_NAME_CHANGED.writeId(packet); - packet.writeD(_objectId); packet.writeS(_title); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index f9cd107e2c..3e4837b4a4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -54,24 +54,20 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public NpcHtmlMessage(int npcObjId, int itemId) { super(npcObjId); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } public NpcHtmlMessage(int npcObjId, int itemId, String html) { super(npcObjId, html); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } @@ -79,11 +75,10 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java index 61f195e35d..05489103cb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java @@ -47,10 +47,8 @@ public class NpcInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -58,7 +56,6 @@ public class NpcInfo extends AbstractMaskPacket private int _clanId = 0; private int _statusMask = 0; private final Set _abnormalVisualEffects; - private String[] _localisation; public void setLang(String lang) @@ -101,112 +98,90 @@ public class NpcInfo extends AbstractMaskPacket { addComponentType(NpcInfoType.HEADING); } - if ((npc.getStat().getPAtkSpd() > 0) || (npc.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (npc.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((npc.getLeftHandItem() > 0) || (npc.getRightHandItem() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (npc.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (npc.getDisplayEffect() > 0) { addComponentType(NpcInfoType.DISPLAY_EFFECT); } - if (npc.isInsideZone(ZoneId.WATER) || npc.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (npc.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (npc.getCloneObjId() > 0) { addComponentType(NpcInfoType.CLONE); } - if (npc.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (npc.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (npc.getCurrentHp() <= npc.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (npc.getCurrentMp() <= npc.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (npc.getTemplate().isUsingServerSideName()) { addComponentType(NpcInfoType.NAME); } - if (npc.getTemplate().isUsingServerSideTitle() || (npc.isMonster() && (Config.SHOW_NPC_LEVEL || Config.SHOW_NPC_AGGRESSION)) || npc.isChampion() || npc.isTrap()) { addComponentType(NpcInfoType.TITLE); } - if (npc.getNameString() != null) { addComponentType(NpcInfoType.NAME_NPCSTRINGID); } - if (npc.getTitleString() != null) { addComponentType(NpcInfoType.TITLE_NPCSTRINGID); } - if (_npc.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (!_abnormalVisualEffects.isEmpty() || npc.isInvisible()) { addComponentType(NpcInfoType.ABNORMALS); } - if (npc.getEnchantEffect() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (npc.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (npc.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (npc.getClanId() > 0) { final Clan clan = ClanTable.getInstance().getClan(npc.getClanId()); @@ -220,14 +195,11 @@ public class NpcInfo extends AbstractMaskPacket addComponentType(NpcInfoType.CLAN); } } - addComponentType(NpcInfoType.COLOR_EFFECT); - if (npc.getPvpFlag() > 0) { addComponentType(NpcInfoType.PVP_FLAG); } - // TODO: Confirm me if (npc.isInCombat()) { @@ -245,8 +217,7 @@ public class NpcInfo extends AbstractMaskPacket { _statusMask |= 0x08; } - - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -296,27 +267,23 @@ public class NpcInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO.writeId(packet); - packet.writeD(_npc.getObjectId()); - packet.writeC(_npc.isShowSummonAnimation() ? 0x02 : 0x00); // // 0=teleported 1=default 2=summoned + packet.writeC(_npc.isShowSummonAnimation() ? 2 : 0); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 0x01 : 0x00); + packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { String title = _npc.getTitle(); - // Localisation related. if ((_localisation != null) && !_localisation[1].equals("")) { @@ -329,10 +296,8 @@ public class NpcInfo extends AbstractMaskPacket title = title.replace(NpcData.getInstance().getTemplate(_npc.getId()).getTitle(), _localisation[1]); } } - packet.writeS(title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -351,7 +316,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -366,20 +331,20 @@ public class NpcInfo extends AbstractMaskPacket if (containsMask(NpcInfoType.EQUIPPED)) { packet.writeD(_npc.getRightHandItem()); - packet.writeD(0x00); // Armor id? + packet.writeD(0); // Armor id? packet.writeD(_npc.getLeftHandItem()); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_npc.isDead() ? 0x00 : 0x01); + packet.writeC(_npc.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); + packet.writeC(_npc.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 0x01 : _npc.isFlying() ? 0x02 : 0x00); + packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -391,7 +356,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_npc.isFlying() ? 0x01 : 0x00); + packet.writeD(_npc.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { @@ -427,12 +392,12 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(0x00); // 2 - do some animation on spawn + packet.writeC(0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -464,12 +429,10 @@ public class NpcInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java index c95a8e5274..923e9cebad 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class NpcInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_npc.getObjectId()); packet.writeD(_npc.getTransformationDisplayId()); - final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size()); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java index a294edc57a..2a0ba41eeb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java @@ -38,7 +38,6 @@ public class NpcQuestHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NPC_QUEST_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_questId); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java index d3328ade97..fc6d0d4a3a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java @@ -106,7 +106,6 @@ public class NpcSay implements IClientOutgoingPacket { _parameters = new ArrayList<>(); } - for (String item : params) { if ((item != null) && (item.length() > 0)) @@ -127,11 +126,9 @@ public class NpcSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_SAY.writeId(packet); - packet.writeD(_objectId); packet.writeD(_textType.getClientId()); packet.writeD(_npcId); - // Localisation related. if (_lang != null) { @@ -147,7 +144,6 @@ public class NpcSay implements IClientOutgoingPacket } } } - packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java index 356e3f48a9..ac61f9d247 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java @@ -33,11 +33,10 @@ public class ObservationMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_START.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me packet.writeD(0xc0); // TODO: Find me return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java index 5c0a0766b3..896ccea02b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java @@ -33,7 +33,6 @@ public class ObservationReturn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_END.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java index c2f7ab404f..173772c870 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java @@ -37,7 +37,6 @@ public class OnEventTrigger implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EVENT_TRIGGER.writeId(packet); - packet.writeD(_emitterId); packet.writeC(_enabled); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index fbb5c84dfe..37d4fea9cf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -45,7 +45,6 @@ public class PackageSendableList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java index a53f589386..e24d63f717 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java @@ -39,7 +39,6 @@ public class PackageToList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_TO_LIST.writeId(packet); - packet.writeD(_players.size()); for (Entry entry : _players.entrySet()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 655c7abcd1..44b23b37f4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -55,7 +55,6 @@ public class PartyMemberPosition implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); - packet.writeD(locations.size()); for (Entry entry : locations.entrySet()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java index 9e275ec246..c9d3595037 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java @@ -36,7 +36,6 @@ public class PartyRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java index 2233054c14..76c4555d3b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java @@ -36,12 +36,10 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ADD.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); // c3 packet.writeD(_party.getDistributionType().getId()); // c3 packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); - packet.writeD((int) _member.getCurrentCp()); // c4 packet.writeD(_member.getMaxCp()); // c4 packet.writeD((int) _member.getCurrentHp()); @@ -51,9 +49,9 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket packet.writeD(_member.getVitalityPoints()); packet.writeC(_member.getLevel()); packet.writeH(_member.getClassId().getId()); - packet.writeC(0x00); + packet.writeC(0); packet.writeH(_member.getRace().ordinal()); - packet.writeD(0x00); // 228 + packet.writeD(0); // 228 return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java index e806018375..3a47801de1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java @@ -37,21 +37,17 @@ public class PartySmallWindowAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ALL.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); packet.writeC(_party.getDistributionType().getId()); packet.writeC(_party.getMemberCount() - 1); - for (Player member : _party.getMembers()) { if ((member != null) && (member != _exclude)) { packet.writeD(member.getObjectId()); packet.writeS(member.getName()); - packet.writeD((int) member.getCurrentCp()); // c4 packet.writeD(member.getMaxCp()); // c4 - packet.writeD((int) member.getCurrentHp()); packet.writeD(member.getMaxHp()); packet.writeD((int) member.getCurrentMp()); @@ -59,10 +55,9 @@ public class PartySmallWindowAll implements IClientOutgoingPacket packet.writeD(member.getVitalityPoints()); packet.writeC(member.getLevel()); packet.writeH(member.getClassId().getId()); - packet.writeC(0x01); // Unk + packet.writeC(1); // Unk packet.writeH(member.getRace().ordinal()); - packet.writeD(0x00); // 228 - + packet.writeD(0); // 228 final Summon pet = member.getPet(); packet.writeD(member.getServitors().size() + (pet != null ? 1 : 0)); // Summon size, one only atm if (pet != null) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java index 94a8a5a2ce..09ce132af4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java @@ -33,7 +33,6 @@ public class PartySmallWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_DELETE.writeId(packet); - packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java index c53c6c7779..e9ea2efbbe 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java @@ -42,7 +42,6 @@ public class PartySmallWindowUpdate extends AbstractMaskPacket _summon.getStat().getExp()) { packet.writeQ(_summon.getStat().getExp()); // 0% absolute value @@ -160,9 +148,7 @@ public class PetInfo implements IClientOutgoingPacket { packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value } - packet.writeQ(_summon.getExpForNextLevel()); // 100% absoulte value - packet.writeD(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight packet.writeD(_summon.getMaxLoad()); // max weight it can carry packet.writeD(_summon.getPAtk()); // patk @@ -178,25 +164,20 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD((int) _summon.getStat().getMoveSpeed()); // speed packet.writeD(_summon.getPAtkSpd()); // atkspeed packet.writeD(_summon.getMAtkSpd()); // casting speed - packet.writeC(0); // TODO: Check me, might be ride status packet.writeC(_summon.getTeam().getId()); // Confirmed packet.writeC(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed packet.writeC(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed - - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. - + packet.writeD(0); // TODO: Find me + packet.writeD(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. packet.writeC(_summon.getOwner().getSummonPoints()); // Used Summon Points packet.writeC(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points - final Set aves = _summon.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeH(aves.size()); // Confirmed for (AbnormalVisualEffect ave : aves) { packet.writeH(ave.getClientId()); // Confirmed } - packet.writeC(_statusMask); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 5b43daa74b..1f60ec39d1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -46,7 +46,6 @@ public class PetInventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.PET_INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index e4cf35779f..16dc83b7ed 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -35,7 +35,6 @@ public class PetItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java index fdb00ddbb1..913f65d470 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java @@ -38,7 +38,6 @@ public class PetStatusShow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_SHOW.writeId(packet); - packet.writeD(_summonType); packet.writeD(_summonObjectId); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 25c2c74292..823a8c405a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -52,7 +52,6 @@ public class PetStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_UPDATE.writeId(packet); - packet.writeD(_summon.getSummonType()); packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getX()); @@ -69,7 +68,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket packet.writeQ(_summon.getStat().getExp()); packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value packet.writeQ(_summon.getExpForNextLevel()); // 100% absolute value - packet.writeD(0x01); // TODO: Find me! + packet.writeD(1); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java index 4bc3570779..0898b01f67 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java @@ -63,7 +63,6 @@ public class PlaySound implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLAY_SOUND.writeId(packet); - packet.writeD(_unknown1); // unknown 0 for quest and ship; packet.writeS(_soundFile); packet.writeD(_unknown3); // unknown 0 for quest; 1 for ship; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java index fbe57d4aaf..5108fe7e1b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java @@ -44,7 +44,6 @@ public class PledgeCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java index aa11b1213e..6805f64d7c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java @@ -34,7 +34,6 @@ public class PledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_INFO.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getId()); packet.writeS(_clan.getName()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java index 72f2c71838..193ee17589 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java @@ -36,12 +36,10 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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 - // clan or subpledge name if (_member.getPledgeType() != 0) { @@ -51,7 +49,6 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket { packet.writeS(_member.getClan().getName()); } - packet.writeS(_member.getApprenticeOrSponsorName()); // name of this member's apprentice/sponsor return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java index eefd482979..6aa5067c8f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java @@ -36,7 +36,6 @@ public class PledgeReceivePowerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_POWER_INFO.writeId(packet); - packet.writeD(_member.getPowerGrade()); // power grade packet.writeS(_member.getName()); packet.writeD(_member.getClan().getRankPrivs(_member.getPowerGrade()).getBitmask()); // privileges diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 818c38a076..01f71eea17 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -40,8 +40,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_SUB_PLEDGE_CREATED.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); packet.writeD(_subPledge.getId()); packet.writeS(_subPledge.getName()); packet.writeS(getLeaderName()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java index 4d0efeb82a..7649947064 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java @@ -43,7 +43,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(packet); - packet.writeD(_tab); // page packet.writeD(_clanList.size()); for (ClanWar clanWar : _clanList) @@ -53,7 +52,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket { continue; } - packet.writeS(clan.getName()); packet.writeD(clanWar.getState().ordinal()); // type: 0 = Declaration, 1 = Blood Declaration, 2 = In War, 3 = Victory, 4 = Defeat, 5 = Tie, 6 = Error packet.writeD(clanWar.getRemainingTime()); // Time if friends to start remaining diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java index 2cbbdbf046..80d10fcb66 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java @@ -34,26 +34,25 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_INFO_UPDATE.writeId(packet); - // sending empty data so client will ask all the info in response ;) packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getLevel()); // clan level packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); // castle state ? + packet.writeD(0); // castle state ? packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); // clan reputation score - packet.writeD(0x00); // ? - packet.writeD(0x00); // ? + packet.writeD(0); // ? + packet.writeD(0); // ? packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); // c5 packet.writeD(_clan.getAllyCrestId()); // c5 packet.writeD(_clan.isAtWar() ? 1 : 0); // c5 - packet.writeD(0x00); // TODO: Find me! - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java index ae26e50dbb..2fa9f26d4a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java @@ -51,12 +51,11 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ADD.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); - packet.writeD(0x00); - packet.writeD(0x01); + packet.writeD(0); + packet.writeD(1); packet.writeD(_isOnline); // 1 = online 0 = offline packet.writeD(_pledgeType); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index c5ea7b284b..a1be315cf4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -41,7 +41,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket { _clan = clan; _pledge = pledge; - _pledgeId = _pledge == null ? 0x00 : _pledge.getId(); + _pledgeId = _pledge == null ? 0 : _pledge.getId(); _leaderName = pledge == null ? clan.getLeaderName() : CharNameTable.getInstance().getNameById(pledge.getLeaderId()); _name = pledge == null ? clan.getName() : pledge.getName(); _members = _clan.getMembers(); @@ -65,31 +65,28 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(packet); - - packet.writeD(_isSubPledge ? 0x00 : 0x01); + packet.writeD(_isSubPledge ? 0 : 1); packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_pledgeId); packet.writeS(_name); packet.writeS(_leaderName); - packet.writeD(_clan.getCrestId()); // crest id .. is used again packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); // 0 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(0); // 0 packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.isAtWar() ? 1 : 0); // new c3 - packet.writeD(0x00); // Territory castle ID + packet.writeD(0); // Territory castle ID packet.writeD(_clan.getSubPledgeMembersCount(_pledgeId)); - for (ClanMember m : _members) { if (m.getPledgeType() != _pledgeId) @@ -107,8 +104,8 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket } else { - packet.writeD(0x01); // no visible effect - packet.writeD(0x01); // packet.writeD(1); + packet.writeD(1); // no visible effect + packet.writeD(1); // packet.writeD(1); } packet.writeD(m.isOnline() ? m.getObjectId() : 0); // objectId = online 0 = offline packet.writeD(m.getSponsor() != 0 ? 1 : 0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java index 0fd387e419..154bcc610d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java @@ -32,7 +32,6 @@ public class PledgeShowMemberListDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_DELETE.writeId(packet); - packet.writeS(_player); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java index c61f412ed0..7b8c7c516b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java @@ -66,7 +66,6 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index 4e89797e45..09f70ea024 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -62,14 +62,14 @@ public class PledgeSkillList implements IClientOutgoingPacket { packet.writeD(sk.getDisplayId()); packet.writeH(sk.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } for (SubPledgeSkill sk : _subSkills) { packet.writeD(sk._subType); // Clan Sub-unit types packet.writeD(sk._skillId); packet.writeH(sk._skillLevel); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java index f3b8d4c26c..a94601294f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java @@ -37,7 +37,6 @@ public class PledgeSkillListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST_ADD.writeId(packet); - packet.writeD(_id); packet.writeD(_level); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java index 9e1b4843ac..5f32f2bf54 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java @@ -33,15 +33,14 @@ public class PledgeStatusChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_STATUS_CHANGED.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getLeaderId()); packet.writeD(_clan.getId()); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getAllyId()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.getCrestLargeId()); - packet.writeD(0x00); // pledge type ? + packet.writeD(0); // pledge type ? return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java index 5b56d0b28d..41d0f9f7d8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java @@ -44,12 +44,10 @@ public class PrivateStoreListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_LIST.writeId(packet); - packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); // Viewer's item count? + packet.writeD(0); // Viewer's item count? packet.writeD(_items.size()); - int slotNumber = 0; for (TradeItem item : _items) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 67b6ba8d94..d72050283e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -43,11 +43,10 @@ public class PrivateStoreListSell extends AbstractItemPacket else { OutgoingPackets.PRIVATE_STORE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index d05590cbde..df056c2e43 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -60,13 +60,13 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket { packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); + packet.writeD(0); for (Item item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item2 : _buyList) { writeItem(packet, item2); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index d8768104a4..6bbabb282b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -63,13 +63,13 @@ public class PrivateStoreManageListSell extends AbstractItemPacket packet.writeD(_objId); packet.writeD(_packageSale ? 1 : 0); packet.writeQ(_playerAdena); - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(0x00); + packet.writeD(0); for (TradeItem item2 : _sellList) { writeItem(packet, item2); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java index 8a5b9eef92..0d7bcbea16 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgBuy implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java index b00bd2add2..8fdb5701b8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgSell implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PvpBookList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PvpBookList.java index ac5e01a6a3..5d84e6471a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PvpBookList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/PvpBookList.java @@ -32,7 +32,6 @@ public class PvpBookList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PVPBOOK_LIST.writeId(packet); - final int size = 1; packet.writeD(4); // show killer's location count packet.writeD(5); // teleport count diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java index c3958367e8..5ddaa46ba0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java @@ -40,7 +40,6 @@ public class RadarControl implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RADAR_CONTROL.writeId(packet); - packet.writeD(_showRadar); packet.writeD(_type); // maybe type packet.writeD(_x); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java index 3918894601..5d67413b6f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java @@ -43,10 +43,8 @@ public class RecipeBookItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_BOOK_ITEM_LIST.writeId(packet); - - packet.writeD(_isDwarvenCraft ? 0x00 : 0x01); // 0 = Dwarven - 1 = Common + packet.writeD(_isDwarvenCraft ? 0 : 1); // 0 = Dwarven - 1 = Common packet.writeD(_maxMp); - if (_recipes == null) { packet.writeD(0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 59ec218c84..9f460fe896 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -55,11 +55,10 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeD((int) _player.getCurrentMp()); packet.writeD(_player.getMaxMp()); packet.writeD(_success ? 1 : 0); // item creation success/failed - packet.writeC(0x00); - packet.writeQ(0x00); + packet.writeC(0); + packet.writeQ(0); return true; } - PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java index 4474a37c03..f4db5be9df 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java @@ -35,15 +35,14 @@ public class RecipeShopItemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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); - packet.writeQ(0x00); - packet.writeC(0x00); // Trigger offering window if 1 - packet.writeQ(0x00); + packet.writeQ(0); + packet.writeC(0); // Trigger offering window if 1 + packet.writeQ(0); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java index 75e45f5877..38b0b8ea4e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java @@ -43,7 +43,6 @@ public class RecipeShopManageList implements IClientOutgoingPacket { _recipes = _seller.getCommonRecipeBook(); } - if (_seller.hasManufactureShop()) { final Iterator it = _seller.getManufactureItems().values().iterator(); @@ -63,11 +62,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MANAGE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD((int) _seller.getAdena()); - packet.writeD(_isDwarven ? 0x00 : 0x01); - + packet.writeD(_isDwarven ? 0 : 1); if (_recipes == null) { packet.writeD(0); @@ -83,10 +80,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket packet.writeD(count); } } - if (!_seller.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -94,7 +90,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket for (ManufactureItem item : _seller.getManufactureItems().values()) { packet.writeD(item.getRecipeId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeQ(item.getCost()); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java index c025b5e4ed..2b9bc5b6e7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java @@ -33,7 +33,6 @@ public class RecipeShopMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MSG.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeS(_player.getStoreName()); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java index a243a18bfe..2d1965d17b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java @@ -36,14 +36,13 @@ public class RecipeShopSellList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_SELL_LIST.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD((int) _manufacturer.getCurrentMp()); // Creator's MP packet.writeD(_manufacturer.getMaxMp()); // Creator's MP packet.writeQ(_buyer.getAdena()); // Buyer Adena if (!_manufacturer.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -51,12 +50,11 @@ public class RecipeShopSellList implements IClientOutgoingPacket for (ManufactureItem temp : _manufacturer.getManufactureItems().values()) { packet.writeD(temp.getRecipeId()); - packet.writeD(0x00); // unknown + packet.writeD(0); // unknown packet.writeQ(temp.getCost()); - - packet.writeQ(0x00); // Classic - 166 - packet.writeQ(0x00); // Classic - 166 - packet.writeC(0x00); // Classic - 166 + packet.writeQ(0); // Classic - 166 + packet.writeQ(0); // Classic - 166 + packet.writeC(0); // Classic - 166 } } return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 74700e29b0..269e14d50b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -88,7 +88,6 @@ public class RelationChanged implements IClientOutgoingPacket { return; } - final Relation r = new Relation(); r._objId = activeChar.getObjectId(); r._relation = relation; @@ -102,7 +101,6 @@ public class RelationChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RELATION_CHANGED.writeId(packet); - packet.writeC(_mask); if (_multi == null) { @@ -122,7 +120,6 @@ public class RelationChanged implements IClientOutgoingPacket private void writeRelation(PacketWriter packet, Relation relation) { packet.writeD(relation._objId); - if ((_mask & SEND_DEFAULT) != SEND_DEFAULT) { packet.writeD(relation._relation); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java index b4e9dc25c5..4477cfb705 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java @@ -35,7 +35,6 @@ public class RequestEnchant implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java index 4ef15fb74c..7a0a6cbe58 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java @@ -33,7 +33,6 @@ public class Revive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.REVIVE.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java index 9c409601e3..b9ddf7733f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java @@ -42,7 +42,6 @@ public class Ride implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RIDE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_mounted); packet.writeD(_rideType); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 813ce03f4d..13ef62f55f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -49,11 +49,9 @@ public class SellListProcure implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SELL_LIST_PROCURE.writeId(packet); - packet.writeQ(_money); // money - packet.writeD(0x00); // lease ? + packet.writeD(0); // lease ? packet.writeH(_sellList.size()); // list size - for (Entry entry : _sellList.entrySet()) { final Item item = entry.getKey(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java index baa37a8507..75b5b07854 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java @@ -39,12 +39,10 @@ public class SendMacroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MACRO_LIST.writeId(packet); - packet.writeC(_updateType.getId()); - packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0x00); // modified, created or deleted macro's id + packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0); // modified, created or deleted macro's id packet.writeC(_count); // count of Macros packet.writeC(_macro != null ? 1 : 0); // unknown - if ((_macro != null) && (_updateType != MacroUpdateType.DELETE)) { packet.writeD(_macro.getId()); // Macro ID @@ -52,9 +50,7 @@ public class SendMacroList implements IClientOutgoingPacket packet.writeS(_macro.getDescr()); // Desc packet.writeS(_macro.getAcronym()); // acronym packet.writeD(_macro.getIcon()); // icon - packet.writeC(_macro.getCommands().size()); // count - int i = 1; for (MacroCmd cmd : _macro.getCommands()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java index 47fada25be..21622b5f19 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java @@ -32,7 +32,6 @@ public class SendTradeRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_REQUEST.writeId(packet); - packet.writeD(_senderId); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java index 69aa749406..1513a0e3d1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java @@ -55,7 +55,6 @@ public class ServerObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SERVER_OBJECT_INFO.writeId(packet); - packet.writeD(_activeChar.getObjectId()); packet.writeD(_displayId + 1000000); packet.writeS(_name); // name @@ -70,8 +69,8 @@ public class ServerObjectInfo implements IClientOutgoingPacket packet.writeF(_collisionHeight); packet.writeD((int) (_isAttackable ? _activeChar.getCurrentHp() : 0)); packet.writeD(_isAttackable ? _activeChar.getMaxHp() : 0); - packet.writeD(0x01); // object type - packet.writeD(0x00); // special effects + packet.writeD(1); // object type + packet.writeD(0); // special effects return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java index 88b370ad8b..0164e5c4a2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java @@ -34,7 +34,6 @@ public class SetSummonRemainTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SET_SUMMON_REMAIN_TIME.writeId(packet); - packet.writeD(_maxTime); packet.writeD(_remainingTime); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java index db28b72acf..016f5a0c9a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java @@ -38,7 +38,6 @@ public class ShopPreviewInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_INFO.writeId(packet); - packet.writeD(Inventory.PAPERDOLL_TOTALSLOTS); // Slots packet.writeD(getFromList(Inventory.PAPERDOLL_UNDER)); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index 358ee2361b..3e7efda220 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -49,11 +49,9 @@ public class ShopPreviewList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_LIST.writeId(packet); - packet.writeD(5056); packet.writeQ(_money); // current money packet.writeD(_listId); - int newlength = 0; for (Product product : _list) { @@ -63,23 +61,20 @@ public class ShopPreviewList implements IClientOutgoingPacket } } packet.writeH(newlength); - for (Product product : _list) { if (product.getItem().isEquipable()) { packet.writeD(product.getItemId()); packet.writeH(product.getItem().getType2()); // item type2 - if (product.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { packet.writeQ(product.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } else { - packet.writeQ(0x00); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand + packet.writeQ(0); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } - packet.writeQ(Config.WEAR_PRICE); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 298301ed0d..b13080ff28 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -40,7 +40,6 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_BUFF_STATUS_UPDATE.writeId(packet); - packet.writeD(_skillId); packet.writeH(_skillLevel); packet.writeH(_skillSubLevel); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index 33d36611b8..be5e1fadab 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -33,7 +33,6 @@ public class ShortCutInit implements IClientOutgoingPacket { return; } - _shortCuts = player.getAllShortCuts(); } @@ -41,26 +40,23 @@ public class ShortCutInit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); packet.writeD(sc.getSlot() + (sc.getPage() * 12)); - - packet.writeC(0x00); // 228 - + packet.writeC(0); // 228 switch (sc.getType()) { case ITEM: { packet.writeD(sc.getId()); - packet.writeD(0x01); // Enabled or not + packet.writeD(1); // Enabled or not packet.writeD(sc.getSharedReuseGroup()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeQ(0x00); // Augment id - packet.writeD(0x00); // Visual id + packet.writeD(0); + packet.writeD(0); + packet.writeQ(0); // Augment id + packet.writeD(0); // Visual id break; } case SKILL: @@ -69,8 +65,8 @@ public class ShortCutInit implements IClientOutgoingPacket packet.writeH(sc.getLevel()); packet.writeH(sc.getSubLevel()); packet.writeD(sc.getSharedReuseGroup()); - packet.writeC(0x00); // C5 - packet.writeD(0x01); // C6 + packet.writeC(0); // C5 + packet.writeD(1); // C6 break; } case ACTION: @@ -79,7 +75,7 @@ public class ShortCutInit implements IClientOutgoingPacket case BOOKMARK: { packet.writeD(sc.getId()); - packet.writeD(0x01); // C6 + packet.writeD(1); // C6 } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java index 7f584f966f..f85ada83c7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java @@ -37,12 +37,9 @@ public class ShortCutRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_REGISTER.writeId(packet); - packet.writeD(_shortcut.getType().ordinal()); packet.writeD(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client - - packet.writeC(0x00); // 228 - + packet.writeC(0); // 228 switch (_shortcut.getType()) { case ITEM: @@ -50,10 +47,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeD(_shortcut.getId()); packet.writeD(_shortcut.getCharacterType()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeD(0x00); // unknown - packet.writeD(0x00); // unknown - packet.writeD(0x00); // item augment id - packet.writeD(0x00); // TODO: Find me, item visual id ? + packet.writeD(0); // unknown + packet.writeD(0); // unknown + packet.writeD(0); // item augment id + packet.writeD(0); // TODO: Find me, item visual id ? break; } case SKILL: @@ -62,10 +59,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeH(_shortcut.getLevel()); packet.writeH(_shortcut.getSubLevel()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeC(0x00); // C5 + packet.writeC(0); // C5 packet.writeD(_shortcut.getCharacterType()); - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me + packet.writeD(0); // TODO: Find me break; } case ACTION: diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java index d6f71b5f70..cfae3b3fad 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java @@ -54,7 +54,6 @@ public class ShowBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - packet.writeC(_showBoard); // c4 1 to show community 00 to hide packet.writeS("bypass _bbshome"); // top packet.writeS("bypass _bbsgetfav"); // favorite diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java index 4b62a7001b..4d62e99d7a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java @@ -32,7 +32,6 @@ public class ShowCalculator implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_CALC.writeId(packet); - packet.writeD(_calculatorId); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java index 55f58d5375..4574762467 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java @@ -32,9 +32,8 @@ public class ShowMiniMap implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_MINIMAP.writeId(packet); - packet.writeD(_mapId); - packet.writeC(0x00); // Seven Signs state + packet.writeC(0); // Seven Signs state return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java index 303eab4e8a..97100d09d2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java @@ -34,7 +34,6 @@ public class ShowPCCafeCouponShowUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_PCCAFE_COUPON_SHOW_UI.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java index d86958e586..0a0f3ae861 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java @@ -35,7 +35,6 @@ public class ShowXMasSeal implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_XMAS_SEAL.writeId(packet); - packet.writeD(_item); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java index 66eccc7fbf..1baa030c4d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java @@ -28,9 +28,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = ca
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Attackers Clans?
* d = Number of Attackers Clans
* { //repeats
@@ -58,11 +58,10 @@ public class SiegeAttackerList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _castle.getSiege().getAttackerClans().size(); if (size > 0) { @@ -76,12 +75,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -90,8 +88,8 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index 5d5c831f14..8afd1f38ce 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -29,9 +29,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = 0xcb
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Defending Clans?
* d = Number of Defending Clans
* { //repeats
@@ -60,16 +60,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // Unknown - packet.writeD(0x01); // Unknown - packet.writeD(0x00); // Unknown - + packet.writeD(0); // Unknown + packet.writeD(1); // Unknown + packet.writeD(0); // Unknown final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0); packet.writeD(size); packet.writeD(size); - // Add owners final Clan ownerClan = _castle.getOwner(); if (ownerClan != null) @@ -78,14 +75,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket packet.writeS(ownerClan.getName()); packet.writeS(ownerClan.getLeaderName()); packet.writeD(ownerClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.OWNER.ordinal()); packet.writeD(ownerClan.getAllyId()); packet.writeS(ownerClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(ownerClan.getAllyCrestId()); } - // List of confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans()) { @@ -94,19 +90,17 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(defendingClan.getAllyCrestId()); } - // List of not confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans()) { @@ -115,12 +109,11 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER_PENDING.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 0a3fe46cb7..dfeefdaecf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -59,13 +59,11 @@ public class SiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_INFO.writeId(packet); - if (_castle != null) { packet.writeD(_castle.getResidenceId()); - final int ownerId = _castle.getOwnerId(); - packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 0x01 : 0x00); + packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0); packet.writeD(ownerId); if (ownerId > 0) { @@ -89,7 +87,6 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { @@ -97,7 +94,7 @@ public class SiegeInfo implements IClientOutgoingPacket cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis()); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(Config.SIEGE_HOUR_LIST.size()); for (int hour : Config.SIEGE_HOUR_LIST) { @@ -108,7 +105,7 @@ public class SiegeInfo implements IClientOutgoingPacket else { packet.writeD((int) (_castle.getSiegeDate().getTimeInMillis() / 1000)); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index d11b3817c0..3c4c475339 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -51,12 +51,11 @@ public class SkillCoolTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SKILL_COOL_TIME.writeId(packet); - packet.writeD(_skillReuseTimeStamps.size()); for (TimeStamp ts : _skillReuseTimeStamps) { packet.writeD(ts.getSkillId()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD((int) ts.getReuse() / 1000); packet.writeD((int) Math.max(ts.getStamp() - _currentTime, 0) / 1000); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index de54232b51..ed4615c403 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -41,10 +41,9 @@ public class Snoop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SNOOP.writeId(packet); - packet.writeD(_convoId); packet.writeS(_name); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_type.getClientId()); packet.writeS(_speaker); packet.writeS(_msg); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java index 37827bdf6c..52f15519a5 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java @@ -37,10 +37,9 @@ public class SocialAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SOCIAL_ACTION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_actionId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index fd7e43a153..19066f5f85 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -33,16 +33,15 @@ public class SpawnItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPAWN_ITEM.writeId(packet); - packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeD(_item.isStackable() ? 0x01 : 0x00); + packet.writeD(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java index ccae75b850..04f3ad716c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java @@ -110,7 +110,6 @@ public class SpecialCamera implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPECIAL_CAMERA.writeId(packet); - packet.writeD(_id); packet.writeD(_force); packet.writeD(_angle1); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java index cdd3821740..281756e793 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java @@ -34,7 +34,6 @@ public class StartPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_PLEDGE_WAR.writeId(packet); - packet.writeS(_playerName); packet.writeS(_pledgeName); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java index 48b4238eea..27fb4f606b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java @@ -38,7 +38,6 @@ public class StartRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_side); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java index b4f421df36..067bdeb082 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java @@ -72,7 +72,6 @@ public class StaticObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATIC_OBJECT.writeId(packet); - packet.writeD(_staticObjectId); packet.writeD(_objectId); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index 928b54aa48..40836e4af8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -46,7 +46,6 @@ public class StatusUpdate implements IClientOutgoingPacket public void addUpdate(StatusUpdateType type, int level) { _updates.put(type, level); - if (_isPlayable) { switch (type) @@ -75,10 +74,9 @@ public class StatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATUS_UPDATE.writeId(packet); - packet.writeD(_objectId); // casterId - packet.writeD(_isVisible ? _casterObjectId : 0x00); - packet.writeC(_isVisible ? 0x01 : 0x00); + packet.writeD(_isVisible ? _casterObjectId : 0); + packet.writeC(_isVisible ? 1 : 0); packet.writeC(_updates.size()); for (Entry entry : _updates.entrySet()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java index 9919307366..cf2b71df5a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java @@ -53,7 +53,6 @@ public class StopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java index 50fdc3fe4c..78fdb5d70c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java @@ -43,7 +43,6 @@ public class StopMoveInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java index 9c828c3962..b254cad8b1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java @@ -34,7 +34,6 @@ public class StopPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java index b0392de226..ca69cd5346 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java @@ -36,7 +36,6 @@ public class StopRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FINISH_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_speed); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index c1feb37b2f..2d92796c75 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -43,10 +43,8 @@ public class SummonInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class SummonInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class SummonInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,11 +154,9 @@ public class SummonInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - // Show red aura? - // if (_statusMask != 0) + // if (_statusMask != 0x00) // { // addComponentType(NpcInfoType.VISUAL_STATE); // } @@ -229,28 +206,24 @@ public class SummonInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.SUMMON_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -269,7 +242,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -285,19 +258,19 @@ public class SummonInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -309,20 +282,20 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -346,12 +319,12 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -381,12 +354,10 @@ public class SummonInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java index 864462f76f..6f88551204 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java @@ -34,7 +34,6 @@ public class SurrenderPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SURRENDER_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 55902e07e1..bbd7706dbe 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -162,7 +162,6 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } - _params[_paramIndex++] = param; } @@ -268,7 +267,6 @@ public class SystemMessage implements IClientOutgoingPacket { return addString(item.getName()); } - append(new SMParam(TYPE_ITEM_NAME, id)); return this; } @@ -396,7 +394,6 @@ public class SystemMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SYSTEM_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -409,13 +406,12 @@ public class SystemMessage implements IClientOutgoingPacket params[i] = _params[i].getValue(); } packet.writeH(SystemMessageId.S1_2.getId()); - packet.writeC(0x01); + packet.writeC(1); packet.writeC(TYPE_TEXT); packet.writeS(sml.getLocalisation(params)); return true; } } - packet.writeH(getId()); packet.writeC(_params.length); for (SMParam param : _params) @@ -425,9 +421,7 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } - packet.writeC(param.getType()); - switch (param.getType()) { case TYPE_ELEMENT_NAME: diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java index a91da07e77..d357efbb0e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java @@ -47,13 +47,12 @@ public class TargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_SELECTED.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java index 3dadd249f6..3d7208c06f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java @@ -42,12 +42,11 @@ public class TargetUnselected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_UNSELECTED.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index 943b5078b6..13f9b9565a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -41,14 +41,13 @@ public class TeleportToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TELEPORT_TO_LOCATION.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // Fade 0, Instant 1. + packet.writeD(0); // Fade 0, Instant 1. packet.writeD(_heading); - packet.writeD(0x00); // Unknown. + packet.writeD(0); // Unknown. return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java index cb82f2da59..8d09576d9d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java @@ -32,7 +32,6 @@ public class TradeDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_DONE.writeId(packet); - packet.writeD(_num); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java index 716ed2a099..6a94d2463f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java @@ -41,9 +41,9 @@ public class TradeOtherAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java index 3d0ef0b501..7907f3d498 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java @@ -41,9 +41,9 @@ public class TradeOwnAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c59568bf1d..3822108c5a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -58,7 +58,6 @@ public class TradeStart extends AbstractItemPacket { _mask |= 0x08; } - // Does not shows level if (_partner.isGM()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java index f8e2a191de..e5ec2376cc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java @@ -44,10 +44,10 @@ public class TradeUpdate extends AbstractItemPacket { OutgoingPackets.TRADE_UPDATE.writeId(packet); packet.writeC(_sendType); - packet.writeD(0x01); + packet.writeD(1); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2); writeItem(packet, _item, _count); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java index c7102ca385..728020c0b1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java @@ -32,7 +32,6 @@ public class TutorialEnableClientEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_ENABLE_CLIENT_EVENT.writeId(packet); - packet.writeD(_eventId); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java index 92ac75afcf..7cc33a0f80 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java @@ -48,7 +48,6 @@ public class TutorialShowHtml extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_HTML.writeId(packet); - packet.writeD(_type); packet.writeS(getHtml()); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java index 75a57be38b..2ee62835db 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java @@ -37,7 +37,6 @@ public class TutorialShowQuestionMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_QUESTION_MARK.writeId(packet); - packet.writeC(_markType); packet.writeD(_markId); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 8c4567fa08..e784098dad 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -34,7 +34,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class UserInfo extends AbstractMaskPacket { private Player _player; - private int _relation; private int _runSpd; private int _walkSpd; @@ -48,7 +47,6 @@ public class UserInfo extends AbstractMaskPacket private int _enchantLevel; private int _armorEnchant; private String _title; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -56,7 +54,6 @@ public class UserInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 5; public UserInfo(Player player) @@ -80,6 +77,7 @@ public class UserInfo extends AbstractMaskPacket _enchantLevel = player.getInventory().getWeaponEnchant(); _armorEnchant = player.getInventory().getArmorMinEnchant(); _title = player.getTitle(); + if (player.isGM() && player.isInvisible()) { _title = "[Invisible]"; @@ -135,29 +133,25 @@ public class UserInfo extends AbstractMaskPacket } OutgoingPackets.USER_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_initSize); packet.writeH(25); // 196 - 25 packet.writeB(_masks); - if (containsMask(UserInfoType.RELATION)) { packet.writeD(_relation); } - if (containsMask(UserInfoType.BASIC_INFO)) { packet.writeH(16 + (_player.getAppearance().getVisibleName().length() * 2)); packet.writeString(_player.getName()); - packet.writeC(_player.isGM() ? 0x01 : 0x00); + packet.writeC(_player.isGM() ? 1 : 0); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } - if (containsMask(UserInfoType.BASE_STATS)) { packet.writeH(18); @@ -167,10 +161,9 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getINT()); packet.writeH(_player.getWIT()); packet.writeH(_player.getMEN()); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); } - if (containsMask(UserInfoType.MAX_HPCPMP)) { packet.writeH(14); @@ -178,7 +171,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMaxMp()); packet.writeD(_player.getMaxCp()); } - if (containsMask(UserInfoType.CURRENT_HPMPCP_EXP_SP)) { packet.writeH(38); @@ -189,32 +181,28 @@ public class UserInfo extends AbstractMaskPacket packet.writeQ(_player.getExp()); packet.writeF((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel()))); } - if (containsMask(UserInfoType.ENCHANTLEVEL)) { packet.writeH(4); packet.writeC(_enchantLevel); packet.writeC(_armorEnchant); } - if (containsMask(UserInfoType.APPAREANCE)) { packet.writeH(15); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); } - if (containsMask(UserInfoType.STATUS)) { packet.writeH(6); packet.writeC(_player.getMountType().ordinal()); packet.writeC(_player.getPrivateStoreType().getId()); packet.writeC(_player.hasDwarvenCraft() || (_player.getSkillLevel(248) > 0) ? 1 : 0); - packet.writeC(0x00); + packet.writeC(0); } - if (containsMask(UserInfoType.STATS)) { packet.writeH(56); @@ -233,18 +221,16 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); } - if (containsMask(UserInfoType.ELEMENTALS)) { packet.writeH(14); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); } - if (containsMask(UserInfoType.POSITION)) { packet.writeH(18); @@ -253,7 +239,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getZ()); packet.writeD(_player.isInVehicle() ? _player.getVehicle().getObjectId() : 0); } - if (containsMask(UserInfoType.SPEED)) { packet.writeH(18); @@ -266,28 +251,24 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_flyRunSpd); packet.writeH(_flyWalkSpd); } - if (containsMask(UserInfoType.MULTIPLIER)) { packet.writeH(18); packet.writeF(_moveMultiplier); packet.writeF(_player.getAttackSpeedMultiplier()); } - if (containsMask(UserInfoType.COL_RADIUS_HEIGHT)) { packet.writeH(18); packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); } - if (containsMask(UserInfoType.ATK_ELEMENTAL)) { packet.writeH(5); - packet.writeC(0x00); - packet.writeH(0x00); + packet.writeC(0); + packet.writeH(0); } - if (containsMask(UserInfoType.CLAN)) { packet.writeH(32 + (_title.length() * 2)); @@ -297,12 +278,11 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getClanCrestLargeId()); packet.writeD(_player.getClanCrestId()); packet.writeD(_player.getClanPrivileges().getBitmask()); - packet.writeC(_player.isClanLeader() ? 0x01 : 0x00); + packet.writeC(_player.isClanLeader() ? 1 : 0); packet.writeD(_player.getAllyId()); packet.writeD(_player.getAllyCrestId()); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); } - if (containsMask(UserInfoType.SOCIAL)) { packet.writeH(30); // 228 @@ -315,96 +295,85 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getPvpKills()); packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); - packet.writeD(0x00); // 196 - packet.writeD(0x00); // 228 + packet.writeD(0); // 196 + packet.writeD(0); // 228 } - if (containsMask(UserInfoType.VITA_FAME)) { packet.writeH(19); // 196 - // packet.writeD(_player.getVitalityPoints()); - // packet.writeC(0x00); // Vita Bonus + // packet.writeC(0); // Vita Bonus // packet.writeD(_player.getFame()); // packet.writeD(_player.getRaidbossPoints()); - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 } - if (containsMask(UserInfoType.SLOTS)) { packet.writeH(12); // 152 packet.writeC(_player.getInventory().getTalismanSlots()); packet.writeC(_player.getInventory().getBroochJewelSlots()); packet.writeC(_player.getTeam().getId()); - packet.writeD(0x00); - + packet.writeD(0); if (_player.getInventory().getAgathionSlots() > 0) { - packet.writeC(0x01); // Charm slots + packet.writeC(1); // Charm slots packet.writeC(_player.getInventory().getAgathionSlots() - 1); packet.writeC(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152 } else { - packet.writeC(0x00); // Charm slots - packet.writeC(0x00); + packet.writeC(0); // Charm slots + packet.writeC(0); packet.writeC(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152 } } - if (containsMask(UserInfoType.MOVEMENTS)) { packet.writeH(4); packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); - packet.writeC(_player.isRunning() ? 0x01 : 0x00); + packet.writeC(_player.isRunning() ? 1 : 0); } - if (containsMask(UserInfoType.COLOR)) { packet.writeH(10); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); } - if (containsMask(UserInfoType.INVENTORY_LIMIT)) { packet.writeH(13); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); packet.writeH(_player.getInventoryLimit()); - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 } - if (containsMask(UserInfoType.TRUE_HERO)) { packet.writeH(9); - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeC(_player.isTrueHero() ? 100 : 0x00); + packet.writeD(0); + packet.writeH(0); + packet.writeC(_player.isTrueHero() ? 100 : 0); } - if (containsMask(UserInfoType.ATT_SPIRITS)) // 152 { packet.writeH(26); @@ -415,13 +384,11 @@ public class UserInfo extends AbstractMaskPacket packet.writeD((int) _player.getEarthSpiritDefense()); packet.writeD(_player.getActiveElementalSpiritType()); } - if (containsMask(UserInfoType.RANKING)) // 196 { packet.writeH(6); packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : 0); } - return true; } @@ -438,7 +405,6 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x10; // Party leader } } - if (clan != null) { relation |= 0x20; // Clan member @@ -447,12 +413,10 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x40; // Clan leader } } - if (player.isInSiege()) { relation |= 0x80; // In siege } - return relation; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java index 283bcf1614..90c416726a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java @@ -36,7 +36,6 @@ public class ValidateLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java index 4d8f9683d0..83f72bf981 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java @@ -40,7 +40,6 @@ public class ValidateLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java index b684e70bdc..71367cd26d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java @@ -36,7 +36,6 @@ public class VehicleCheckLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_CHECK_LOCATION.writeId(packet); - packet.writeD(_boat.getObjectId()); packet.writeD(_boat.getX()); packet.writeD(_boat.getY()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java index a4a5780f30..5b565c08b7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java @@ -46,7 +46,6 @@ public class VehicleDeparture implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_DEPARTURE.writeId(packet); - packet.writeD(_objId); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java index ec611028bf..4a995a6352 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java @@ -44,7 +44,6 @@ public class VehicleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java index 207a6fd899..bf629dcbbc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java @@ -42,7 +42,6 @@ public class VehicleStarted implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_START.writeId(packet); - packet.writeD(_objectId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 35ca986d35..5eb9eb7ab9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -30,6 +30,7 @@ public class WareHouseDepositList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; public static final int FREIGHT = 1; + private final int _sendType; private final long _playerAdena; private final List _items = new ArrayList<>(); @@ -49,7 +50,6 @@ public class WareHouseDepositList extends AbstractItemPacket _sendType = sendType; _whType = type; _playerAdena = player.getAdena(); - final boolean isPrivate = _whType == PRIVATE; for (Item temp : player.getInventory().getAvailableItems(true, isPrivate, false)) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 7af1cd273c..5ece99310a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -32,6 +32,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private final int _sendType; private Player _player; private long _playerAdena; @@ -60,7 +61,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } - _items = _player.getActiveWarehouse().getItems(); for (Item item : _items) { @@ -78,15 +78,15 @@ public class WareHouseWithdrawalList extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeH(0x00); + packet.writeH(0); packet.writeD(_invSize); packet.writeD(_items.size()); for (Item item : _items) { writeItem(packet, item); packet.writeD(item.getObjectId()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } else diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java index 5f2dd05f3b..aea1476fb2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java @@ -35,8 +35,7 @@ public class ExDivideAdenaCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_CANCEL.writeId(packet); - - packet.writeC(0x00); // TODO: Find me + packet.writeC(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java index 6af912cebf..de4e955aba 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java @@ -46,9 +46,8 @@ public class ExDivideAdenaDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_DONE.writeId(packet); - - packet.writeC(_isPartyLeader ? 0x01 : 0x00); - packet.writeC(_isCCLeader ? 0x01 : 0x00); + packet.writeC(_isPartyLeader ? 1 : 0); + packet.writeC(_isCCLeader ? 1 : 0); packet.writeD(_memberCount); packet.writeQ(_distributedAdenaCount); packet.writeQ(_adenaCount); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index 549def456e..84b5fead76 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -43,7 +43,6 @@ public class ExChooseShapeShiftingItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_SHAPE_SHIFTING_ITEM.writeId(packet); - packet.writeD(_targetType != null ? _targetType.ordinal() : 0); packet.writeD(_type != null ? _type.ordinal() : 0); packet.writeD(_itemId); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java index 33fb439aa5..ba55887a1a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java @@ -45,7 +45,6 @@ public class ExCuriousHouseMemberUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_UPDATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_maxHp); packet.writeD(_maxCp); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java index 8ad3659725..be2d29d864 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPacket { - public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0x00); - public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(0x01); + public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0); + public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(1); private final int _result; @@ -39,7 +39,6 @@ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPa public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_EXTRACTION_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java index ec82cc14f3..e84d7a7255 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; public static final ExPutShapeShiftingTargetItemResult FAILED = new ExPutShapeShiftingTargetItemResult(RESULT_FAILED, 0); @@ -43,7 +43,6 @@ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_resultId); packet.writeQ(_price); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java index f4d3118cc4..038eae0042 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExShapeShiftingResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; - public static final int RESULT_CLOSE = 0x02; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; + public static final int RESULT_CLOSE = 2; public static final ExShapeShiftingResult FAILED = new ExShapeShiftingResult(RESULT_FAILED, 0, 0); public static final ExShapeShiftingResult CLOSE = new ExShapeShiftingResult(RESULT_CLOSE, 0, 0); @@ -47,7 +47,6 @@ public class ExShapeShiftingResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHAPE_SHIFTING_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_targetItemId); packet.writeD(_extractItemId); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java index eaf0d209fd..4b48b09002 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java @@ -38,7 +38,7 @@ public class ExConfirmVipAttendanceCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CONFIRM_VIP_ATTENDANCE_CHECK.writeId(packet); - packet.writeC(_available ? 0x01 : 0x00); // can receive reward today? 1 else 0 + packet.writeC(_available ? 1 : 0); // can receive reward today? 1 else 0 packet.writeC(_index); // active reward index packet.writeD(0); packet.writeD(0); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java index 9d61fe68d6..dd94df023f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java @@ -45,10 +45,10 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket OutgoingPackets.EX_VIP_ATTENDANCE_ITEM_LIST.writeId(packet); packet.writeC(_available ? _index + 1 : _index); // index to receive? packet.writeC(_index); // last received index? - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeC(0x01); - packet.writeC(_available ? 0x01 : 0x00); // player can receive reward today? + packet.writeD(0); + packet.writeD(0); + packet.writeC(1); + packet.writeC(_available ? 1 : 0); // player can receive reward today? packet.writeC(250); packet.writeC(AttendanceRewardData.getInstance().getRewardsCount()); // reward size int rewardCounter = 0; @@ -57,11 +57,11 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket rewardCounter++; packet.writeD(reward.getId()); packet.writeQ(reward.getCount()); - packet.writeC(0x01); // is unknown? - packet.writeC((rewardCounter % 7) == 0 ? 0x01 : 0x00); // is last in row? + packet.writeC(1); // is unknown? + packet.writeC((rewardCounter % 7) == 0 ? 1 : 0); // is last in row? } - packet.writeC(0x00); - packet.writeD(0x00); + packet.writeC(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java index 0282966053..9963a080c6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java @@ -41,7 +41,7 @@ public class ExActivateAutoShortcut implements IClientOutgoingPacket { OutgoingPackets.EX_ACTIVATE_AUTO_SHORTCUT.writeId(packet); packet.writeH(_position); - packet.writeC(_active ? 0x01 : 0x00); + packet.writeC(_active ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java index 4c3ae253ea..c79b68becc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java @@ -39,7 +39,6 @@ public class ExResponseCommissionBuyInfo extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_INFO.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java index ddfa8b6db1..c1d29735b8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java @@ -40,7 +40,6 @@ public class ExResponseCommissionBuyItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_ITEM.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java index aa4bbbde24..01e4782408 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java @@ -39,7 +39,6 @@ public class ExResponseCommissionDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_DELETE.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java index e7e3c39816..b915574175 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java @@ -55,7 +55,6 @@ public class ExResponseCommissionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_INFO.writeId(packet); - packet.writeD(_result); packet.writeD(_itemId); packet.writeQ(_presetPricePerUnit); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java index 4963393b42..a012b3ab30 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java @@ -64,7 +64,6 @@ public class ExResponseCommissionList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_LIST.writeId(packet); - packet.writeD(_replyType.getClientId()); switch (_replyType) { @@ -73,13 +72,11 @@ public class ExResponseCommissionList extends AbstractItemPacket { packet.writeD((int) Instant.now().getEpochSecond()); packet.writeD(_chunkId); - int chunkSize = _items.size() - _listIndexStart; if (chunkSize > MAX_CHUNK_SIZE) { chunkSize = MAX_CHUNK_SIZE; } - packet.writeD(chunkSize); for (int i = _listIndexStart; i < (_listIndexStart + chunkSize); i++) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java index b1b0a97d7a..183547af06 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java @@ -39,7 +39,6 @@ public class ExResponseCommissionRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_REGISTER.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java index 74d8a95587..b68386e4ed 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java @@ -35,8 +35,7 @@ public class ExShowCommission implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_COMMISSION.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java index 0c267ecf34..11b1ff1e0a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExEnchantFail implements IClientOutgoingPacket { public static final ExEnchantFail STATIC_PACKET = new ExEnchantFail(0, 0); + private final int _itemOne; private final int _itemTwo; @@ -39,7 +40,6 @@ public class ExEnchantFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_FAIL.writeId(packet); - packet.writeD(_itemOne); packet.writeD(_itemTwo); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java index 71ba811ed5..87d29a8e7c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java @@ -36,7 +36,6 @@ public class ExEnchantSucess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SUCESS.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java index eb4eb8b26c..ec67d50fb6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java @@ -39,7 +39,6 @@ public class ExGetCrystalizingEstimation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - packet.writeD(_items.size()); for (ItemChanceHolder holder : _items) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java index ac16c14f5b..ebf5b64751 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java @@ -43,18 +43,18 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket } OutgoingPackets.EX_CONNECTED_TIME_AND_GETTABLE_REWARD.writeId(packet); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_oneDayRewardAvailableCount); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index 8667d9144f..57acfedd38 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -62,7 +62,6 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket } OutgoingPackets.EX_ONE_DAY_RECEIVE_REWARD_LIST.writeId(packet); - packet.writeD(_dayRemainTime); packet.writeD(_weekRemainTime); packet.writeD(_monthRemainTime); @@ -75,7 +74,7 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket packet.writeH(reward.getId()); final int status = reward.getStatus(_player); packet.writeC(status); - packet.writeC(reward.getRequiredCompletions() > 1 ? 0x01 : 0x00); + packet.writeC(reward.getRequiredCompletions() > 1 ? 1 : 0); packet.writeD(reward.getParams().getInt("level", -1) == -1 ? (status == 1 ? 0 : reward.getProgress(_player)) : _player.getLevel()); packet.writeD(reward.getRequiredCompletions()); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java index f0d1fb0d65..03c8bc9b68 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java @@ -43,9 +43,7 @@ abstract class AbstractElementalSpiritPacket implements IClientOutgoingPacket packet.writeD(spirit.getMaxCharacteristics()); packet.writeD(spirit.getMaxCharacteristics()); packet.writeD(spirit.getMaxCharacteristics()); - packet.writeC(1); // unk - for (int j = 0; j < 1; j++) { packet.writeH(2); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java index 3a53a42a95..53c6d5b3e9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java @@ -45,16 +45,14 @@ public class ElementalSpiritAbsorbInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_ABSORB_INFO.writeId(packet); - final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type)); if (spirit == null) { - packet.writeC(0x00); - packet.writeC(0x00); + packet.writeC(0); + packet.writeC(0); return true; } - - packet.writeC(0x01); + packet.writeC(1); packet.writeC(_type); packet.writeC(spirit.getStage()); packet.writeQ(spirit.getExperience()); @@ -62,7 +60,6 @@ public class ElementalSpiritAbsorbInfo implements IClientOutgoingPacket packet.writeQ(spirit.getExperienceToNextLevel()); // MaxExp packet.writeD(spirit.getLevel()); packet.writeD(spirit.getMaxLevel()); - final List absorbItems = spirit.getAbsorbItems(); packet.writeD(absorbItems.size()); // AbsorbCount for (ElementalSpiritAbsorbItemHolder absorbItem : absorbItems) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java index 430c43f891..7012b8a7a2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java @@ -44,7 +44,6 @@ public class ElementalSpiritEvolutionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_EVOLUTION_INFO.writeId(packet); - final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type)); if (spirit == null) { @@ -52,13 +51,11 @@ public class ElementalSpiritEvolutionInfo implements IClientOutgoingPacket packet.writeD(0); return true; } - packet.writeC(_type); packet.writeD(spirit.getNpcId()); - packet.writeD(0x01); // unk + packet.writeD(1); // unk packet.writeD(spirit.getStage()); packet.writeF(100); // chance ?? - final List items = spirit.getItemsToEvolve(); packet.writeD(items.size()); for (ItemHolder item : items) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java index c14deecea5..e6adc10453 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java @@ -41,7 +41,6 @@ public class ElementalSpiritExtractInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_EXTRACT_INFO.writeId(packet); - final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type)); if (spirit == null) { @@ -49,15 +48,12 @@ public class ElementalSpiritExtractInfo implements IClientOutgoingPacket packet.writeC(0); return true; } - packet.writeC(_type); // active elemental spirit packet.writeC(1); // is extract ? - packet.writeC(1); // cost count // for each cost count packet.writeD(57); // item id packet.writeD(1000000); // item count - packet.writeD(spirit.getExtractItem()); packet.writeD(spirit.getExtractAmount()); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java index 15fa123db6..ba363bf243 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java @@ -41,7 +41,6 @@ public class ElementalSpiritInfo extends AbstractElementalSpiritPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_INFO.writeId(packet); - final ElementalSpirit[] spirits = _player.getSpirits(); if (spirits == null) { @@ -50,20 +49,16 @@ public class ElementalSpiritInfo extends AbstractElementalSpiritPacket packet.writeC(0); return true; } - packet.writeC(_type); // show spirit info window 1; Change type 2; Only update 0 packet.writeC(_spiritType); - packet.writeC(spirits.length); // spirit count - for (ElementalSpirit spirit : spirits) { packet.writeC(spirit.getType()); - packet.writeC(0x01); // spirit active ? + packet.writeC(1); // spirit active ? // if active writeSpiritInfo(packet, spirit); } - packet.writeD(1); // Reset talent items count for (int j = 0; j < 1; j++) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java index bc05ef3212..66488267d4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java @@ -38,7 +38,6 @@ public class ExElementalSpiritGetExp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_GET_EXP.writeId(packet); - packet.writeC(_type); packet.writeQ(_experience); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java index 7f380efe99..8f5cfd3c98 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java @@ -41,7 +41,6 @@ public abstract class UpdateElementalSpiritPacket extends AbstractElementalSpiri { packet.writeC(_update ? 1 : 0); packet.writeC(_type); - if (_update) { final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type)); @@ -49,7 +48,6 @@ public abstract class UpdateElementalSpiritPacket extends AbstractElementalSpiri { return; } - packet.writeC(_type); writeSpiritInfo(packet, spirit); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java index 23b770e406..ebe77fa654 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java @@ -29,7 +29,7 @@ public class ExShowUpgradeSystem extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_UPGRADE_SYSTEM.writeId(packet); - packet.writeH(0x01); + packet.writeH(1); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java index fa605b548a..a99ad7f4e3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java @@ -52,7 +52,7 @@ public class ExFishingStart implements IClientOutgoingPacket packet.writeD(_baitLocation.getX()); packet.writeD(_baitLocation.getY()); packet.writeD(_baitLocation.getZ()); - packet.writeC(0x01); // 0 = newbie, 1 = normal, 2 = night + packet.writeC(1); // 0 = newbie, 1 = normal, 2 = night return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java index 046ad04cb6..74501fe7ff 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java @@ -49,7 +49,6 @@ public class ExUserInfoFishing implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_FISHING.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_isFishing ? 1 : 0); if (_baitLocation == null) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index dc0e3e05bc..336a384bcc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -47,9 +47,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FRIEND_DETAIL_INFO.writeId(packet); - packet.writeD(_objectId); - if (_friend == null) { packet.writeS(_name); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java index 0d4bb47ff0..a90b7b6083 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java @@ -33,8 +33,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x00); + packet.writeC(0); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java index 9add9c9caa..d24139644c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java @@ -49,7 +49,6 @@ public class FriendAddRequestResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_charId); packet.writeS(_charName); @@ -57,7 +56,7 @@ public class FriendAddRequestResult implements IClientOutgoingPacket packet.writeD(_charObjectId); packet.writeD(_charLevel); packet.writeD(_charClassId); - packet.writeH(0x00); // Always 0 on retail + packet.writeH(0); // Always 0 on retail return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java index a135944662..13a7d01967 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java @@ -86,12 +86,10 @@ public class FriendList implements IClientOutgoingPacket } continue; } - if (player1.isOnline()) { online = true; } - classid = player1.getClassId().getId(); level = player1.getLevel(); _info.add(new FriendInfo(objId, name, online, classid, level)); @@ -102,14 +100,13 @@ public class FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._classid); packet.writeD(info._level); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java index 07c23f9fd2..1bb4142e34 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java @@ -38,7 +38,6 @@ public class FriendRemove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_REMOVE.writeId(packet); - packet.writeD(_responce); packet.writeS(_charName); return true; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java index e8dbddcd63..a3990c0879 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java @@ -52,7 +52,6 @@ public class FriendStatus implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_STATUS.writeId(packet); - packet.writeD(_type); packet.writeS(_name); switch (_type) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java index 8752104e06..78da5850b8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java @@ -50,7 +50,6 @@ public class L2Friend implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND.writeId(packet); - packet.writeD(_action ? 1 : 3); // 1-add 3-remove packet.writeD(_objid); packet.writeS(_name); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java index b69a253635..e50693cb11 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java @@ -81,17 +81,16 @@ public class L2FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._level); packet.writeD(info._classId); - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java index 0d4fa5cb5d..d0b92dbd1d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java @@ -40,7 +40,7 @@ public class TimedHuntingZoneEnter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); - packet.writeC(0x01); // bEnterSuccess + packet.writeC(1); // bEnterSuccess packet.writeD(_zoneId); packet.writeD((int) ((Chronos.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) packet.writeD(_player.getTimedHuntingZoneRemainingTime(_zoneId) / 1000); // nRemainTime (zone left time) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java index 2c93f25c76..c80dbcfa6a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java @@ -35,7 +35,7 @@ public class TimedHuntingZoneExit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); - packet.writeC(0x00); // bEnterSuccess + packet.writeC(0); // bEnterSuccess return true; } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java index 677c09091f..706c179a9c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java @@ -37,7 +37,6 @@ public class ExMentorAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_ADD.writeId(packet); - packet.writeS(_mentor.getName()); packet.writeD(_mentor.getActiveClass()); packet.writeD(_mentor.getLevel()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java index b3e3dcb1e7..2f08d72ba6 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java @@ -63,9 +63,8 @@ public class ExMentorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_LIST.writeId(packet); - packet.writeD(_type); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mentees.size()); for (Mentee mentee : _mentees) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java index e2a71fecd7..3f3a83b27d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ListMenteeWaiting implements IClientOutgoingPacket { private static final int PLAYERS_PER_PAGE = 64; + private final List _possibleCandiates = new ArrayList<>(); private final int _page; @@ -49,18 +50,15 @@ public class ListMenteeWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_MENTEE_WAITING.writeId(packet); - - packet.writeD(0x01); // always 1 in retail + packet.writeD(1); // always 1 in retail if (_possibleCandiates.isEmpty()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } - packet.writeD(_possibleCandiates.size()); packet.writeD(_possibleCandiates.size() % PLAYERS_PER_PAGE); - for (Player player : _possibleCandiates) { if ((1 <= (PLAYERS_PER_PAGE * _page)) && (1 > (PLAYERS_PER_PAGE * (_page - 1)))) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java index fd8875aedd..c5a96dd099 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java @@ -34,12 +34,12 @@ public class ExPledgeBonusList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_BONUS_LIST.writeId(packet); - packet.writeC(0x00); // 140 + packet.writeC(0); // 140 ClanRewardData.getInstance().getClanRewardBonuses(ClanRewardType.MEMBERS_ONLINE).stream().sorted(Comparator.comparingInt(ClanRewardBonus::getLevel)).forEach(bonus -> { packet.writeD(bonus.getSkillReward().getSkillId()); }); - packet.writeC(0x01); // 140 + packet.writeC(1); // 140 ClanRewardData.getInstance().getClanRewardBonuses(ClanRewardType.HUNTING_MONSTERS).stream().sorted(Comparator.comparingInt(ClanRewardBonus::getLevel)).forEach(bonus -> { packet.writeD(bonus.getItemReward().getId()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java index 81fd4fe6aa..ac4f03e25c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java @@ -50,7 +50,6 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Player: " + _player + " attempting to write to a null clan!"); return false; } - final ClanRewardBonus highestMembersOnlineBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.MEMBERS_ONLINE); final ClanRewardBonus highestHuntingBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.HUNTING_MONSTERS); final ClanRewardBonus membersOnlineBonus = ClanRewardType.MEMBERS_ONLINE.getAvailableBonus(clan); @@ -75,25 +74,22 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Couldn't find item reward for highest available hunting bonus!!"); return false; } - // General OP Code OutgoingPackets.EX_PLEDGE_BONUS_OPEN.writeId(packet); - // Members online bonus packet.writeD(highestMembersOnlineBonus.getRequiredAmount()); packet.writeD(clan.getMaxOnlineMembers()); - packet.writeC(0x00); // 140 - packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0x00); - packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 0x01 : 0x00); - + packet.writeC(0); // 140 + packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0); + packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 1 : 0); // Hunting bonus packet.writeD(highestHuntingBonus.getRequiredAmount()); packet.writeD(clan.getHuntingPoints()); - packet.writeC(0x00); // 140 - packet.writeD(huntingBonus != null ? highestHuntingBonus.getItemReward().getId() : 0x00); - packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 0x01 : 0x00); + packet.writeC(0); // 140 + packet.writeD(huntingBonus != null ? highestHuntingBonus.getItemReward().getId() : 0); + packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index fb735b8925..e75426e598 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -69,7 +69,6 @@ public class ExBRBuyProduct implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUY_PRODUCT.writeId(packet); - packet.writeD(_reply); return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java index 742b3eba9d..91a186b81d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java @@ -39,10 +39,9 @@ public class ExBRGamePoint implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_GAME_POINT.writeId(packet); - packet.writeD(_charId); packet.writeQ(_charPoints); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java index 50f21df46a..e36f2ff502 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java @@ -45,7 +45,6 @@ public class ExBRProductInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_INFO.writeId(packet); - packet.writeD(_item.getBrId()); packet.writeD(_item.getPrice()); packet.writeD(_item.getItems().size()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java index dc851ffd43..0f042ba043 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java @@ -45,9 +45,8 @@ public class ExBRProductList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); // Adena - packet.writeQ(0x00); // Hero coins + packet.writeQ(0); // Hero coins packet.writeC(_type); // Type 0 - Home, 1 - History, 2 - Favorites packet.writeD(_primeList.size()); for (PrimeShopGroup brItem : _primeList) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java index b23e9fa8a9..f4406c1407 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java @@ -38,7 +38,6 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RAID_BOSS_SPAWN_INFO.writeId(packet); - packet.writeD(_bossIds.size()); // alive count for (int id : _bossIds) // alive ids { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java index 64c9f64e69..8cc3ba0278 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java @@ -47,7 +47,6 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_HERO_AND_LEGEND_INFO.writeId(packet); - if (!Hero.getInstance().getHeroes().isEmpty()) { try (Connection con = DatabaseFactory.getConnection(); @@ -63,7 +62,6 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket { packet.writeC(1); // ?? shows 78 on JP packet.writeC(1); // ?? shows 0 on JP - packet.writeString(rset.getString("char_name")); final int clanId = rset.getInt("clanid"); if (clanId > 0) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java index 1806b92dad..4281856780 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java @@ -55,7 +55,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MY_RANKING_INFO.writeId(packet); - final Date date = new Date(); final Calendar calendar = new GregorianCalendar(); calendar.setTime(date); @@ -101,7 +100,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket { PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } - int previousPlace = 0; int previousWins = 0; int previousLoses = 0; @@ -130,7 +128,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket { PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } - int heroCount = 0; int legendCount = 0; if (Hero.getInstance().getCompleteHeroes().containsKey(_player.getObjectId())) @@ -139,7 +136,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket heroCount = hero.getInt("count", 0); legendCount = hero.getInt("legend_count", 0); } - packet.writeD(year); // Year packet.writeD(month); // Month packet.writeD(Olympiad.getInstance().getCurrentCycle() - 1); // cycle ? diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java index 3587fd1bf7..7a233e49d3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java @@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExOlympiadRankingInfo implements IClientOutgoingPacket { private final Player _player; - private final int _tabId; private final int _rankingType; private final int _unk; @@ -58,14 +57,12 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_RANKING_INFO.writeId(packet); - packet.writeC(_tabId); // Tab id packet.writeC(_rankingType); // ranking type packet.writeC(_unk); // unk, shows 1 all time packet.writeD(_classId); // class id (default 148) or caller class id for personal rank packet.writeD(_serverId); // 0 - all servers, server id - for caller server packet.writeD(933); // unk, 933 all time - if (!_playerList.isEmpty()) { switch (_tabId) @@ -75,14 +72,12 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket if (_rankingType == 0) { packet.writeD(_playerList.size() > 100 ? 100 : _playerList.size()); - for (Integer id : _playerList.keySet()) { final StatSet player = _playerList.get(id); packet.writeString(player.getString("name")); // name packet.writeString(player.getString("clanName")); // clan name packet.writeD(id); // rank - if (!_snapshotList.isEmpty()) { for (Integer id2 : _snapshotList.keySet()) @@ -98,7 +93,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket { packet.writeD(id); } - packet.writeD(Config.SERVER_ID);// server id packet.writeD(player.getInt("level"));// level packet.writeD(player.getInt("classId"));// class id @@ -119,7 +113,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket if (player.getInt("charId") == _player.getObjectId()) { found = true; - final int first = id > 10 ? (id - 9) : 1; final int last = _playerList.size() >= (id + 10) ? id + 10 : id + (_playerList.size() - id); if (first == 1) @@ -130,7 +123,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket { packet.writeD(last - first); } - for (int id2 = first; id2 <= last; id2++) { final StatSet plr = _playerList.get(id2); @@ -152,7 +144,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket { packet.writeD(id2); } - packet.writeD(Config.SERVER_ID); packet.writeD(plr.getInt("level")); packet.writeD(plr.getInt("classId")); @@ -186,7 +177,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket } } packet.writeD(count > 50 ? 50 : count); - int i = 1; for (Integer id : _playerList.keySet()) { @@ -222,7 +212,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket { packet.writeD(i); } - packet.writeD(Config.SERVER_ID); packet.writeD(player.getInt("level")); packet.writeD(player.getInt("classId")); @@ -250,7 +239,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket i++; } } - for (Integer id : classList.keySet()) { final StatSet player = classList.get(id); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java index cf2632ed57..a9a31f88fb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java @@ -48,7 +48,6 @@ public class ExRankingCharInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RANKING_CHAR_INFO.writeId(packet); - if (!_playerList.isEmpty()) { for (Integer id : _playerList.keySet()) @@ -58,7 +57,6 @@ public class ExRankingCharInfo implements IClientOutgoingPacket { packet.writeD(id); // server rank packet.writeD(player.getInt("raceRank")); // race rank - for (Integer id2 : _snapshotList.keySet()) { final StatSet snapshot = _snapshotList.get(id2); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java index 588bee4582..cd0ee7a3d4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java @@ -33,11 +33,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExRankingCharRankers implements IClientOutgoingPacket { private final Player _player; - private final int _race; private final int _group; private final int _scope; - private final Map _playerList; private final Map _snapshotList; @@ -55,11 +53,9 @@ public class ExRankingCharRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RANKING_CHAR_RANKERS.writeId(packet); - packet.writeC(_group); packet.writeC(_scope); packet.writeD(_race); - if (!_playerList.isEmpty()) { switch (_group) @@ -70,7 +66,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket { final int count = _playerList.size() > 150 ? 150 : _playerList.size(); packet.writeD(count); - for (Integer id : _playerList.keySet()) { final StatSet player = _playerList.get(id); @@ -127,7 +122,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket packet.writeD(plr.getInt("classId")); packet.writeD(plr.getInt("race")); packet.writeD(id2); // server rank - if (!_snapshotList.isEmpty()) { for (Integer id3 : _snapshotList.keySet()) @@ -164,7 +158,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } } packet.writeD(count > 100 ? 100 : count); - int i = 1; for (Integer id : _playerList.keySet()) { @@ -212,7 +205,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket else { boolean found = false; - final Map raceList = new ConcurrentHashMap<>(); int i = 1; for (Integer id : _playerList.keySet()) @@ -224,7 +216,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket i++; } } - for (Integer id : raceList.keySet()) { final StatSet player = raceList.get(id); @@ -277,9 +268,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket i++; } } - packet.writeD(clanList.size()); - for (Integer id : clanList.keySet()) { final StatSet player = clanList.get(id); @@ -333,9 +322,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } } friendList.add(_player.getObjectId()); - packet.writeD(count); - for (int id : _playerList.keySet()) { final StatSet player = _playerList.get(id); @@ -370,7 +357,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket else { packet.writeD(1); - packet.writeString(_player.getName()); if (_player.getClan() != null) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java index 2463589c81..c09b3e899d 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java @@ -47,18 +47,15 @@ public class ExFlyMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_mapId); - packet.writeD(_locations.size()); for (SayuneEntry loc : _locations) { packet.writeD(loc.getId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(loc.getX()); packet.writeD(loc.getY()); packet.writeD(loc.getZ()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java index 03fc6b580d..70b3fb25d2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java @@ -47,16 +47,13 @@ public class ExFlyMoveBroadcast implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE_BROADCAST.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); packet.writeD(_mapId); - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD(_currentLoc.getX()); packet.writeD(_currentLoc.getY()); packet.writeD(_currentLoc.getZ()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java index cfe11a27e0..49e5d86910 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java @@ -35,7 +35,6 @@ public class ExNotifyFlyMoveStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_FLY_MOVE_START.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java index d5640a47ef..0efa37ae8c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java @@ -51,7 +51,6 @@ public class ExMoveToLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_SUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_targetX); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java index 0cbe2c3e02..a0314c39aa 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java @@ -46,7 +46,6 @@ public class ExShuttleGetOff implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_OFF.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java index 5211bef5ba..061bcafed9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java @@ -43,7 +43,6 @@ public class ExShuttleGetOn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_ON.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java index 97d54a9019..c8aee1fde7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java @@ -43,7 +43,6 @@ public class ExShuttleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHUTTLE_INFO.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD(_shuttle.getX()); packet.writeD(_shuttle.getY()); @@ -60,8 +59,8 @@ public class ExShuttleInfo implements IClientOutgoingPacket packet.writeD(loc.getY()); packet.writeD(loc.getZ()); } - packet.writeD(stop.isDoorOpen() ? 0x01 : 0x00); - packet.writeD(stop.hasDoorChanged() ? 0x01 : 0x00); + packet.writeD(stop.isDoorOpen() ? 1 : 0); + packet.writeD(stop.hasDoorChanged() ? 1 : 0); } return true; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java index 6ba38f29a1..28b33b998e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java @@ -43,7 +43,6 @@ public class ExShuttleMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_MOVE.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD((int) _shuttle.getStat().getMoveSpeed()); packet.writeD((int) _shuttle.getStat().getRotationSpeed()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java index bf2b6ea6eb..6c31189d6a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java @@ -44,7 +44,6 @@ public class ExStopMoveInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_SHUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java index f7f6849732..8492f42a6e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java @@ -44,7 +44,6 @@ public class ExValidateLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_SHUTTLE.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipProductList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipProductList.java index e2ced450b3..562f88d22b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipProductList.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/vip/ReceiveVipProductList.java @@ -45,13 +45,11 @@ public class ReceiveVipProductList implements IClientOutgoingPacket } final Collection products = PrimeShopData.getInstance().getPrimeItems().values(); final PrimeShopGroup gift = PrimeShopData.getInstance().getVipGiftOfTier(_player.getVipTier()); - OutgoingPackets.RECIVE_VIP_PRODUCT_LIST.writeId(packet); packet.writeQ(_player.getAdena()); packet.writeQ(_player.getGoldCoin()); // Gold Coin Amount packet.writeQ(_player.getSilverCoin()); // Silver Coin Amount packet.writeC(1); // Show Reward tab - if (gift != null) { packet.writeD(products.size() + 1); @@ -61,7 +59,6 @@ public class ReceiveVipProductList implements IClientOutgoingPacket { packet.writeD(products.size()); } - for (PrimeShopGroup product : products) { writeProduct(product, packet); @@ -79,7 +76,6 @@ public class ReceiveVipProductList implements IClientOutgoingPacket buffer.writeC(product.getPanelType()); // NEW - 6; HOT - 5 ... Unk buffer.writeC(product.getVipTier()); buffer.writeC(10); - buffer.writeC(product.getItems().size()); for (PrimeShopItem item : product.getItems()) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java index 1d59c6d002..e7654ed911 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java @@ -60,7 +60,7 @@ public class AccountKicked implements IOutgoingPacket { OutgoingPackets.ACCOUNT_KICKED.writeId(packet); packet.writeD(_reason.getCode()); - return true; } } + diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 2e3a1f6163..1fe813e393 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: response + * Format: d d: response */ public class GGAuth implements IOutgoingPacket { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/network/serverpackets/Init.java index 4b3f71f30e..d725f45ca2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/network/serverpackets/Init.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/network/serverpackets/Init.java @@ -52,7 +52,6 @@ public class Init implements IOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.INIT.writeId(packet); - packet.writeD(_sessionId); // session id packet.writeD(0x0000c621); // protocol revision diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index 8c534554a8..f4dcd22b00 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: the failure reason + * Format: d d: the failure reason */ public class LoginFail implements IOutgoingPacket { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/BaseRecievePacket.java index c682cb741d..a6ed15ce32 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/BaseRecievePacket.java @@ -73,7 +73,7 @@ public abstract class BaseRecievePacket try { result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE); - result = result.substring(0, result.indexOf(0x00)); + result = result.substring(0, result.indexOf(0)); _off += (result.length() * 2) + 2; } catch (Exception e) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/BaseSendablePacket.java index a9d918de4c..8fa8491cbf 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/network/BaseSendablePacket.java @@ -117,16 +117,16 @@ public abstract class BaseSendablePacket public byte[] getBytes() { // if (this instanceof Init) - // writeD(0x00); // reserve for XOR initial key + // writeD(0); // reserve for XOR initial key - writeD(0x00); // reserve for checksum + writeD(0); // reserve for checksum final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++) { - writeC(0x00); + writeC(0); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/AttackType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/AttackType.java index 6064b10ed7..e9983f15e3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/AttackType.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/AttackType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum AttackType { - MISSED(0x01), - BLOCKED(0x02), - CRITICAL(0x04), - SHOT_USED(0x08); + MISSED(1), + BLOCKED(2), + CRITICAL(4), + SHOT_USED(8); private final int _mask; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/GroupType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/GroupType.java index 954aaace8b..916a14fd05 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/GroupType.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/GroupType.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum GroupType implements IUpdateTypeComponent { - NONE(0x01), - PARTY(0x02), - COMMAND_CHANNEL(0x04); + NONE(1), + PARTY(2), + COMMAND_CHANNEL(4); private int _mask; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/ItemListType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/ItemListType.java index 826ea9c671..09eaa1ca10 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/ItemListType.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/ItemListType.java @@ -23,10 +23,10 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum ItemListType implements IUpdateTypeComponent { - AUGMENT_BONUS(0x01), - ELEMENTAL_ATTRIBUTE(0x02), - ENCHANT_EFFECT(0x04), - VISUAL_ID(0x08); + AUGMENT_BONUS(1), + ELEMENTAL_ATTRIBUTE(2), + ENCHANT_EFFECT(4), + VISUAL_ID(8); private final int _mask; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java index b3d08596c6..29403b783d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum MacroUpdateType { - ADD(0x01), - LIST(0x01), - MODIFY(0x02), - DELETE(0x00); + ADD(1), + LIST(1), + MODIFY(2), + DELETE(0); private final int _id; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java index 86c6159869..7776721c0f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java @@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum PartySmallWindowUpdateType implements IUpdateTypeComponent { - CURRENT_CP(0x01), - MAX_CP(0x02), - CURRENT_HP(0x04), - MAX_HP(0x08), - CURRENT_MP(0x10), - MAX_MP(0x20), - LEVEL(0x40), - CLASS_ID(0x80), - PARTY_SUBSTITUTE(0x100), - VITALITY_POINTS(0x200); + CURRENT_CP(1), + MAX_CP(2), + CURRENT_HP(4), + MAX_HP(8), + CURRENT_MP(16), + MAX_MP(32), + LEVEL(64), + CLASS_ID(128), + PARTY_SUBSTITUTE(256), + VITALITY_POINTS(512); private final int _mask; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 00bb331778..667ce7f17c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.Broadcast; import org.l2jmobius.gameserver.util.Util; /** - * Fromat:(ch) dddddc + * Format:(ch) dddddc * @author -Wooden- */ public class RequestExMagicSkillUseGround implements IClientIncomingPacket diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java index 8744393432..033095e74d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java @@ -39,7 +39,6 @@ public class AbnormalStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ABNORMAL_STATUS_UPDATE.writeId(packet); - packet.writeH(_effects.size()); for (BuffInfo info : _effects) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 1b8ddb2042..bec794bef3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -44,7 +44,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; } @@ -60,7 +59,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; setHtml(html); } @@ -77,13 +75,11 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } - if (!html.contains(""; return; } - _html = html; } @@ -96,7 +92,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } - setHtml(content); return true; } @@ -138,12 +133,10 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { player.clearHtmlActions(getScope()); } - if (_disabledValidation) { return; } - if (player != null) { Util.buildHtmlActionCache(player, getScope(), _npcObjId, _html); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index 50240f97cf..de6012a9b7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -105,12 +105,10 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket= 0) || (item.getAttributeDefence(AttributeType.FIRE) > 0) || (item.getAttributeDefence(AttributeType.WATER) > 0) || (item.getAttributeDefence(AttributeType.WIND) > 0) || (item.getAttributeDefence(AttributeType.EARTH) > 0) || (item.getAttributeDefence(AttributeType.HOLY) > 0) || (item.getAttributeDefence(AttributeType.DARK) > 0)) { mask |= ItemListType.ELEMENTAL_ATTRIBUTE.getMask(); } - if (item.getEnchantOptions() != null) { for (int id : item.getEnchantOptions()) @@ -122,12 +120,10 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket 0) { mask |= ItemListType.VISUAL_ID.getMask(); } - return mask; } @@ -199,7 +195,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); packet.writeC(removeSkills.size()); for (Skill removed : removeSkills) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java index 8fa6259f64..6451dffd02 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ActionFailed implements IClientOutgoingPacket { public static final ActionFailed STATIC_PACKET = new ActionFailed(); - private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); + private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); static { for (SkillCastingType castingType : SkillCastingType.values()) @@ -57,7 +57,6 @@ public class ActionFailed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ACTION_FAIL.writeId(packet); - packet.writeD(_castingType); // MagicSkillUse castingType return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java index 6e868368c9..30ce58da60 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java @@ -44,9 +44,8 @@ public class AgitDecoInfo implements IClientOutgoingPacket { continue; } - packet.writeC(_residense.hasFunction(type) ? 0x01 : 0x00); + packet.writeC(_residense.hasFunction(type) ? 1 : 0); } - // Unknown packet.writeD(0); // TODO: Find me! packet.writeD(0); // TODO: Find me! diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java index 6cb71fc985..4683fb30f0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java @@ -44,7 +44,6 @@ public class AllianceInfo implements IClientOutgoingPacket _name = leader.getAllyName(); _leaderC = leader.getName(); _leaderP = leader.getLeaderName(); - final Collection allies = ClanTable.getInstance().getClanAllies(allianceId); _allies = new ClanInfo[allies.size()]; int idx = 0; @@ -57,7 +56,6 @@ public class AllianceInfo implements IClientOutgoingPacket total += ci.getTotal(); online += ci.getOnline(); } - _total = total; _online = online; } @@ -66,18 +64,16 @@ public class AllianceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_INFO.writeId(packet); - packet.writeS(_name); packet.writeD(_total); packet.writeD(_online); packet.writeS(_leaderC); packet.writeS(_leaderP); - packet.writeD(_allies.length); for (ClanInfo aci : _allies) { packet.writeS(aci.getClan().getName()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(aci.getClan().getLevel()); packet.writeS(aci.getClan().getLeaderName()); packet.writeD(aci.getTotal()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java index f9d08f6600..186fd12e81 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java @@ -44,7 +44,6 @@ public class AllyCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java index 6218f1717f..1ae4653f91 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java @@ -38,7 +38,6 @@ public class AskJoinAlly implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_ALLIANCE.writeId(packet); - packet.writeD(_requestorObjId); packet.writeS(null); // Ally Name ? packet.writeS(null); // TODO: Find me! diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java index a66bb3cd33..b9cfbe81b9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java @@ -39,7 +39,6 @@ public class AskJoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_PARTY.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 05c420ff59..227ab571be 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -45,7 +45,6 @@ public class Attack implements IClientOutgoingPacket _attackerObjId = attacker.getObjectId(); _attackerLoc = new Location(attacker); _targetLoc = new Location(target); - final Player player = attacker.getActingPlayer(); if (player == null) { @@ -111,7 +110,6 @@ public class Attack implements IClientOutgoingPacket final Iterator it = _hits.iterator(); final Hit firstHit = it.next(); OutgoingPackets.ATTACK.writeId(packet); - packet.writeD(_attackerObjId); packet.writeD(firstHit.getTargetId()); packet.writeD(_soulshotVisualSubstitute); // Ertheia @@ -121,13 +119,11 @@ public class Attack implements IClientOutgoingPacket packet.writeD(_attackerLoc.getX()); packet.writeD(_attackerLoc.getY()); packet.writeD(_attackerLoc.getZ()); - packet.writeH(_hits.size() - 1); while (it.hasNext()) { writeHit(packet, it.next()); } - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java index bd6878eb42..8b85fe85e3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java @@ -35,7 +35,6 @@ public class AutoAttackStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_START.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java index e767d1877a..a294b1e212 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java @@ -35,7 +35,6 @@ public class AutoAttackStop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_STOP.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java index 3f329415df..0c79677eae 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java @@ -38,7 +38,6 @@ public class BlockListPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BLOCK_LIST.writeId(packet); - packet.writeD(_playersId.size()); for (int playerId : _playersId) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index f610cdc6aa..d95f0543b9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -45,8 +45,7 @@ public class BuyList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x00); // Type BUY + packet.writeD(0); // Type BUY packet.writeQ(_money); // current money packet.writeD(_listId); packet.writeD(_inventorySlots); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index cd25af908d..7cb2bf4425 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -50,36 +50,34 @@ public class BuyListSeed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BUY_LIST_SEED.writeId(packet); - packet.writeQ(_money); // current money - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeD(_manorId); // manor id - if (!_list.isEmpty()) { packet.writeH(_list.size()); // list length for (SeedProduction s : _list) { - packet.writeC(0x00); // mask item 0 to print minimal item information + packet.writeC(0); // mask item 0 to print minimal item information packet.writeD(s.getId()); // ObjectId packet.writeD(s.getId()); // ItemId packet.writeC(0xFF); // T1 packet.writeQ(s.getAmount()); // Quantity - packet.writeC(0x05); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item - packet.writeC(0x00); // Filler (always 0) - packet.writeH(0x00); // Equipped : 00-No, 01-yes - packet.writeQ(0x00); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand - packet.writeH(0x00); // Enchant level (pet level shown in control item) + packet.writeC(5); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item + packet.writeC(0); // Filler (always 0) + packet.writeH(0); // Equipped : 00-No, 01-yes + packet.writeQ(0); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand + packet.writeH(0); // Enchant level (pet level shown in control item) packet.writeD(-1); packet.writeD(-9999); - packet.writeC(0x01); // GOD Item enabled = 1 disabled (red) = 0 + packet.writeC(1); // GOD Item enabled = 1 disabled (red) = 0 packet.writeQ(s.getPrice()); // price } _list.clear(); } else { - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java index 3a7b67af23..f3dc872dca 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java @@ -32,8 +32,7 @@ public class CSShowComBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - - packet.writeC(0x01); // c4 1 to show community 00 to hide + packet.writeC(1); // c4 1 to show community 00 to hide packet.writeB(_html); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java index eacc27aa07..b18dac4cc3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java @@ -36,7 +36,6 @@ public class CameraMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CAMERA_MODE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java index 1682f5bc62..adea754676 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java @@ -39,7 +39,6 @@ public class ChairSit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAIR_SIT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_staticObjectId); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java index 2bc31a285a..de141fa067 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java @@ -38,7 +38,6 @@ public class ChangeMoveType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_MOVE_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_running ? RUN : WALK); packet.writeD(0); // c2 diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index 73277d923d..fbe5e39e2e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -22,17 +22,17 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ChangeWaitType implements IClientOutgoingPacket { + public static final int WT_SITTING = 0; + public static final int WT_STANDING = 1; + public static final int WT_START_FAKEDEATH = 2; + public static final int WT_STOP_FAKEDEATH = 3; + private final int _objectId; private final int _moveType; private final int _x; private final int _y; private final int _z; - public static final int WT_SITTING = 0; - public static final int WT_STANDING = 1; - public static final int WT_START_FAKEDEATH = 2; - public static final int WT_STOP_FAKEDEATH = 3; - public ChangeWaitType(Creature creature, int newMoveType) { _objectId = creature.getObjectId(); @@ -46,7 +46,6 @@ public class ChangeWaitType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_WAIT_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_moveType); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index 41180bac50..aa2e7b2eaa 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -30,7 +30,6 @@ public class CharCreateFail implements IClientOutgoingPacket public static final int REASON_CREATE_NOT_ALLOWED = 0x05; // "Characters cannot be created from this server." public static final int REASON_CHOOSE_ANOTHER_SVR = 0x06; // "Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please // choose another server." - private final int _error; public CharCreateFail(int errorCode) @@ -42,7 +41,6 @@ public class CharCreateFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index f0e99885ad..768617e558 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -31,8 +31,7 @@ public class CharCreateOk implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_SUCCESS.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index bed289ca0a..1674eef343 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -33,7 +33,6 @@ public class CharDeleteFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_DELETE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 607352f62b..d11d416867 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -33,6 +33,22 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { + private static final int[] PAPERDOLL_ORDER = new int[] + { + Inventory.PAPERDOLL_UNDER, + Inventory.PAPERDOLL_HEAD, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_LHAND, + Inventory.PAPERDOLL_GLOVES, + Inventory.PAPERDOLL_CHEST, + Inventory.PAPERDOLL_LEGS, + Inventory.PAPERDOLL_FEET, + Inventory.PAPERDOLL_CLOAK, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_HAIR, + Inventory.PAPERDOLL_HAIR2 + }; + private final Player _player; private final Clan _clan; private int _objId; @@ -55,22 +71,6 @@ public class CharInfo implements IClientOutgoingPacket private int _vehicleId = 0; private final boolean _gmSeeInvis; - private static final int[] PAPERDOLL_ORDER = new int[] - { - Inventory.PAPERDOLL_UNDER, - Inventory.PAPERDOLL_HEAD, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_LHAND, - Inventory.PAPERDOLL_GLOVES, - Inventory.PAPERDOLL_CHEST, - Inventory.PAPERDOLL_LEGS, - Inventory.PAPERDOLL_FEET, - Inventory.PAPERDOLL_CLOAK, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_HAIR, - Inventory.PAPERDOLL_HAIR2 - }; - public CharInfo(Player player, boolean gmSeeInvis) { _player = player; @@ -119,16 +119,15 @@ public class CharInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); // Confirmed packet.writeD(_y); // Confirmed packet.writeD(_z); // Confirmed packet.writeD(_vehicleId); // Confirmed packet.writeD(_objId); // Confirmed packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed - packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) @@ -152,10 +151,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.getPvpFlag()); packet.writeD(_player.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -166,53 +163,40 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); - packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeS(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle()); - packet.writeD(_player.getAppearance().getVisibleClanId()); packet.writeD(_player.getAppearance().getVisibleClanCrestId()); packet.writeD(_player.getAppearance().getVisibleAllyId()); packet.writeD(_player.getAppearance().getVisibleAllyCrestId()); - - packet.writeC(_player.isSitting() ? 0x00 : 0x01); // Confirmed - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // Confirmed - packet.writeC(_player.isInCombat() ? 0x01 : 0x00); // Confirmed - - packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 0x01 : 0x00); // Confirmed - - packet.writeC(_player.isInvisible() ? 0x01 : 0x00); - + packet.writeC(_player.isSitting() ? 0 : 1); // Confirmed + packet.writeC(_player.isRunning() ? 1 : 0); // Confirmed + packet.writeC(_player.isInCombat() ? 1 : 0); // Confirmed + packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 1 : 0); // Confirmed + packet.writeC(_player.isInvisible() ? 1 : 0); packet.writeC(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount packet.writeC(_player.getPrivateStoreType().getId()); // Confirmed packet.writeH(_player.getCubics().size()); // Confirmed _player.getCubics().keySet().forEach(packet::writeH); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); // Confirmed packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); packet.writeH(_player.getRecomHave()); // Confirmed packet.writeD(_player.getMountNpcId() == 0 ? 0 : _player.getMountNpcId() + 1000000); - packet.writeD(_player.getClassId().getId()); // Confirmed - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeC(_player.isMounted() ? 0 : _enchantLevel); // Confirmed - packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeD(_player.getClanCrestLargeId()); packet.writeC(_player.isNoble() ? 1 : 0); // Confirmed packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed - final ILocational baitLocation = _player.getFishing().getBaitLocation(); if (baitLocation != null) { @@ -228,29 +212,21 @@ public class CharInfo implements IClientOutgoingPacket } packet.writeD(_player.getAppearance().getNameColor()); // Confirmed - packet.writeD(_heading); // Confirmed - packet.writeC(_player.getPledgeClass()); packet.writeH(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); // Confirmed - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - - packet.writeC(0x00); // nPvPRestrainStatus - + packet.writeC(0); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentHp())); // Confirmed packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - - packet.writeC(0x00); // cBRLectureMark + packet.writeC(0); // cBRLectureMark final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed @@ -262,8 +238,9 @@ public class CharInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } + packet.writeC(_player.isTrueHero() ? 100 : 0); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); // Hair accessory + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); // Hair accessory packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 7187b73184..11f5f4df52 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -40,17 +40,16 @@ public class CharSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTED.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getTitle()); packet.writeD(_sessionId); packet.writeD(_player.getClanId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x01); // active ?? + packet.writeD(1); // active ?? packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -62,25 +61,20 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_player.getReputation()); packet.writeD(_player.getPkKills()); packet.writeD(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_player.getClassId().getId()); - packet.writeB(new byte[16]); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeB(new byte[28]); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index d2aa2950f5..23a82c946f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -44,10 +44,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { private static final Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); - private final String _loginName; - private final int _sessionId; - private int _activeId; - private final List _characterPackages; private static final int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { @@ -62,6 +58,11 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_HAIR2, }; + private final String _loginName; + private final int _sessionId; + private int _activeId; + private final List _characterPackages; + /** * Constructor for CharSelectionInfo. * @param loginName @@ -92,16 +93,13 @@ public class CharSelectionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.size(); packet.writeD(size); // Created character count - packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) - packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 0x01 : 0x00); // if 1 can't create new char - packet.writeC(0x01); // 0=can't play, 1=can play free until level 85, 2=100% free play - packet.writeD(0x02); // if 1, Korean client - packet.writeC(0x00); // Balthus Knights, if 1 suggests premium account - + packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 1 : 0); // if 1 can't create new char + packet.writeC(1); // 0=can't play, 1=can play free until level 85, 2=100% free play + packet.writeD(2); // if 1, Korean client + packet.writeC(0); // Balthus Knights, if 1 suggests premium account long lastAccess = 0; if (_activeId == -1) { @@ -114,7 +112,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - for (int i = 0; i < size; i++) { final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); @@ -122,90 +119,73 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name packet.writeD(_sessionId); // Account ID - packet.writeD(0x00); // Clan ID - packet.writeD(0x00); // Builder level - + packet.writeD(0); // Clan ID + packet.writeD(0); // Builder level packet.writeD(charInfoPackage.getSex()); // Sex packet.writeD(charInfoPackage.getRace()); // Race packet.writeD(charInfoPackage.getBaseClassId()); - - packet.writeD(0x01); // GameServerName - + packet.writeD(1); // GameServerName packet.writeD(charInfoPackage.getX()); packet.writeD(charInfoPackage.getY()); packet.writeD(charInfoPackage.getZ()); packet.writeF(charInfoPackage.getCurrentHp()); packet.writeF(charInfoPackage.getCurrentMp()); - packet.writeQ(charInfoPackage.getSp()); packet.writeQ(charInfoPackage.getExp()); packet.writeF((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel()))); // High // Five packet.writeD(charInfoPackage.getLevel()); - packet.writeD(charInfoPackage.getReputation()); packet.writeD(charInfoPackage.getPkKills()); packet.writeD(charInfoPackage.getPvPKills()); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); // Ertheia - packet.writeD(0x00); // Ertheia - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); // Ertheia + packet.writeD(0); // Ertheia for (int slot : getPaperdollOrder()) { packet.writeD(charInfoPackage.getPaperdollItemId(slot)); } - for (int slot : getPaperdollOrderVisualId()) { packet.writeD(charInfoPackage.getPaperdollItemVisualId(slot)); } - packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_CHEST)); // Upper Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_LEGS)); // Lower Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_HEAD)); // Headgear enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_GLOVES)); // Gloves enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_FEET)); // Boots enchant level - packet.writeD(charInfoPackage.getHairStyle()); packet.writeD(charInfoPackage.getHairColor()); packet.writeD(charInfoPackage.getFace()); - packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); - packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption1Id() : 0); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption2Id() : 0); - // packet.writeD(charInfoPackage.getTransformId()); // Used to display Transformations - packet.writeD(0x00); // Currently on retail when you are on character select you don't see your transformation. - - packet.writeD(0x00); // Pet NpcId - packet.writeD(0x00); // Pet level - packet.writeD(0x00); // Pet Food - packet.writeD(0x00); // Pet Food Level - packet.writeF(0x00); // Current pet HP - packet.writeF(0x00); // Current pet MP - + packet.writeD(0); // Currently on retail when you are on character select you don't see your transformation. + packet.writeD(0); // Pet NpcId + packet.writeD(0); // Pet level + packet.writeD(0); // Pet Food + packet.writeD(0); // Pet Food Level + packet.writeF(0); // Current pet HP + packet.writeF(0); // Current pet MP packet.writeD(charInfoPackage.getVitalityPoints()); // Vitality packet.writeD((int) Config.RATE_VITALITY_EXP_MULTIPLIER * 100); // Vitality Percent packet.writeD(charInfoPackage.getVitalityItemsUsed()); // Remaining vitality item uses - packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0x00 : 0x01); // Char is active or not - packet.writeC(charInfoPackage.isNoble() ? 0x01 : 0x00); - packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 0x02 : 0x00); // Hero glow - packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 0x01 : 0x00); // Show hair accessory if enabled + packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0 : 1); // Char is active or not + packet.writeC(charInfoPackage.isNoble() ? 1 : 0); + packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 2 : 0); // Hero glow + packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 1 : 0); // Show hair accessory if enabled } return true; } @@ -214,7 +194,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); - try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate")) { @@ -227,7 +206,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (charInfopackage != null) { characterList.add(charInfopackage); - final Player player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { @@ -241,7 +219,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return characterList; } @@ -283,7 +260,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { clan.removeClanMember(objectId, 0); } - GameClient.deleteCharByObjId(objectId); return null; } @@ -302,20 +278,16 @@ public class CharSelectionInfo implements IClientOutgoingPacket charInfopackage.setHairStyle(chardata.getInt("hairstyle")); charInfopackage.setHairColor(chardata.getInt("haircolor")); charInfopackage.setSex(chardata.getInt("sex")); - charInfopackage.setExp(chardata.getLong("exp")); charInfopackage.setSp(chardata.getLong("sp")); charInfopackage.setVitalityPoints(chardata.getInt("vitality_points")); charInfopackage.setClanId(chardata.getInt("clanid")); - charInfopackage.setRace(chardata.getInt("race")); - final int baseClassId = chardata.getInt("base_class"); final int activeClassId = chardata.getInt("classid"); charInfopackage.setX(chardata.getInt("x")); charInfopackage.setY(chardata.getInt("y")); charInfopackage.setZ(chardata.getInt("z")); - final int faction = chardata.getInt("faction"); if (faction == 1) { @@ -325,7 +297,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setEvil(); } - if (Config.MULTILANG_ENABLE) { String lang = chardata.getString("language"); @@ -335,22 +306,18 @@ public class CharSelectionInfo implements IClientOutgoingPacket } charInfopackage.setHtmlPrefix("data/lang/" + lang + "/"); } - // if is in subclass, load subclass exp, sp, level info if (baseClassId != activeClassId) { loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId); } - charInfopackage.setClassId(activeClassId); - // Get the augmentation id for equipped weapon int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); if (weaponObjId < 1) { weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); } - if (weaponObjId > 0) { try (Connection con = DatabaseFactory.getConnection(); @@ -376,7 +343,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } - // Check if the base class is set to zero and also doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly. if ((baseClassId == 0) && (activeClassId > 0)) { @@ -386,7 +352,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setBaseClassId(baseClassId); } - charInfopackage.setDeleteTimer(deletetime); charInfopackage.setLastAccess(chardata.getLong("lastAccess")); charInfopackage.setNoble(chardata.getInt("nobless") == 1); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java index 847e24db87..d59df7911a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java @@ -32,7 +32,6 @@ public class ChooseInventoryItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHOOSE_INVENTORY_ITEM.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java index 12a3940521..ac66c2fa0f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java @@ -32,7 +32,6 @@ public class ClientSetTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CLIENT_SET_TIME.writeId(packet); - packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // time in client minutes packet.writeD(6); // constant to match the server time( this determines the speed of the client clock) return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java index 195824578b..5fdb62f544 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java @@ -68,7 +68,6 @@ public class ConfirmDlg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CONFIRM_DLG.writeId(packet); - final SMParam[] params = _systemMessage.getParams(); packet.writeD(_systemMessage.getId()); packet.writeD(params.length); @@ -130,7 +129,6 @@ public class ConfirmDlg implements IClientOutgoingPacket } } } - packet.writeD(_time); packet.writeD(_requesterId); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 2a98428740..85d5630327 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -71,7 +71,6 @@ public class CreatureSay implements IClientOutgoingPacket _mask |= 0x08; } } - // Does not shows level if (sender.isGM()) { @@ -123,7 +122,6 @@ public class CreatureSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_sender == null ? 0 : _sender.getObjectId()); packet.writeD(_chatType.getClientId()); if (_senderName != null) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index dfc40d995f..a307b06e4b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -38,9 +38,8 @@ public class DeleteObject implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DELETE_OBJECT.writeId(packet); - packet.writeD(_objectId); - packet.writeC(0x00); // c2 + packet.writeC(0); // c2 return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java index 982c8f3311..3b5917e55b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java @@ -50,7 +50,6 @@ public class Dice implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DICE.writeId(packet); - packet.writeD(_objectId); // object id of player packet.writeD(_itemId); // item id of dice (spade) 4625,4626,4627,4628 packet.writeD(_number); // number rolled diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 3d741a86a6..ebc93d0fc4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -68,7 +68,6 @@ public class Die implements IClientOutgoingPacket siegeClan = fort.getSiege().getAttackerClan(clan); isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan); } - _toVillage = creature.canRevive() && !creature.isPendingRevive(); _toClanHall = (clan != null) && (clan.getHideoutId() > 0); _toCastle = ((clan != null) && (clan.getCastleId() > 0)) || isInCastleDefense; @@ -76,7 +75,6 @@ public class Die implements IClientOutgoingPacket _useFeather = creature.getAccessLevel().allowFixedRes() || creature.getInventory().haveItemForSelfResurrection(); _toFortress = ((clan != null) && (clan.getFortId() > 0)) || isInFortDefense; } - _isSweepable = creature.isAttackable() && creature.isSweepActive(); } @@ -91,7 +89,6 @@ public class Die implements IClientOutgoingPacket { _items = new ArrayList<>(8); } - if (_items.size() < 8) { _items.add(itemId); @@ -116,20 +113,18 @@ public class Die implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DIE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_toVillage ? 0x01 : 0x00); - packet.writeD(_toClanHall ? 0x01 : 0x00); - packet.writeD(_toCastle ? 0x01 : 0x00); - packet.writeD(_toOutpost ? 0x01 : 0x00); - packet.writeD(_isSweepable ? 0x01 : 0x00); - packet.writeD(_useFeather ? 0x01 : 0x00); - packet.writeD(_toFortress ? 0x01 : 0x00); - packet.writeD(0x00); // Disables use Feather button for X seconds - packet.writeD(0x00); // Adventure's Song - packet.writeC(_hideAnimation ? 0x01 : 0x00); - - packet.writeD(_itemsEnabled ? 0x01 : 0x00); + packet.writeD(_toVillage ? 1 : 0); + packet.writeD(_toClanHall ? 1 : 0); + packet.writeD(_toCastle ? 1 : 0); + packet.writeD(_toOutpost ? 1 : 0); + packet.writeD(_isSweepable ? 1 : 0); + packet.writeD(_useFeather ? 1 : 0); + packet.writeD(_toFortress ? 1 : 0); + packet.writeD(0); // Disables use Feather button for X seconds + packet.writeD(0); // Adventure's Song + packet.writeC(_hideAnimation ? 1 : 0); + packet.writeD(_itemsEnabled ? 1 : 0); packet.writeD(getItems().size()); getItems().forEach(packet::writeD); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java index 15404f9dee..5837faec19 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java @@ -33,7 +33,6 @@ public class DoorInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_INFO.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.getId()); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java index 54f8742a73..14d41afee7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java @@ -33,7 +33,6 @@ public class DoorStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_STATUS_UPDATE.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.isOpen() ? 0 : 1); packet.writeD(_door.getDamage()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index 609968c3ac..d694b1c640 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -40,23 +40,20 @@ public class DropItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DROP_ITEM.writeId(packet); - packet.writeD(_objectId); packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeC(_item.isStackable() ? 0x01 : 0x00); + packet.writeC(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - - packet.writeC(0x00); - // packet.writeD(0x01); if above C == true (1) then packet.readD() + packet.writeC(0); + // packet.writeD(1); if above C == true (1) then packet.readD() packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java index 631c43ba0c..99bd80d97e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java @@ -62,13 +62,12 @@ public class Earthquake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EARTHQUAKE.writeId(packet); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_intensity); packet.writeD(_duration); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index db168592f1..335ea9dced 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -58,7 +58,6 @@ public class EnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_crystal); packet.writeQ(_count); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java index 837be1f5e3..169410245b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java @@ -41,7 +41,6 @@ public class EtcStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ETC_STATUS_UPDATE.writeId(packet); - packet.writeC(_player.getCharges()); // 1-7 increase force, level packet.writeD(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%) packet.writeC(_player.getExpertiseWeaponPenalty()); // Weapon Grade Penalty [1-4] diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java index 5dca90f960..9f8d576148 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java @@ -24,13 +24,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class Ex2ndPasswordAck implements IClientOutgoingPacket { + // TODO: Enum + public static final int SUCCESS = 0; + public static final int WRONG_PATTERN = 1; + private final int _status; private final int _response; - // TODO: Enum - public static final int SUCCESS = 0x00; - public static final int WRONG_PATTERN = 0x01; - public Ex2ndPasswordAck(int status, int response) { _status = status; @@ -41,10 +41,9 @@ public class Ex2ndPasswordAck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_ACK.writeId(packet); - packet.writeC(_status); - packet.writeD(_response == WRONG_PATTERN ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(_response == WRONG_PATTERN ? 1 : 0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java index 48bde5161d..c86b5185d0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordCheck implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_NEW = 0x00; - public static final int PASSWORD_PROMPT = 0x01; - public static final int PASSWORD_OK = 0x02; + public static final int PASSWORD_NEW = 0; + public static final int PASSWORD_PROMPT = 1; + public static final int PASSWORD_OK = 2; private final int _windowType; @@ -40,9 +40,8 @@ public class Ex2ndPasswordCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_CHECK.writeId(packet); - packet.writeD(_windowType); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java index 1abf50ab01..f6731bf18f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordVerify implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_OK = 0x00; - public static final int PASSWORD_WRONG = 0x01; - public static final int PASSWORD_BAN = 0x02; + public static final int PASSWORD_OK = 0; + public static final int PASSWORD_WRONG = 1; + public static final int PASSWORD_BAN = 2; private final int _wrongTentatives; private final int _mode; @@ -42,7 +42,6 @@ public class Ex2ndPasswordVerify implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_VERIFY.writeId(packet); - packet.writeD(_mode); packet.writeD(_wrongTentatives); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java index 55abf718c5..db551344ef 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java @@ -45,10 +45,8 @@ public class ExAbnormalStatusUpdateFromTarget implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ABNORMAL_STATUS_UPDATE_FROM_TARGET.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeH(_effects.size()); - for (BuffInfo info : _effects) { packet.writeD(info.getSkill().getDisplayId()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java index c4b9cd8356..f3abd6ec5c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java @@ -41,7 +41,6 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRABLE_SKILL_LIST_BY_CLASS.writeId(packet); - packet.writeH(_type.getId()); packet.writeH(_learnable.size()); for (SkillLearn skill : _learnable) @@ -54,7 +53,7 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket packet.writeC(skill.getRequiredItems().size()); if (_type == AcquireSkillType.SUBPLEDGE) { - packet.writeH(0x00); + packet.writeH(0); } } return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java index fd0e2fc97c..8555bb6e86 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java @@ -61,7 +61,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_SKILL_INFO.writeId(packet); - packet.writeD(_id); packet.writeD(_level); packet.writeQ(_spCost); @@ -73,7 +72,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket packet.writeD(holder.getId()); packet.writeQ(holder.getCount()); } - packet.writeD(_skillRem.size()); for (Skill skill : _skillRem) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java index 29793f4d6c..ff8c526ec4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java @@ -36,7 +36,6 @@ public class ExAdenaInvenCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ADENA_INVEN_COUNT.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeH(_player.getInventory().getSize()); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java index 2aa2d85bc5..5ef11e0f1e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java @@ -50,13 +50,11 @@ public class ExAirShipInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_INFO.writeId(packet); - packet.writeD(_ship.getObjectId()); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(_captain); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); @@ -73,14 +71,13 @@ public class ExAirShipInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - packet.writeD(_ship.getFuel()); packet.writeD(_ship.getMaxFuel()); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java index 4cfc76bfba..8b37f4fc0a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java @@ -42,7 +42,6 @@ public class ExAirShipStopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_airShipId); packet.writeD(_playerId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java index 33c57712da..52958f931b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java @@ -37,12 +37,10 @@ public class ExAirShipTeleportList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_TELEPORT_LIST.writeId(packet); - packet.writeD(_dockId); if (_teleports != null) { packet.writeD(_teleports.length); - for (int i = 0; i < _teleports.length; i++) { packet.writeD(i - 1); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java index 392b228f0d..7918022c72 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java @@ -50,13 +50,12 @@ public class ExAlchemySkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_SKILL_LIST.writeId(packet); - packet.writeD(_skills.size()); for (Skill skill : _skills) { packet.writeD(skill.getId()); packet.writeD(skill.getLevel()); - packet.writeQ(0x00); // Always 0 on Naia, SP i guess? + packet.writeQ(0); // Always 0 on Naia, SP i guess? packet.writeC(skill.getId() == CommonSkill.ALCHEMY_CUBE.getId() ? 0 : 1); // This is type in flash, visible or not } return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java index 3d7ee12a81..1990e1e701 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java @@ -37,7 +37,6 @@ public class ExAskCoupleAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_COUPLE_ACTION.writeId(packet); - packet.writeD(_actionId); packet.writeD(_objectId); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java index 61cabedd98..45615daf5a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java @@ -39,9 +39,8 @@ public class ExAskJoinMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_MPCC.writeId(packet); - packet.writeS(_requestorName); // name of CCLeader - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java index 17fa9d028f..908022ff7e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java @@ -38,7 +38,6 @@ public class ExAskJoinPartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_PARTY_ROOM.writeId(packet); - packet.writeS(_charName); packet.writeS(_roomName); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java index 2a6b958dc9..1551840013 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java @@ -38,7 +38,6 @@ public class ExAskModifyPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_MODIFY_PARTY_LOOTING.writeId(packet); - packet.writeS(_requestor); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java index 958e7c3d06..fa62c8a207 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java @@ -45,7 +45,6 @@ public class ExAttributeEnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ATTRIBUTE_ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeC(_isWeapon); packet.writeH(_type); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java index 1a3a1ef3fe..3d65055b3c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java @@ -41,9 +41,8 @@ public class ExAutoSoulShot implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AUTO_SOUL_SHOT.writeId(packet); - packet.writeD(_itemId); - packet.writeD(_enable ? 0x01 : 0x00); + packet.writeD(_enable ? 1 : 0); packet.writeD(_type); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java index 8680c6bd7a..a8137347ec 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java @@ -37,8 +37,7 @@ public class ExBaseAttributeCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASE_ATTRIBUTE_CANCEL_RESULT.writeId(packet); - - packet.writeD(0x01); // result + packet.writeD(1); // result packet.writeD(_objId); packet.writeD(_attribute); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java index acbad69599..27f7fb5a63 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java @@ -75,7 +75,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 1149, 1150, 1151, 1152, 1153, 1154, 1155 }; - public static final int[] DEFAULT_ACTION_LIST = { 0, 1, 2, 3, @@ -145,7 +144,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 5012, 5013, 5014, 5015 }; //@formatter:on - public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST); private final int[] _actionIds; @@ -159,7 +157,6 @@ public class ExBasicActionList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASIC_ACTION_LIST.writeId(packet); - packet.writeD(_actionIds.length); for (int _actionId : _actionIds) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java index 4c4fac8c91..d32dca4d21 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java @@ -34,13 +34,14 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBeautyItemList implements IClientOutgoingPacket { - private int _colorCount; - private final BeautyData _beautyData; - private final Map> _colorData = new HashMap<>(); private static final int HAIR_TYPE = 0; private static final int FACE_TYPE = 1; private static final int COLOR_TYPE = 2; + private int _colorCount; + private final BeautyData _beautyData; + private final Map> _colorData = new HashMap<>(); + public ExBeautyItemList(Player player) { _beautyData = BeautyShopData.getInstance().getBeautyData(player.getRace(), player.getAppearance().getSexType()); @@ -60,7 +61,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BEAUTY_ITEM_LIST.writeId(packet); - packet.writeD(HAIR_TYPE); packet.writeD(_beautyData.getHairList().size()); for (BeautyItem hair : _beautyData.getHairList().values()) @@ -72,7 +72,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(hair.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(FACE_TYPE); packet.writeD(_beautyData.getFaceList().size()); for (BeautyItem face : _beautyData.getFaceList().values()) @@ -84,7 +83,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(face.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(COLOR_TYPE); packet.writeD(_colorCount); for (Entry> entry : _colorData.entrySet()) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java index 1825236886..6d4c45cb2b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java @@ -34,7 +34,6 @@ public class ExBirthdayPopup implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_BIRTH_DAY.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java index 7d2f17e697..43e525f05f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java @@ -26,6 +26,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBrBroadcastEventState implements IClientOutgoingPacket { + public static final int APRIL_FOOLS = 20090401; + public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) + public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) + public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) + public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) + private final int _eventId; private final int _eventState; private int _param0; @@ -36,12 +42,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket private String _param5; private String _param6; - public static final int APRIL_FOOLS = 20090401; - public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) - public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) - public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) - public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) - public ExBrBroadcastEventState(int eventId, int eventState) { _eventId = eventId; @@ -65,7 +65,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BROADCAST_EVENT_STATE.writeId(packet); - packet.writeD(_eventId); packet.writeD(_eventState); packet.writeD(_param0); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java index 1fd7ec663a..c0683c8797 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java @@ -44,7 +44,6 @@ public class ExBrBuffEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUFF_EVENT_STATE.writeId(packet); - packet.writeD(_type); packet.writeD(_value); packet.writeD(_state); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java index 943aae8a62..8e009d7b09 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java @@ -43,7 +43,6 @@ public class ExBrLoadEventTopRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_LOAD_EVENT_TOP_RANKERS.writeId(packet); - packet.writeD(_eventId); packet.writeD(_day); packet.writeD(_count); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java index 6a98c01654..9105e39efe 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java @@ -36,9 +36,8 @@ public class ExBrPremiumState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PREMIUM_STATE.writeId(packet); - packet.writeD(_player.getObjectId()); - packet.writeC(_player.hasPremiumStatus() ? 0x01 : 0x00); + packet.writeC(_player.hasPremiumStatus() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 381dd859ad..567cfc70f9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -59,10 +59,8 @@ public class ExBuySellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x01); // Type SELL + packet.writeD(1); // Type SELL packet.writeD(_inventorySlots); - if ((_sellList != null)) { packet.writeH(_sellList.size()); @@ -74,9 +72,8 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - if ((_refundList != null) && !_refundList.isEmpty()) { packet.writeH(_refundList.size()); @@ -90,10 +87,9 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - - packet.writeC(_done ? 0x01 : 0x00); + packet.writeC(_done ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java index 2b43c0ce4b..e0ec81e0e7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java @@ -39,7 +39,6 @@ public class ExCastleState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CASTLE_STATE.writeId(packet); - packet.writeD(_castleId); packet.writeD(_castleSide.ordinal()); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java index b7f90d261b..a8196c7a83 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java @@ -52,7 +52,6 @@ public class ExChangeClientEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_CLIENT_EFFECT_INFO.writeId(packet); - packet.writeD(_type); packet.writeD(_key); packet.writeD(_value); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java index 472abc88df..eea59162ee 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java @@ -37,7 +37,6 @@ public class ExChangeNpcState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NPC_STATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java index 8cdcb4460d..45f2805517 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java @@ -49,7 +49,6 @@ public class ExChangePostState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_POST_STATE.writeId(packet); - packet.writeD(_receivedBoard ? 1 : 0); packet.writeD(_changedMsgIds.length); for (int postId : _changedMsgIds) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java index fc58ec9a2e..d765ab54e0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java @@ -35,7 +35,6 @@ public class ExChangeToAwakenedClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_TO_AWAKENED_CLASS.writeId(packet); - packet.writeD(_classId); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index f51a3eb3ae..1e9b8e9dc8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -47,7 +47,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket throw new IllegalArgumentException("Undefined Atribute item: " + stone); } _level = ElementalAttributeData.getInstance().getMaxElementLevel(_itemId); - // Register only items that can be put an attribute stone/crystal for (Item item : player.getInventory().getItems()) { @@ -62,7 +61,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_INVENTORY_ATTRIBUTE_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeQ(_count); packet.writeD(_atribute == AttributeType.FIRE ? 1 : 0); // Fire diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java index a272d85469..238882cd11 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java @@ -35,7 +35,6 @@ public class ExCloseMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java index d2ecd70952..877bca760a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java @@ -34,7 +34,6 @@ public class ExClosePartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_PARTY_ROOM.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java index 27c112776b..1d02c972b5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java @@ -54,7 +54,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLOSSEUM_FENCE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_clientState); packet.writeD(_x); @@ -62,7 +61,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_width); packet.writeD(_length); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java index 766d3619ad..b72bef93e8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java @@ -37,9 +37,8 @@ public class ExConfirmAddingContact implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AGIT_AUCTION_CMD.writeId(packet); - packet.writeS(_charName); - packet.writeD(_added ? 0x01 : 0x00); + packet.writeD(_added ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java index beded32254..c832d507ed 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameAddPlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x01); - + packet.writeD(1); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java index 5f36f730d0..847ea93e6a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java @@ -45,9 +45,7 @@ public class ExCubeGameChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java index 66abbf4b75..a2f2e61ded 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java @@ -43,12 +43,10 @@ public class ExCubeGameChangeTeam implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x05); - + packet.writeD(5); packet.writeD(_player.getObjectId()); - packet.writeD(_fromRedTeam ? 0x01 : 0x00); - packet.writeD(_fromRedTeam ? 0x00 : 0x01); + packet.writeD(_fromRedTeam ? 1 : 0); + packet.writeD(_fromRedTeam ? 0 : 1); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java index 5273b2099a..136b439283 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java @@ -39,9 +39,7 @@ public class ExCubeGameChangeTimeToStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x03); - + packet.writeD(3); packet.writeD(_seconds); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java index f81a302941..9bdba49029 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java @@ -35,7 +35,6 @@ public class ExCubeGameCloseUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0xffffffff); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java index 259a0e9407..3177e7a488 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java @@ -40,11 +40,9 @@ public class ExCubeGameEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x01); - - packet.writeD(_isRedTeamWin ? 0x01 : 0x00); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(1); + packet.writeD(_isRedTeamWin ? 1 : 0); + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java index 4d89e621ce..8b96bb545f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java @@ -55,14 +55,11 @@ public class ExCubeGameExtendedChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeD(_playerPoints); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java index e5a00f1ab7..c084789f13 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameRemovePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java index 00be884d2f..35a3f289d1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java @@ -35,8 +35,7 @@ public class ExCubeGameRequestReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x04); + packet.writeD(4); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java index 1bc89e0c32..8b755dd3cc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java @@ -30,7 +30,6 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket // Players Lists private final List _bluePlayers; private final List _redPlayers; - // Common Values private final int _roomNumber; @@ -51,12 +50,9 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_roomNumber); packet.writeD(0xffffffff); - packet.writeD(_bluePlayers.size()); for (Player player : _bluePlayers) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java index 2f2c092c08..d000112787 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java @@ -31,7 +31,6 @@ public class ExCursedWeaponList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet); - final Set ids = CursedWeaponsManager.getInstance().getCursedWeaponsIds(); packet.writeD(ids.size()); ids.forEach(packet::writeD); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java index 2f60a1b80c..5bc7ff3238 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java @@ -39,7 +39,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet); - if (!_cursedWeaponInfo.isEmpty()) { packet.writeD(_cursedWeaponInfo.size()); @@ -47,7 +46,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { packet.writeD(w.id); packet.writeD(w.activated); - packet.writeD(w.pos.getX()); packet.writeD(w.pos.getY()); packet.writeD(w.pos.getZ()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java index f475a02b28..0456fb9dae 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java @@ -34,7 +34,6 @@ public class ExDissmissMPCCRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DISSMISS_MPCC_ROOM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java index 258010f717..c731b7c7a9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java @@ -37,7 +37,6 @@ public class ExDuelAskStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_ASK_START.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDuel); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java index 043c82c0db..e9a31bee57 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java @@ -38,7 +38,6 @@ public class ExDuelEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_END.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java index 264409b3d6..e1fa1cea88 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java @@ -38,7 +38,6 @@ public class ExDuelReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_READY.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java index 488aafcb7d..ecdd528a16 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java @@ -38,7 +38,6 @@ public class ExDuelStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_START.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java index 7df040c5e7..5ed0c09675 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java @@ -36,7 +36,6 @@ public class ExDuelUpdateUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_UPDATE_USER_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeD(_player.getClassId().getId()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 7ab055a3d8..f58c0573a8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExEnchantSkillInfo implements IClientOutgoingPacket { private final Set _routes; - private final int _skillId; private final int _skillLevel; private final int _skillSubLevel; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 41368a8efb..e4ee350e64 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -50,7 +50,6 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_INFO_DETAIL.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java index 5cedcd6284..1d32f0d725 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java @@ -43,7 +43,6 @@ public class ExEnchantSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_LIST.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skills.size()); for (Skill skill : _skills) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java index 6ab5e869f2..853d74039f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java @@ -38,7 +38,6 @@ public class ExEnchantSkillResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_RESULT.writeId(packet); - packet.writeD(_enchanted ? 1 : 0); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java index 7b7d2d008d..410bf16510 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java @@ -42,7 +42,6 @@ public class ExEventMatchMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_EVENT_MATCH_MESSAGE.writeId(packet); - packet.writeC(_type); packet.writeS(_message); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java index 7264e90233..1946758bf5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java @@ -37,11 +37,9 @@ public class ExGetBookMarkInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOOK_MARK_INFO.writeId(packet); - - packet.writeD(0x00); // Dummy + packet.writeD(0); // Dummy packet.writeD(_player.getBookMarkSlot()); packet.writeD(_player.getTeleportBookmarks().size()); - for (TeleportBookmark tpbm : _player.getTeleportBookmarks()) { packet.writeD(tpbm.getId()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java index 36e7bb81af..201e8eb49b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java @@ -42,15 +42,14 @@ public class ExGetBossRecord implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOSS_RECORD.writeId(packet); - packet.writeD(_ranking); packet.writeD(_totalPoints); if (_bossRecordInfo == null) { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } else { @@ -59,7 +58,7 @@ public class ExGetBossRecord implements IClientOutgoingPacket { packet.writeD(entry.getKey()); packet.writeD(entry.getValue()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? } } return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java index ea0a5f8b18..85ccad0758 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java @@ -41,7 +41,6 @@ public class ExGetOffAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_OFF_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java index f8e16a4191..9a02e49223 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java @@ -39,7 +39,6 @@ public class ExGetOnAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_ON_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java index 51197344a5..704b3212a1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExGetPremiumItemList implements IClientOutgoingPacket { private final Player _player; - private final Map _map; public ExGetPremiumItemList(Player player) @@ -43,7 +42,6 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_PREMIUM_ITEM_LIST.writeId(packet); - packet.writeD(_map.size()); for (Entry entry : _map.entrySet()) { @@ -51,7 +49,7 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket packet.writeQ(entry.getKey()); packet.writeD(item.getItemId()); packet.writeQ(item.getCount()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeS(item.getSender()); } return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index a005fa8ad8..0200bdee08 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -40,7 +40,6 @@ public class ExHeroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HERO_LIST.writeId(packet); - packet.writeD(_heroList.size()); for (StatSet hero : _heroList.values()) { @@ -51,7 +50,7 @@ public class ExHeroList implements IClientOutgoingPacket packet.writeS(hero.getString(Hero.ALLY_NAME, "")); packet.writeD(hero.getInt(Hero.ALLY_CREST, 0)); packet.writeD(hero.getInt(Hero.COUNT)); - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index d5b5430142..0baca7cd86 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -48,8 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); - - packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade + packet.writeC(_hide ? 0 : 1); // Grand Crusade packet.writeD(_currentTemplateId); packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java index 81db66b88f..323c0cdf1e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java @@ -35,7 +35,6 @@ public class ExIsCharNameCreatable implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_IS_CHAR_NAME_CREATABLE.writeId(packet); - packet.writeD(_allowed); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java index ecc751eab3..45def9e0be 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java @@ -38,7 +38,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { throw new NullPointerException(); } - if (currentAuction.getAuctionState() != ItemAuctionState.STARTED) { _timeRemaining = 0; @@ -47,7 +46,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { _timeRemaining = (int) (currentAuction.getFinishingTimeRemaining() / 1000); // in seconds } - _refresh = refresh; _currentAuction = currentAuction; _nextAuction = nextAuction; @@ -57,16 +55,12 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_AUCTION_INFO.writeId(packet); - - packet.writeC(_refresh ? 0x00 : 0x01); + packet.writeC(_refresh ? 0 : 1); packet.writeD(_currentAuction.getInstanceId()); - final ItemAuctionBid highestBid = _currentAuction.getHighestBid(); packet.writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid()); - packet.writeD(_timeRemaining); writeItem(packet, _currentAuction.getItemInfo()); - if (_nextAuction != null) { packet.writeQ(_nextAuction.getAuctionInitBid()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java index 53ad8abd58..1c5e38cbab 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListMpccWaiting implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _rooms = new LinkedList<>(); @@ -53,7 +54,6 @@ public class ExListMpccWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_MPCC_WAITING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 78f2fec636..eafea24fa6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _players = new LinkedList<>(); @@ -60,7 +61,6 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(packet); - packet.writeD(_size); packet.writeD(_players.size()); for (Player player : _players) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java index 786c616875..c8723a9fc0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java @@ -46,7 +46,6 @@ public class ExMPCCPartyInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCPARTY_INFO_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_LeaderOID); packet.writeD(_memberCount); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java index 4bf07f0133..08259e4e6c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java @@ -37,7 +37,6 @@ public class ExMPCCPartymasterList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_PARTYMASTER_LIST.writeId(packet); - packet.writeD(_leadersName.size()); _leadersName.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java index abbdc8fe76..f021ef5f1f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java @@ -36,7 +36,6 @@ public class ExMPCCRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java index 154e156270..2eec590cb4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java @@ -41,7 +41,6 @@ public class ExMPCCRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java index 06e3027bfc..a0e9d0a4b0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java @@ -37,7 +37,6 @@ public class ExMPCCShowPartyMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCSHOW_PARTY_MEMBER_INFO.writeId(packet); - packet.writeD(_party.getMemberCount()); for (Player pc : _party.getMembers()) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java index e454a746f3..771b2f22cb 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java @@ -49,7 +49,6 @@ public class ExMagicAttackInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAGIC_ATTACK_INFO.writeId(packet); - packet.writeD(_caster); packet.writeD(_target); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java index 9cfbeb5aee..1aaa5b6520 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java @@ -35,7 +35,6 @@ public class ExMailArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAIL_ARRIVED.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java index 983ff22b92..48156c0600 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java @@ -44,7 +44,6 @@ public class ExManageMpccRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MANAGE_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java index f710c006e8..9d7d14211e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java @@ -45,7 +45,6 @@ public class ExMoveToLocationAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_objId); packet.writeD(_tx); packet.writeD(_ty); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java index 3e3bdc9fed..87e44b51cd 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java @@ -43,7 +43,6 @@ public class ExMoveToLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java index 7ab0d1c7da..3c1902892a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java @@ -40,11 +40,9 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet); - packet.writeS(_channel.getLeader().getName()); - packet.writeD(0x00); // Channel loot 0 or 1 + packet.writeD(0); // Channel loot 0 or 1 packet.writeD(_channel.getMemberCount()); - packet.writeD(_channel.getParties().size()); for (Party p : _channel.getParties()) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java index 1536bd5f9b..f2a32bb6e8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java @@ -43,7 +43,6 @@ public class ExNeedToChangeName implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEED_TO_CHANGE_NAME.writeId(packet); - packet.writeD(_type); packet.writeD(_subType); packet.writeS(_name); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java index be9bec8559..d18b4606b3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java @@ -35,7 +35,6 @@ public class ExNevitAdventEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CHANNELING_EFFECT.writeId(packet); - packet.writeD(_timeLeft); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java index 3a0367c178..09f6250f51 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java @@ -35,7 +35,6 @@ public class ExNevitAdventPointInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_AGATHION_ENERGY_INFO.writeId(packet); - packet.writeD(_points); // 72 = 1%, max 7200 = 100% return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java index 88fdaae499..ef220d86de 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java @@ -37,9 +37,8 @@ public class ExNevitAdventTimeChange implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - // state 0 - pause 1 - started - packet.writeC(_paused ? 0x00 : 0x01); + packet.writeC(_paused ? 0 : 1); // left time in ms max is 16000 its 4m and state is automatically changed to quit packet.writeD(_time); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java index fccdf510cc..4025bf78fa 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java @@ -34,7 +34,6 @@ public class ExNewSkillToLearnByLevelUp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEW_SKILL_TO_LEARN_BY_LEVEL_UP.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java index 324c18a517..f2ce8614dc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java @@ -43,8 +43,7 @@ public class ExNoticePostArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTICE_POST_ARRIVED.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java index afe3719d9b..050c7ccea5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java @@ -43,8 +43,7 @@ public class ExNoticePostSent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_WRITE_POST.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java index 5d98c20b09..e0bd08d39a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java @@ -30,7 +30,6 @@ public class ExNotifyPremiumItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_PREMIUM_ITEM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java index 6cb3724448..ba3c0cfeaa 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java @@ -34,7 +34,6 @@ public class ExOlympiadMatchEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MATCH_END.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java index 264d5aa484..7ffd5ed3bd 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java @@ -55,19 +55,15 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x00); // Type 0 = Match List, 1 = Match Result - + packet.writeD(0); // Type 0 = Match List, 1 = Match Result packet.writeD(_games.size()); - packet.writeD(0x00); - + packet.writeD(0); for (OlympiadGameTask curGame : _games) { final AbstractOlympiadGame game = curGame.getGame(); if (game != null) { packet.writeD(game.getStadiumId()); // Stadium Id (Arena 1 = 0) - if (game instanceof OlympiadGameNonClassed) { packet.writeD(1); @@ -80,8 +76,7 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket { packet.writeD(0); } - - packet.writeD(curGame.isRunning() ? 0x02 : 0x01); // (1 = Standby, 2 = Playing) + packet.writeD(curGame.isRunning() ? 2 : 1); // (1 = Standby, 2 = Playing) packet.writeS(game.getPlayerNames()[0]); // Player 1 Name packet.writeS(game.getPlayerNames()[1]); // Player 2 Name } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java index 712651603d..b387271fba 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java @@ -53,9 +53,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x01); // Type 0 = Match List, 1 = Match Result - + packet.writeD(1); // Type 0 = Match List, 1 = Match Result packet.writeD(_tie ? 1 : 0); // 0 - win, 1 - tie packet.writeS(_winnerList.get(0).getName()); packet.writeD(_winTeam); @@ -69,9 +67,8 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } - packet.writeD(_loseTeam); packet.writeD(_loserList.size()); for (OlympiadInfo info : _loserList) @@ -83,7 +80,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java index 34d81d1f53..712b9e06c6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java @@ -38,7 +38,6 @@ public class ExOlympiadMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MODE.writeId(packet); - packet.writeC(_mode); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java index ebea6c56f3..5b4f2c2523 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java @@ -53,7 +53,6 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_SPELLED_INFO.writeId(packet); - packet.writeD(_playerId); packet.writeD(_effects.size() + _effects2.size()); for (BuffInfo info : _effects) @@ -62,7 +61,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(info.getSkill().getDisplayId()); packet.writeH(info.getSkill().getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(info.getSkill().getAbnormalType().getClientId()); writeOptionalD(packet, info.getSkill().isAura() ? -1 : info.getTime()); } @@ -73,7 +72,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(skill.getDisplayId()); packet.writeH(skill.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(skill.getAbnormalType().getClientId()); packet.writeH(-1); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java index 18c34fe9de..ca473edfcf 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java @@ -76,7 +76,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_USER_INFO.writeId(packet); - if (_player != null) { packet.writeC(_player.getOlympiadSide()); @@ -91,7 +90,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket packet.writeS(_par.getName()); packet.writeD(_par.getBaseClass()); } - packet.writeD(_curHp); packet.writeD(_maxHp); packet.writeD(_curCp); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java index e84d0251bd..7ec64cc8c3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java @@ -35,7 +35,6 @@ public class ExOpenMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OPEN_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java index 90349cc1a2..5661dc9f57 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java @@ -56,7 +56,6 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PCCAFE_POINT_INFO.writeId(packet); - packet.writeD(_points); // num points packet.writeD(_mAddPoint); // points inc display packet.writeC(_mPeriodType); // period(0=don't show window,1=acquisition,2=use points) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java index f7e8b4a99a..248a2f7d98 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_ADD.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java index 832bee0012..1f452f4bae 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_DELETE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_summon.getSummonType()); packet.writeD(_summon.getOwner().getObjectId()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java index 0646a67001..703694fa2f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_UPDATE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 0e3edb3ea7..e4c6b79ae0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -47,7 +47,6 @@ public class ExPartyRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java index 2bffdec368..2ebf1dc7f0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPetInfo.java @@ -43,10 +43,8 @@ public class ExPetInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class ExPetInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class ExPetInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,9 +154,8 @@ public class ExPetInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -227,28 +205,24 @@ public class ExPetInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PET_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -267,7 +241,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -283,19 +257,19 @@ public class ExPetInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -307,20 +281,20 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -344,12 +318,12 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -379,12 +353,10 @@ public class ExPetInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java index 082f4c7662..0f72c05a3a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java @@ -34,7 +34,6 @@ public class ExPlayScene implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLAY_SCENE.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java index e98d317e14..7e3803bdaa 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java @@ -36,7 +36,6 @@ public class ExPledgeCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_COUNT.writeId(packet); - packet.writeD(_count); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java index 838029e284..4084de3481 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java @@ -38,7 +38,6 @@ public class ExPledgeDraftListSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_DRAFT_LIST_SEARCH.writeId(packet); - packet.writeD(_pledgeRecruitList.size()); for (PledgeWaitingInfo prl : _pledgeRecruitList) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java index fb956e9996..44e34004ea 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java @@ -25,11 +25,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExPledgeEmblem implements IClientOutgoingPacket { + private static final int TOTAL_SIZE = 65664; + private final int _crestId; private final int _clanId; private final byte[] _data; private final int _chunkId; - private static final int TOTAL_SIZE = 65664; public ExPledgeEmblem(int crestId, byte[] chunkedData, int clanId, int chunkId) { @@ -43,7 +44,6 @@ public class ExPledgeEmblem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clanId); packet.writeD(_crestId); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java index ed19bf976b..b32f8c0645 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitApplyInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_APPLY_INFO.writeId(packet); - packet.writeD(_status.ordinal()); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java index fc98b7b6f7..af4af9c9c1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitBoardDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_DETAIL.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClanId()); packet.writeD(_pledgeRecruitInfo.getKarma()); packet.writeS(_pledgeRecruitInfo.getInformation()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index b4d48373a6..eda808e754 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -34,7 +34,6 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket private final int _clanOnCurrentPage; private final int _startIndex; private final int _endIndex; - static final int CLAN_PER_PAGE = 12; public ExPledgeRecruitBoardSearch(List clanList, int currentPage) @@ -51,11 +50,9 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_SEARCH.writeId(packet); - packet.writeD(_currentPage); packet.writeD(_totalNumberOfPage); packet.writeD(_clanOnCurrentPage); - for (int i = _startIndex; i < _endIndex; i++) { packet.writeD(_clanList.get(i).getClanId()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 4ae5ffe316..b1f139226d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -40,7 +40,6 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java index 77080a3820..5844f220ec 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java @@ -39,7 +39,6 @@ public class ExPledgeWaitingList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST.writeId(packet); - packet.writeD(pledgePlayerRecruitInfos.size()); for (PledgeApplicantInfo recruitInfo : pledgePlayerRecruitInfos.values()) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java index a9245c1309..6b88572057 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java @@ -30,7 +30,6 @@ public class ExPledgeWaitingListAlarm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_ALARM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java index 60997b3da0..28c3967119 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java @@ -40,7 +40,6 @@ public class ExPledgeWaitingListApplied implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_APPLIED.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClan().getId()); packet.writeS(_pledgeRecruitInfo.getClan().getName()); packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java index 66a06892c2..1f53d1bb38 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java @@ -36,7 +36,6 @@ public class ExPledgeWaitingUser implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_USER.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getPlayerId()); packet.writeS(_pledgeRecruitInfo.getMessage()); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java index 49bc9b0995..5f404779f5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java @@ -43,7 +43,6 @@ public class ExPrivateStoreSetWholeMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_objectId); packet.writeS(_msg); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java index cb5e8fbce9..ff996b5d0c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutCommissionResultForVariationMake implements IClientOutgoingPac public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_COMMISSION_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_gemstoneObjId); packet.writeD(_itemId); packet.writeQ(_gemstoneCount); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java index 81721e921f..098472b7ae 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantScrollItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SCROLL_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java index 871f377db2..ffea182a49 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java index c47a4bcff4..8016e128f4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java index c8b46be499..95c0c0e4e1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_INTENSIVE_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_refinerItemObjId); packet.writeD(_lifestoneItemId); packet.writeD(_gemstoneItemId); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 2128b2b19f..2970ca00a2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -41,13 +41,12 @@ public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_CANCEL.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); packet.writeD(_itemAug1); packet.writeD(_itemAug2); packet.writeQ(_price); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java index 80541e65cd..c25dd16b01 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java @@ -34,10 +34,9 @@ public class ExPutItemResultForVariationMake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java index b739a94c55..c4d27d1728 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestItemList.java @@ -48,7 +48,6 @@ public class ExQuestItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java index fe5eb74eb0..bc8896164d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java @@ -56,13 +56,12 @@ public class ExQuestNpcLogList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_NPC_LOG_LIST.writeId(packet); - packet.writeD(_questId); packet.writeC(_npcLogList.size()); for (NpcLogListHolder holder : _npcLogList) { packet.writeD(holder.isNpcString() ? holder.getId() : holder.getId() + 1000000); - packet.writeC(holder.isNpcString() ? 0x01 : 0x00); + packet.writeC(holder.isNpcString() ? 1 : 0); packet.writeD(holder.getCount()); } return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java index 62d622caff..60616b256d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java @@ -35,7 +35,6 @@ public class ExRedSky implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RED_SKY.writeId(packet); - packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java index ce40b1a792..163faff855 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java @@ -36,7 +36,6 @@ public class ExRegenMax implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REGEN_MAX.writeId(packet); - packet.writeD(1); packet.writeD(_time); packet.writeD(_tickInterval); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java index d864795cd6..a17525576b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java @@ -34,7 +34,6 @@ public class ExRemoveEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REMOVE_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java index 29d5eafeef..77458fd485 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyPostItemList.java @@ -41,7 +41,6 @@ public class ExReplyPostItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_POST_ITEM_LIST.writeId(packet); - packet.writeD(_itemList.size()); for (Item item : _itemList) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 57ed88ac29..4e479e75a6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -56,7 +56,6 @@ public class ExReplyReceivedPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_RECEIVED_POST.writeId(packet); - packet.writeD(_msg.getMailType().ordinal()); // GOD if (_msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED) { @@ -76,11 +75,10 @@ public class ExReplyReceivedPost extends AbstractItemPacket } packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown packet.writeS(_msg.getSenderName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -92,9 +90,8 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeQ(_msg.getReqAdena()); packet.writeD(_msg.hasAttachments() ? 1 : 0); packet.writeD(_msg.isReturned() ? 1 : 0); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 75f6596194..ed490eae91 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -54,14 +54,12 @@ public class ExReplySentPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_SENT_POST.writeId(packet); - - packet.writeD(0x00); // GOD + packet.writeD(0); // GOD packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); packet.writeS(_msg.getReceiverName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -73,11 +71,11 @@ public class ExReplySentPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeQ(_msg.getReqAdena()); - packet.writeD(_msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(_msg.isReturned() ? 0x01 : 00); + packet.writeD(_msg.hasAttachments() ? 1 : 0); + packet.writeD(_msg.isReturned() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index cc4f7ce1d8..e6a3f9bca2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -35,7 +35,6 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java index 2634aa1cdd..60201b177f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java @@ -35,7 +35,6 @@ public class ExRequestHackShield implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REQUEST_HACK_SHIELD.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java index c51ff31d0b..75e3b3a945 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java @@ -29,13 +29,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyList implements IClientOutgoingPacket { + public static final int SHOW_FACESHAPE = 1; + public static final int SHOW_HAIRSTYLE = 0; + private final Player _player; private final int _type; private final Map _beautyItem; - public static final int SHOW_FACESHAPE = 1; - public static final int SHOW_HAIRSTYLE = 0; - public ExResponseBeautyList(Player player, int type) { _player = player; @@ -54,7 +54,6 @@ public class ExResponseBeautyList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java index ca2ed360ab..4b19201833 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java @@ -25,16 +25,15 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket { + public static final int FAILURE = 0; + public static final int SUCCESS = 1; + public static final int CHANGE = 0; + public static final int RESTORE = 1; + private final Player _player; private final int _type; private final int _result; - public static final int FAILURE = 0; - public static final int SUCCESS = 1; - - public static final int CHANGE = 0; - public static final int RESTORE = 1; - public ExResponseBeautyRegistReset(Player player, int type, int result) { _player = player; @@ -46,7 +45,6 @@ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_REGIST_RESET.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java index 0e313ef3b7..c0922cfb04 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java @@ -36,10 +36,8 @@ public class ExResponseResetList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_RESET_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); - packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java index 01fe1945ef..a230033d67 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java @@ -37,7 +37,6 @@ public class ExRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ROTATION.writeId(packet); - packet.writeD(_charId); packet.writeD(_heading); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index c58ccfc233..2646a71e77 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -36,7 +36,6 @@ public class ExRpItemLink extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RP_ITEM_LINK.writeId(packet); - writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java index 04556bbed2..f0c6eba8e9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java @@ -34,7 +34,6 @@ public class ExSearchOrc implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEARCH_ORC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index 1e06cc2a3f..7a4dced122 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -38,7 +38,6 @@ public class ExSendManorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_MANOR_LIST.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java index b63c69f37e..2c25cc8bfc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java @@ -124,7 +124,6 @@ public class ExSendUIEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_UIEVENT.writeId(packet); - packet.writeD(_objectId); packet.writeD(_type); // 0 = show, 1 = hide (there is 2 = pause and 3 = resume also but they don't work well you can only pause count down and you cannot resume it because resume hides the counter). packet.writeD(0); // unknown diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java index 4378479707..716a3e8623 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java @@ -385,16 +385,13 @@ public class ExServerPrimitive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SERVER_PRIMITIVE.writeId(packet); - packet.writeS(_name); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(65535); // has to do something with display range and angle packet.writeD(65535); // has to do something with display range and angle - packet.writeD(_points.size() + _lines.size()); - for (Point point : _points) { packet.writeC(1); // Its the type in this case Point @@ -408,7 +405,6 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(point.getY()); packet.writeD(point.getZ()); } - for (Line line : _lines) { packet.writeC(2); // Its the type in this case Line diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java index fb32e199b2..51fb91b643 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java @@ -46,7 +46,6 @@ public class ExSetCompassZoneCode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_COMPASS_ZONE_CODE.writeId(packet); - packet.writeD(_zoneType); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java index 1d0fbae3a4..34dee8bda0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java @@ -38,7 +38,6 @@ public class ExSetPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_PARTY_LOOTING.writeId(packet); - packet.writeD(_result); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java index 7b14ec8412..4e491af9d1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java @@ -34,7 +34,6 @@ public class ExShowAdventurerGuideBook implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_ADVENTURER_GUIDE_BOOK.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index 82554fdc5f..1f8df76083 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -39,7 +39,6 @@ public class ExShowAgitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AGIT_INFO.writeId(packet); - final Collection clanHalls = ClanHallData.getInstance().getClanHalls(); packet.writeD(clanHalls.size()); clanHalls.forEach(clanHall -> diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index dd11ee0150..51e6646ff5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -44,7 +44,6 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BASE_ATTRIBUTE_CANCEL_WINDOW.writeId(packet); - packet.writeD(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java index 14e55d39f3..e22345c4fd 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java @@ -25,13 +25,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExShowBeautyMenu implements IClientOutgoingPacket { - private final Player _player; - private final int _type; - // TODO: Enum public static final int MODIFY_APPEARANCE = 0; public static final int RESTORE_APPEARANCE = 1; + private final Player _player; + private final int _type; + public ExShowBeautyMenu(Player player, int type) { _player = player; @@ -42,7 +42,6 @@ public class ExShowBeautyMenu implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BEAUTY_MENU.writeId(packet); - packet.writeD(_type); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 15d011befc..b0d2b90494 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -41,7 +41,6 @@ public class ExShowCastleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CASTLE_INFO.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) @@ -65,8 +64,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } packet.writeD(castle.getTaxPercent(TaxType.BUY)); packet.writeD((int) (castle.getSiege().getSiegeDate().getTimeInMillis() / 1000)); - - packet.writeC(castle.getSiege().isInProgress() ? 0x01 : 0x00); // Grand Crusade + packet.writeC(castle.getSiege().isInProgress() ? 1 : 0); // Grand Crusade packet.writeC(castle.getSide().ordinal()); // Grand Crusade } return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java index aeb4079f3a..f9a6ebe0e7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java @@ -38,7 +38,6 @@ public class ExShowContactList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_SHOW_POST_FRIEND.writeId(packet); - packet.writeD(_contacts.size()); _contacts.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index a079ea3129..94b989b583 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -37,7 +37,6 @@ public class ExShowCropInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _crops = (nextPeriod && !manor.isManorApproved()) ? null : manor.getCropProcure(manorId, nextPeriod); } @@ -46,10 +45,9 @@ public class ExShowCropInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Crop Sales" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Crop Sales" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); + packet.writeD(0); if (_crops != null) { packet.writeD(_crops.size()); @@ -64,17 +62,17 @@ public class ExShowCropInfo implements IClientOutgoingPacket if (seed == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(seed.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(seed.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(seed.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index ebffd775d8..1f01ee7b87 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -62,10 +62,8 @@ public class ExShowCropSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getCropId()); // crop id diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index ee9fa9fd37..b625a1e4e7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -39,7 +39,6 @@ public class ExShowFortressInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_INFO.writeId(packet); - final Collection forts = FortManager.getInstance().getForts(); packet.writeD(forts.size()); for (Fort fort : forts) @@ -47,7 +46,7 @@ public class ExShowFortressInfo implements IClientOutgoingPacket final Clan clan = fort.getOwnerClan(); packet.writeD(fort.getResidenceId()); packet.writeS(clan != null ? clan.getName() : ""); - packet.writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00); + packet.writeD(fort.getSiege().isInProgress() ? 1 : 0); // Time of possession packet.writeD(fort.getOwnedTime()); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index f389b26ed5..678ab43e96 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -42,11 +42,9 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_MAP_INFO.writeId(packet); - packet.writeD(_fortress.getResidenceId()); packet.writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status packet.writeD(_fortress.getFortSize()); // barracks count - final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId()); if ((commanders != null) && !commanders.isEmpty() && _fortress.getSiege().isInProgress()) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 27da99cf41..da186103ae 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -51,7 +51,6 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_SIEGE_INFO.writeId(packet); - packet.writeD(_fortId); // Fortress Id packet.writeD(_size); // Total Barracks Count if (_csize > 0) @@ -64,22 +63,22 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { case 0: { - packet.writeD(0x03); + packet.writeD(3); break; } case 1: { - packet.writeD(0x02); + packet.writeD(2); break; } case 2: { - packet.writeD(0x01); + packet.writeD(1); break; } case 3: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -92,27 +91,27 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket // TODO: once control room supported, update packet.writeD(0x0x) to support 5th room case 0: { - packet.writeD(0x05); + packet.writeD(5); break; } case 1: { - packet.writeD(0x04); + packet.writeD(4); break; } case 2: { - packet.writeD(0x03); + packet.writeD(3); break; } case 3: { - packet.writeD(0x02); + packet.writeD(2); break; } case 4: { - packet.writeD(0x01); + packet.writeD(1); break; } } @@ -124,7 +123,7 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { for (int i = 0; i < _size; i++) { - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java index f7aca7dffd..912839e242 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java @@ -41,8 +41,7 @@ public class ExShowManorDefaultInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_MANOR_DEFAULT_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" and "Crop Sales" buttons + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" and "Crop Sales" buttons packet.writeD(_crops.size()); for (Seed crop : _crops) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 1d3312d668..d03ce2a5fd 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -52,10 +52,8 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet); - packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java index cf38d18c1c..f41999329f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java @@ -34,7 +34,6 @@ public class ExShowQuestInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_INFO.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java index 70f31e318f..0fa64c401d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java @@ -37,7 +37,6 @@ public class ExShowQuestMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_MARK.writeId(packet); - packet.writeD(_questId); packet.writeD(_questState); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index ab85228caf..1a6ee00a10 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ExShowReceivedPostList implements IClientOutgoingPacket { - private final List _inbox; - private static final int MESSAGE_FEE = 100; private static final int MESSAGE_FEE_PER_SLOT = 1000; + private final List _inbox; + public ExShowReceivedPostList(int objectId) { _inbox = MailManager.getInstance().getInbox(objectId); @@ -45,7 +45,6 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { @@ -64,18 +63,18 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getSenderName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); + packet.writeD(msg.isUnread() ? 1 : 0); packet.writeD(((msg.getMailType() == MailType.COMMISSION_ITEM_SOLD) || (msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED)) ? 0 : 1); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(msg.isReturned() ? 0x01 : 0x00); - packet.writeD(0x00); // SysString in some case it seems + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(msg.isReturned() ? 1 : 0); + packet.writeD(0); // SysString in some case it seems } } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(MESSAGE_FEE); packet.writeD(MESSAGE_FEE_PER_SLOT); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java index 9679468789..deebb99c8f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java @@ -33,6 +33,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; */ public class ExShowScreenMessage implements IClientOutgoingPacket { + // Positions + public static final byte TOP_LEFT = 1; + public static final byte TOP_CENTER = 2; + public static final byte TOP_RIGHT = 3; + public static final byte MIDDLE_LEFT = 4; + public static final byte MIDDLE_CENTER = 5; + public static final byte MIDDLE_RIGHT = 6; + public static final byte BOTTOM_CENTER = 7; + public static final byte BOTTOM_RIGHT = 8; + private final int _type; private final int _sysMessageId; private final int _unk1; @@ -48,15 +58,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket private List _parameters; // Localisation related. private String _lang; - // Positions - public static final byte TOP_LEFT = 0x01; - public static final byte TOP_CENTER = 0x02; - public static final byte TOP_RIGHT = 0x03; - public static final byte MIDDLE_LEFT = 0x04; - public static final byte MIDDLE_CENTER = 0x05; - public static final byte MIDDLE_RIGHT = 0x06; - public static final byte BOTTOM_CENTER = 0x07; - public static final byte BOTTOM_RIGHT = 0x08; public void setLang(String lang) { @@ -265,7 +266,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SCREEN_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -284,9 +284,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(sml.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -308,9 +308,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -318,7 +318,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket } } } - packet.writeD(_type); packet.writeD(_sysMessageId); packet.writeD(_position); @@ -326,9 +325,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java index 29ab5d355f..6123b08991 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java @@ -37,7 +37,6 @@ public class ExShowSeedInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _seeds = (nextPeriod && !manor.isManorApproved()) ? null : manor.getSeedProduction(manorId, nextPeriod); } @@ -46,16 +45,14 @@ public class ExShowSeedInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown if (_seeds == null) { packet.writeD(0); return true; } - packet.writeD(_seeds.size()); for (SeedProduction seed : _seeds) { @@ -67,17 +64,17 @@ public class ExShowSeedInfo implements IClientOutgoingPacket if (s == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(s.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(s.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(s.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java index e628099700..eb6e686e10 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java @@ -32,13 +32,10 @@ public class ExShowSeedMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_MAP_INFO.writeId(packet); - packet.writeD(2); // seed count - // Seed of Destruction packet.writeD(1); // id 1? Grand Crusade packet.writeD(2770 + GraciaSeedsManager.getInstance().getSoDState()); // sys msg id - // Seed of Infinity packet.writeD(2); // id 2? Grand Crusade // Manager not implemented yet diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index 4fd891a466..373c314eba 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -62,10 +62,8 @@ public class ExShowSeedSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getSeedId()); // seed id diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 1994402da2..269bec5b97 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -47,7 +47,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _cropsItems.put(cropId, item); } } - for (CropProcure crop : CastleManorManager.getInstance().getCropProcure(_manorId, false)) { if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) @@ -61,7 +60,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_cropsItems.size()); // size for (Item item : _cropsItems.values()) @@ -70,9 +68,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket packet.writeD(item.getObjectId()); // Object id packet.writeD(item.getId()); // crop id packet.writeD(seed.getLevel()); // seed level - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(1)); // reward 1 id - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(2)); // reward 2 id if (_castleCrops.containsKey(item.getId())) { @@ -85,9 +83,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket else { packet.writeD(0xFFFFFFFF); // manor - packet.writeQ(0x00); // buy residual - packet.writeQ(0x00); // buy price - packet.writeC(0x00); // reward + packet.writeQ(0); // buy residual + packet.writeQ(0); // buy price + packet.writeC(0); // reward } packet.writeQ(item.getCount()); // my crops } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index db4bccc928..b61d5b2301 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -40,7 +40,6 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { @@ -50,17 +49,17 @@ public class ExShowSentPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getReceiverName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); - packet.writeD(0x01); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(msg.isUnread() ? 1 : 0); + packet.writeD(1); + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(0); } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java index 0e4e9fd2ef..0dca57f2f8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java @@ -48,7 +48,6 @@ public class ExShowTerritory implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TERRITORY.writeId(packet); - packet.writeD(_vertices.size()); packet.writeD(_minZ); packet.writeD(_maxZ); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java index 4e284f82c5..86e1009bbf 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java @@ -46,7 +46,6 @@ public class ExShowTrace implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TRACE.writeId(packet); - packet.writeH(0); // type broken in H5 packet.writeD(0); // time broken in H5 packet.writeH(_locations.size()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java index 3245767ed7..836a5c9624 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java @@ -44,7 +44,6 @@ public class ExShowUsm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_USM.writeId(packet); - packet.writeD(_videoId); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java index 4acdffa842..1f1a14c31b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java @@ -34,7 +34,6 @@ public class ExShowVariationCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_CANCEL_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java index 3a2298019e..9870424e26 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java @@ -35,7 +35,6 @@ public class ExShowVariationMakeWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_MAKE_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java index 169827bab3..86211c8d97 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java @@ -44,10 +44,9 @@ public class ExSpawnEmitter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SPAWN_EMITTER.writeId(packet); - packet.writeD(_npcObjectId); packet.writeD(_playerObjectId); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java index 620800c1c4..534549b4fe 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java @@ -36,7 +36,6 @@ public class ExStartScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_START_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java index 0bd990cf34..babac59129 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java index 0e2689d598..d3e67afe99 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipObjId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java index 44b064113f..f5b3e1340f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java @@ -36,7 +36,6 @@ public class ExStopScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index 0b1e077353..7c8def3864 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -66,7 +66,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket } OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet); - packet.writeD(_inventory); packet.writeD(_warehouse); packet.writeD(_freight); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java index 3293a5b557..57563ca2f9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java @@ -39,7 +39,6 @@ public class ExSubPledgeSkillAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUB_PLEDGET_SKILL_ADD.writeId(packet); - packet.writeD(_type); packet.writeD(_skillId); packet.writeD(_skillLevel); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java index d61dfa20ab..816d6f16a6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java @@ -97,7 +97,6 @@ public class ExSubjobInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUBJOB_INFO.writeId(packet); - packet.writeC(_type); packet.writeD(_currClassId); packet.writeD(_currRace); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java index 85616016c7..b7a152629d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java @@ -38,7 +38,6 @@ public class ExTacticalSign implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TACTICAL_SIGN.writeId(packet); - packet.writeD(_target.getObjectId()); packet.writeD(_tokenId); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java index 3486e6281d..9e03a8bd0a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java @@ -39,7 +39,6 @@ public class ExTeleportToLocationActivate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_TO_LOCATION_ACTIVATE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java index a214c53a0f..7bcddd964d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java @@ -27,6 +27,7 @@ public class ExUISetting implements IClientOutgoingPacket { public static final String UI_KEY_MAPPING_VAR = "UI_KEY_MAPPING"; public static final String SPLIT_VAR = " "; + private final byte[] _uiKeyMapping; public ExUISetting(Player player) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java index 187770cfc8..eff4285a8b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java @@ -37,7 +37,6 @@ public class ExUnReadMailCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_UN_READ_MAIL_COUNT.writeId(packet); - packet.writeD(_mailUnreadCount); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java index f992b3c937..e59c651371 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java @@ -41,7 +41,6 @@ public class ExUseSharedGroupItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USE_SHARED_GROUP_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeD(_grpId); packet.writeD(_remainingTime); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java index 474fcc5208..f49d451587 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class ExUserInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getTransformationId()); - final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); final boolean isInvisible = _player.isInvisible(); packet.writeD(abnormalVisualEffects.size() + (isInvisible ? 1 : 0)); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java index b841449ab3..1069a64e3e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java @@ -36,12 +36,9 @@ public class ExUserInfoCubic implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_CUBIC.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(_player.getCubics().size()); - _player.getCubics().keySet().forEach(packet::writeH); - packet.writeD(_player.getAgathionId()); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java index 048986d108..7a0d1bfd74 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java @@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExUserInfoEquipSlot extends AbstractMaskPacket { private final Player _player; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -63,11 +62,9 @@ public class ExUserInfoEquipSlot extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_EQUIP_SLOT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(InventorySlot.values().length); packet.writeB(_masks); - final PlayerInventory inventory = _player.getInventory(); for (InventorySlot slot : InventorySlot.values()) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java index 3eb1cf9578..d655e48843 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java @@ -36,7 +36,6 @@ public class ExUserInfoInvenWeight implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_INVEN_WEIGHT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java index 91e0e92338..16aa81e9c0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java @@ -44,7 +44,6 @@ public class ExValidateLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java index 727267c9d5..50cb4025e4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java @@ -35,7 +35,6 @@ public class ExVariationCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_CANCEL_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java index 5cdc1b8d0e..4fde190ae2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java @@ -32,14 +32,13 @@ public class ExVariationResult implements IClientOutgoingPacket { _option1 = option1; _option2 = option2; - _success = success ? 0x01 : 0x00; + _success = success ? 1 : 0; } @Override public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_RESULT.writeId(packet); - packet.writeD(_option1); packet.writeD(_option2); packet.writeD(_success); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java index db0acfd5ff..60fb57c0b3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java @@ -41,10 +41,9 @@ public class ExVitalityEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_EFFECT_INFO.writeId(packet); - packet.writeD(_points); packet.writeD(_vitalityBonus); // Vitality Bonus - packet.writeH(0x00); // Vitality additional bonus in % + packet.writeH(0); // Vitality additional bonus in % packet.writeH(_vitalityItemsRemaining); // How much vitality items remaining for use packet.writeH(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java index 3cd9d26602..9a401c2321 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityPointInfo.java @@ -35,7 +35,6 @@ public class ExVitalityPointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_POINT_INFO.writeId(packet); - packet.writeD(_vitalityPoints); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java index 71baff96ea..c4c5539ca4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java @@ -45,7 +45,6 @@ public class ExVoteSystemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VOTE_SYSTEM_INFO.writeId(packet); - packet.writeD(_recomLeft); packet.writeD(_recomHave); packet.writeD(_bonusTime); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java index 21411f5abc..452b0dc43a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java @@ -37,7 +37,6 @@ public class ExWorldChatCnt implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_WORLD_CHAT_CNT.writeId(packet); - packet.writeD(_points); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java index 5f935fe0dc..dc9c2288f8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java @@ -79,19 +79,17 @@ public class FakePlayerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // vehicleId + packet.writeD(0); // vehicleId packet.writeD(_objId); packet.writeS(_npc.getName()); - packet.writeH(_npc.getRace().ordinal()); - packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 0x01 : 0x00); + packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 1 : 0); packet.writeD(_fpcHolder.getClassId()); - - packet.writeD(0x00); // Inventory.PAPERDOLL_UNDER + packet.writeD(0); // Inventory.PAPERDOLL_UNDER packet.writeD(_fpcHolder.getEquipHead()); packet.writeD(_fpcHolder.getEquipRHand()); packet.writeD(_fpcHolder.getEquipLHand()); @@ -103,28 +101,22 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_fpcHolder.getEquipRHand()); // dual hand packet.writeD(_fpcHolder.getEquipHair()); packet.writeD(_fpcHolder.getEquipHair2()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderAugument()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } - packet.writeC(_fpcHolder.getArmorEnchantLevel()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderVisualId()) { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeC(_npc.getScriptValue()); // getPvpFlag() packet.writeD(_npc.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -135,16 +127,12 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_npc.getCollisionRadius()); packet.writeF(_npc.getCollisionHeight()); - packet.writeD(_fpcHolder.getHair()); packet.writeD(_fpcHolder.getHairColor()); packet.writeD(_fpcHolder.getFace()); - packet.writeS(_npc.getTemplate().getTitle()); - if (_clan != null) { packet.writeD(_clan.getId()); @@ -154,71 +142,51 @@ public class FakePlayerInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - - packet.writeC(0x01); // isSitting() ? 0x00 : 0x01 (at some initial tests it worked) - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); - packet.writeC(_npc.isInCombat() ? 0x01 : 0x00); - - packet.writeC(_npc.isAlikeDead() ? 0x01 : 0x00); - - packet.writeC(_npc.isInvisible() ? 0x01 : 0x00); - - packet.writeC(0x00); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount - packet.writeC(0x00); // getPrivateStoreType().getId() - - packet.writeH(0x00); // getCubics().size() + packet.writeC(1); // isSitting() ? 0 : 1 (at some initial tests it worked) + packet.writeC(_npc.isRunning() ? 1 : 0); + packet.writeC(_npc.isInCombat() ? 1 : 0); + packet.writeC(_npc.isAlikeDead() ? 1 : 0); + packet.writeC(_npc.isInvisible() ? 1 : 0); + packet.writeC(0); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount + packet.writeC(0); // getPrivateStoreType().getId() + packet.writeH(0); // getCubics().size() // getCubics().keySet().forEach(packet::writeH); - packet.writeC(0x00); - + packet.writeC(0); packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : 0); packet.writeH(_fpcHolder.getRecommends()); - packet.writeD(0x00); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 - + packet.writeD(0); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 packet.writeD(_fpcHolder.getClassId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(_fpcHolder.getWeaponEnchantLevel()); // isMounted() ? 0 : _enchantLevel - packet.writeC(_npc.getTeam().getId()); - - packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0x00); + packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0); packet.writeC(_fpcHolder.getNobleLevel()); - packet.writeC(_fpcHolder.isHero() ? 0x01 : 0x00); - - packet.writeC(_fpcHolder.isFishing() ? 0x01 : 0x00); - + packet.writeC(_fpcHolder.isHero() ? 1 : 0); + packet.writeC(_fpcHolder.isFishing() ? 1 : 0); packet.writeD(_fpcHolder.getBaitLocationX()); packet.writeD(_fpcHolder.getBaitLocationY()); packet.writeD(_fpcHolder.getBaitLocationZ()); - packet.writeD(_fpcHolder.getNameColor()); - packet.writeD(_heading); - packet.writeC(_fpcHolder.getPledgeStatus()); - packet.writeH(0x00); // getPledgeType() - + packet.writeH(0); // getPledgeType() packet.writeD(_fpcHolder.getTitleColor()); - - packet.writeC(0x00); // isCursedWeaponEquipped - - packet.writeD(0x00); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 - packet.writeD(0x00); // getTransformationDisplayId() + packet.writeC(0); // isCursedWeaponEquipped + packet.writeD(0); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 + packet.writeD(0); // getTransformationDisplayId() packet.writeD(_fpcHolder.getAgathionId()); - - packet.writeC(0x00); - - packet.writeD(0x00); // getCurrentCp() + packet.writeC(0); + packet.writeD(0); // getCurrentCp() packet.writeD(_npc.getMaxHp()); packet.writeD((int) Math.round(_npc.getCurrentHp())); packet.writeD(_npc.getMaxMp()); packet.writeD((int) Math.round(_npc.getCurrentMp())); - - packet.writeC(0x00); + packet.writeC(0); final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) @@ -229,9 +197,9 @@ public class FakePlayerInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(0x00); // cocPlayer.getPosition() - packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 0x01 : 0x00); - packet.writeC(0x00); // Used Ability Points + packet.writeC(0); // cocPlayer.getPosition() + packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 1 : 0); + packet.writeC(0); // Used Ability Points return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java index ae088538da..03223c8a3e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java @@ -62,7 +62,6 @@ public class FlyToLocation implements IClientOutgoingPacket _destY = destY; _destZ = destZ; _type = type; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -82,7 +81,6 @@ public class FlyToLocation implements IClientOutgoingPacket _flySpeed = flySpeed; _flyDelay = flyDelay; _animationSpeed = animationSpeed; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -103,7 +101,6 @@ public class FlyToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FLY_TO_LOCATION.writeId(packet); - packet.writeD(_chaObjId); packet.writeD(_destX); packet.writeD(_destY); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java index 1e52b0ef72..471d70f791 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java @@ -35,8 +35,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x01); + packet.writeC(1); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index ef1d37297e..2ee6ffbcd9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -50,25 +50,24 @@ public class GMHennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GMHENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON packet.writeH(_player.getHennaValue(BaseStat.MEN)); // equip MEN packet.writeH(_player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeH(_player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeH(0x00); // equip LUC - packet.writeH(0x00); // equip CHA + packet.writeH(0); // equip LUC + packet.writeH(0); // equip CHA packet.writeD(3); // Slots packet.writeD(_hennas.size()); // Size for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java index 38ca4c7be0..59bf0d9d93 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java @@ -38,7 +38,6 @@ public class GMHide implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_HIDE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index 5e6fadd313..0c7a4684a5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -50,7 +50,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -69,8 +68,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getINT()); packet.writeD(_player.getWIT()); packet.writeD(_player.getMEN()); - packet.writeD(0x00); // LUC - packet.writeD(0x00); // CHA + packet.writeD(0); // LUC + packet.writeD(0); // CHA packet.writeD(_player.getMaxHp()); packet.writeD((int) _player.getCurrentHp()); packet.writeD(_player.getMaxMp()); @@ -79,28 +78,24 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); packet.writeD(_player.getPkKills()); - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollObjectId(slot)); } - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); } - for (int slot : getPaperdollOrder()) { final VariationInstance augment = _player.getInventory().getPaperdollAugmentation(slot); packet.writeD(augment != null ? augment.getOption1Id() : 0); // Confirmed packet.writeD(augment != null ? augment.getOption2Id() : 0); // Confirmed } - packet.writeC(_player.getInventory().getTalismanSlots()); // CT2.3 packet.writeC(_player.getInventory().canEquipCloak() ? 1 : 0); // CT2.3 - packet.writeD(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeH(0); packet.writeD(_player.getPAtk()); packet.writeD(_player.getPAtkSpd()); packet.writeD(_player.getPDef()); @@ -108,18 +103,14 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAccuracy()); packet.writeD(_player.getCriticalHit()); packet.writeD(_player.getMAtk()); - packet.writeD(_player.getMAtkSpd()); packet.writeD(_player.getPAtkSpd()); - packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicEvasionRate()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name packet.writeD(_player.getReputation()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -135,8 +126,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeD(_player.isGM() ? 0x01 : 0x00); // builder level - + packet.writeD(_player.isGM() ? 1 : 0); // builder level packet.writeS(_player.getTitle()); packet.writeD(_player.getClanId()); // pledge id packet.writeD(_player.getClanCrestId()); // pledge crest id @@ -146,26 +136,19 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeC(_player.hasDwarvenCraft() ? 1 : 0); packet.writeD(_player.getPkKills()); packet.writeD(_player.getPvpKills()); - packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); - - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeC(321); - packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window - - packet.writeC(_player.isNoble() ? 0x01 : 0x00); - packet.writeC(_player.isHero() ? 0x01 : 0x00); - + packet.writeC(_player.isNoble() ? 1 : 0); + packet.writeC(_player.isHero() ? 1 : 0); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); - final AttributeType attackAttribute = _player.getAttackElement(); packet.writeH(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); @@ -175,8 +158,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket } packet.writeD(_player.getFame()); packet.writeD(_player.getVitalityPoints()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index f212539af7..41f151be6f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -55,10 +55,9 @@ public class GMViewItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_ITEM_LIST.writeId(packet); - packet.writeS(_playerName); packet.writeD(_limit); // inventory limit - packet.writeH(0x01); // show window ?? + packet.writeH(1); // show window ?? packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index 1d88596096..552b6e6168 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -37,14 +37,12 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_player.getName()); packet.writeD(_clan.getId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); @@ -52,15 +50,14 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 packet.writeD(_clan.getAllyCrestId()); // c2 packet.writeD(_clan.isAtWar() ? 1 : 0); // c3 - packet.writeD(0x00); // T3 Unknown - + packet.writeD(0); // T3 Unknown packet.writeD(_clan.getMembers().size()); for (ClanMember member : _clan.getMembers()) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java index 93af10e254..3c155ff816 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -38,10 +38,8 @@ public class GMViewSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_SKILL_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_skills.size()); - final boolean isDisabled = (_player.getClan() != null) && (_player.getClan().getReputationScore() < 0); for (Skill skill : _skills) { @@ -49,7 +47,7 @@ public class GMViewSkillInfo implements IClientOutgoingPacket packet.writeH(skill.getDisplayLevel()); packet.writeH(skill.getSubLevel()); packet.writeD(skill.getDisplayId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(isDisabled && skill.isClanSkill() ? 1 : 0); packet.writeC(skill.isEnchantable() ? 1 : 0); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java index d8c273f914..449271993b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java @@ -35,7 +35,6 @@ public class GameGuardQuery implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GAME_GUARD_QUERY.writeId(packet); - packet.writeD(0x27533DD9); packet.writeD(0x2E72A51D); packet.writeD(0x2017038B); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index b0c011b696..037b2e6b6b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -35,10 +35,8 @@ public class GetItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ITEM.writeId(packet); - packet.writeD(_playerId); packet.writeD(_item.getObjectId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java index f8c6126c87..5f4d7bf3ca 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java @@ -50,7 +50,6 @@ public class GetOffVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_OFF_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java index ffa8d5f310..77d1e6ba28 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java @@ -45,7 +45,6 @@ public class GetOnVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ON_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java index e5dcb9ded6..b1f5b588f9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java @@ -44,14 +44,13 @@ public class GmViewQuestInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_QUEST_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeH(_questList.size()); // quest count - for (Quest quest : _questList) { final QuestState qs = _player.getQuestState(quest.getName()); packet.writeD(quest.getId()); packet.writeD(qs == null ? 0 : qs.getCond()); } - packet.writeH(0x00); // some size + packet.writeH(0); // some size // for size; ddQQ return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 9ab9f0a836..0b7edbbd7f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -51,7 +51,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeQ(_player.getAdena()); // activeChar current amount of Adena packet.writeD(3); // available equip slot packet.writeD(_hennaEquipList.size()); - for (Henna henna : _hennaEquipList) { // Player must have at least one dye in inventory @@ -62,7 +61,7 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); // item Id of the dye packet.writeQ(henna.getWearCount()); // amount of dyes required packet.writeQ(henna.getWearFee()); // amount of Adena required - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // meet the requirement or not } } return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 0e6e64c7b2..23364ad722 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -50,25 +50,24 @@ public class HennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON packet.writeH(_player.getHennaValue(BaseStat.MEN)); // equip MEN packet.writeH(_player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeH(_player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeH(0x00); // equip LUC - packet.writeH(0x00); // equip CHA + packet.writeH(0); // equip LUC + packet.writeH(0); // equip CHA packet.writeD(3 - _player.getHennaEmptySlots()); // Slots packet.writeD(_hennas.size()); // Size for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); } - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 658087380a..9a22f0a564 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -40,12 +40,11 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_ITEM_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getWearCount()); // total amount of dye require packet.writeQ(_henna.getWearFee()); // total amount of Adena require to draw symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to draw or not 0 is false and 1 is true + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to draw or not 0 is false and 1 is true packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() + _player.getHennaValue(BaseStat.INT)); // equip INT @@ -59,7 +58,7 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket packet.writeH(_player.getDEX() + _player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeD(_player.getWIT()); // current WIT packet.writeH(_player.getWIT() + _player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 3800940bac..162812f30b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -40,12 +40,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getCancelCount()); // total amount of dye require packet.writeQ(_henna.getCancelFee()); // total amount of Adena require to remove symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to remove or not + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to remove or not packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() - _player.getHennaValue(BaseStat.INT)); // equip INT @@ -59,11 +58,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket packet.writeH(_player.getDEX() - _player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeD(_player.getWIT()); // current WIT packet.writeH(_player.getWIT() - _player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeD(0x00); // current LUC - packet.writeH(0x00); // equip LUC - packet.writeD(0x00); // current CHA - packet.writeH(0x00); // equip CHA - packet.writeD(0x00); + packet.writeD(0); // current LUC + packet.writeH(0); // equip LUC + packet.writeD(0); // current CHA + packet.writeH(0); // equip CHA + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index a79c0f59f2..68e7ae6ccd 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -37,11 +37,9 @@ public class HennaRemoveList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); - packet.writeD(0x03); // seems to be max size + packet.writeD(3); // seems to be max size packet.writeD(3 - _player.getHennaEmptySlots()); - for (Henna henna : _player.getHennaList()) { if (henna != null) @@ -50,7 +48,7 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); packet.writeQ(henna.getCancelCount()); packet.writeQ(henna.getCancelFee()); - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); } } return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index 650261e010..9399a1626e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -62,14 +62,12 @@ public interface IClientOutgoingPacket extends IOutgoingPacket Inventory.PAPERDOLL_BROOCH_JEWEL5, Inventory.PAPERDOLL_BROOCH_JEWEL6 }; - int[] PAPERDOLL_ORDER_AUGMENT = new int[] { Inventory.PAPERDOLL_RHAND, Inventory.PAPERDOLL_LHAND, Inventory.PAPERDOLL_RHAND }; - int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 0c54e810f0..3378827f34 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -46,7 +46,6 @@ public class InventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index 8735b315b6..7912558f00 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -47,8 +47,7 @@ public class ItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.ITEM_LIST.writeId(packet); - - packet.writeH(_showWindow ? 0x01 : 0x00); + packet.writeH(_showWindow ? 1 : 0); packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java index b32b4df4a3..c3b9918230 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java @@ -32,9 +32,8 @@ public class JoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PARTY.writeId(packet); - packet.writeD(_response); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java index 65e06efeb7..f347f7efcd 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java @@ -32,7 +32,6 @@ public class JoinPledge implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PLEDGE.writeId(packet); - packet.writeD(_pledgeId); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index 96f6d7c34d..996622b9e9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -35,17 +35,16 @@ public class KeyPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VERSION_CHECK.writeId(packet); - packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok for (int i = 0; i < 8; i++) { packet.writeC(_key[i]); // key } - packet.writeD(0x01); + packet.writeD(1); packet.writeD(Config.SERVER_ID); // server id - packet.writeC(0x01); - packet.writeD(0x00); // obfuscation key - packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 0x01 : 0x00); // isClassic + packet.writeC(1); + packet.writeD(0); // obfuscation key + packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 1 : 0); // isClassic return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java index 484c10f0c4..62424fd03a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java @@ -40,7 +40,6 @@ public class L2FriendSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_SAY.writeId(packet); - packet.writeD(0); // ?? packet.writeS(_receiver); packet.writeS(_sender); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java index b875edb772..790d599b5b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java @@ -32,11 +32,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ListPartyWaiting implements IClientOutgoingPacket { + private static final int NUM_PER_PAGE = 64; + private final List _rooms = new LinkedList<>(); private final int _size; - private static final int NUM_PER_PAGE = 64; - public ListPartyWaiting(PartyMatchingRoomLevelType type, int location, int page, int requestorLevel) { final List rooms = MatchingRoomManager.getInstance().getPartyMathchingRooms(location, type, requestorLevel); @@ -57,7 +57,6 @@ public class ListPartyWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_PARTY_WATING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java index 4f8f9adc64..bb0ac61dbd 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java @@ -54,7 +54,6 @@ public class LoginFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LOGIN_FAIL.writeId(packet); - packet.writeD(_success); packet.writeD(_reason); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java index 18a522c315..6743e3e66f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java @@ -32,7 +32,6 @@ public class MagicSkillCanceld implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_CANCELED.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java index d56de10079..7ab29cc1a8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java @@ -66,7 +66,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // MagicSkillUse castingType packet.writeD(_objectId); packet.writeD(_skillId); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java index 3df8463279..a86626cfa6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java @@ -84,7 +84,6 @@ public class MagicSkillUse implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_USE.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // Casting bar type: 0 - default, 1 - default up, 2 - blue, 3 - green, 4 - red. packet.writeD(_creature.getObjectId()); packet.writeD(_target.getObjectId()); @@ -111,7 +110,7 @@ public class MagicSkillUse implements IClientOutgoingPacket packet.writeD(_target.getX()); packet.writeD(_target.getY()); packet.writeD(_target.getZ()); - packet.writeD(_actionId >= 0 ? 0x01 : 0x00); // 1 when ID from RequestActionUse is used + packet.writeD(_actionId >= 0 ? 1 : 0); // 1 when ID from RequestActionUse is used packet.writeD(_actionId >= 0 ? _actionId : 0); // ID from RequestActionUse. Used to set cooldown on summon skills. return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java index 6b710c692e..12e2488f24 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java @@ -37,11 +37,9 @@ public class ManagePledgePower implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet); - packet.writeD(_rank); packet.writeD(_action); packet.writeD(_clan.getRankPrivs(_rank).getBitmask()); - return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 95f4b6f201..4e2ab3f00b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -42,11 +42,9 @@ public class MonRaceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MON_RACE_INFO.writeId(packet); - packet.writeD(_unknown1); packet.writeD(_unknown2); - packet.writeD(0x08); - + packet.writeD(8); for (int i = 0; i < 8; i++) { packet.writeD(_monsters[i].getObjectId()); // npcObjectID @@ -68,7 +66,7 @@ public class MonRaceInfo implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java index 0093b3edc9..e6386921ff 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java @@ -45,13 +45,10 @@ public class MoveToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_xDst); packet.writeD(_yDst); packet.writeD(_zDst); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java index b1fb3ea003..59103c6c4c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java @@ -48,7 +48,6 @@ public class MoveToLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java index 30ff3c96af..aa261f924f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java @@ -50,11 +50,9 @@ public class MoveToPawn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_PAWN.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetId); packet.writeD(_distance); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index 89a6a19563..8f93a56d77 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -58,18 +58,16 @@ public class MultiSellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.MULTI_SELL_LIST.writeId(packet); - - packet.writeC(0x00); // Helios + packet.writeC(0); // Helios packet.writeD(_list.getId()); // list id - packet.writeC(0x00); // GOD Unknown + packet.writeC(0); // GOD Unknown packet.writeD(1 + (_index / PAGE_SIZE)); // page started from 1 - packet.writeD(_finished ? 0x01 : 0x00); // finished + packet.writeD(_finished ? 1 : 0); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - packet.writeC(0x00); // Grand Crusade - packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window - packet.writeD(0x20); // Helios - Always 32 - + packet.writeC(0); // Grand Crusade + packet.writeC(_list.isChanceMultisell() ? 1 : 0); // new multisell window + packet.writeD(32); // Helios - Always 32 while (_size-- > 0) { ItemInfo itemEnchantment = _list.getItemEnchantment(_index); @@ -86,20 +84,16 @@ public class MultiSellList extends AbstractItemPacket } } } - packet.writeD(_index); // Entry ID. Start from 1. packet.writeC(entry.isStackable() ? 1 : 0); - // Those values will be passed down to MultiSellChoose packet. packet.writeH(itemEnchantment != null ? itemEnchantment.getEnchantLevel() : 0); // enchant level writeItemAugment(packet, itemEnchantment); writeItemElemental(packet, itemEnchantment); - packet.writeC(0x00); - packet.writeC(0x00); - + packet.writeC(0); + packet.writeC(0); packet.writeH(entry.getProducts().size()); packet.writeH(entry.getIngredients().size()); - for (ItemChanceHolder product : entry.getProducts()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(product.getId()); @@ -121,10 +115,9 @@ public class MultiSellList extends AbstractItemPacket packet.writeD((int) Math.ceil(product.getChance())); // chance writeItemAugment(packet, displayItemEnchantment); writeItemElemental(packet, displayItemEnchantment); - packet.writeC(0x00); - packet.writeC(0x00); + packet.writeC(0); + packet.writeC(0); } - for (ItemChanceHolder ingredient : entry.getIngredients()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(ingredient.getId()); @@ -143,8 +136,8 @@ public class MultiSellList extends AbstractItemPacket packet.writeH(ingredient.getEnchantmentLevel() > 0 ? ingredient.getEnchantmentLevel() : displayItemEnchantment != null ? displayItemEnchantment.getEnchantLevel() : 0); // enchant level writeItemAugment(packet, displayItemEnchantment); writeItemElemental(packet, displayItemEnchantment); - packet.writeC(0x00); - packet.writeC(0x00); + packet.writeC(0); + packet.writeC(0); } } return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java index 6e85f5348c..cd46aac3aa 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java @@ -45,11 +45,10 @@ public class MyTargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MY_TARGET_SELECTED.writeId(packet); - - packet.writeD(0x01); // Grand Crusade + packet.writeD(1); // Grand Crusade packet.writeD(_objectId); packet.writeH(_color); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java index 1901ad1297..166c5c1e00 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java @@ -36,7 +36,6 @@ public class NewCharacterSuccess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NEW_CHARACTER_SUCCESS.writeId(packet); - packet.writeD(_chars.size()); for (PlayerTemplate chr : _chars) { @@ -44,31 +43,24 @@ public class NewCharacterSuccess implements IClientOutgoingPacket { continue; } - // TODO: Unhardcode these packet.writeD(chr.getRace().ordinal()); packet.writeD(chr.getClassId().getId()); - packet.writeD(99); packet.writeD(chr.getBaseSTR()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseDEX()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseCON()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseINT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseWIT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseMEN()); packet.writeD(1); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java index be1605f679..6061ea26ef 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java @@ -38,7 +38,6 @@ public class NicknameChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NICK_NAME_CHANGED.writeId(packet); - packet.writeD(_objectId); packet.writeS(_title); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index f9cd107e2c..3e4837b4a4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -54,24 +54,20 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public NpcHtmlMessage(int npcObjId, int itemId) { super(npcObjId); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } public NpcHtmlMessage(int npcObjId, int itemId, String html) { super(npcObjId, html); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } @@ -79,11 +75,10 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java index 61f195e35d..05489103cb 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java @@ -47,10 +47,8 @@ public class NpcInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -58,7 +56,6 @@ public class NpcInfo extends AbstractMaskPacket private int _clanId = 0; private int _statusMask = 0; private final Set _abnormalVisualEffects; - private String[] _localisation; public void setLang(String lang) @@ -101,112 +98,90 @@ public class NpcInfo extends AbstractMaskPacket { addComponentType(NpcInfoType.HEADING); } - if ((npc.getStat().getPAtkSpd() > 0) || (npc.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (npc.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((npc.getLeftHandItem() > 0) || (npc.getRightHandItem() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (npc.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (npc.getDisplayEffect() > 0) { addComponentType(NpcInfoType.DISPLAY_EFFECT); } - if (npc.isInsideZone(ZoneId.WATER) || npc.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (npc.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (npc.getCloneObjId() > 0) { addComponentType(NpcInfoType.CLONE); } - if (npc.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (npc.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (npc.getCurrentHp() <= npc.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (npc.getCurrentMp() <= npc.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (npc.getTemplate().isUsingServerSideName()) { addComponentType(NpcInfoType.NAME); } - if (npc.getTemplate().isUsingServerSideTitle() || (npc.isMonster() && (Config.SHOW_NPC_LEVEL || Config.SHOW_NPC_AGGRESSION)) || npc.isChampion() || npc.isTrap()) { addComponentType(NpcInfoType.TITLE); } - if (npc.getNameString() != null) { addComponentType(NpcInfoType.NAME_NPCSTRINGID); } - if (npc.getTitleString() != null) { addComponentType(NpcInfoType.TITLE_NPCSTRINGID); } - if (_npc.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (!_abnormalVisualEffects.isEmpty() || npc.isInvisible()) { addComponentType(NpcInfoType.ABNORMALS); } - if (npc.getEnchantEffect() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (npc.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (npc.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (npc.getClanId() > 0) { final Clan clan = ClanTable.getInstance().getClan(npc.getClanId()); @@ -220,14 +195,11 @@ public class NpcInfo extends AbstractMaskPacket addComponentType(NpcInfoType.CLAN); } } - addComponentType(NpcInfoType.COLOR_EFFECT); - if (npc.getPvpFlag() > 0) { addComponentType(NpcInfoType.PVP_FLAG); } - // TODO: Confirm me if (npc.isInCombat()) { @@ -245,8 +217,7 @@ public class NpcInfo extends AbstractMaskPacket { _statusMask |= 0x08; } - - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -296,27 +267,23 @@ public class NpcInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO.writeId(packet); - packet.writeD(_npc.getObjectId()); - packet.writeC(_npc.isShowSummonAnimation() ? 0x02 : 0x00); // // 0=teleported 1=default 2=summoned + packet.writeC(_npc.isShowSummonAnimation() ? 2 : 0); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 0x01 : 0x00); + packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { String title = _npc.getTitle(); - // Localisation related. if ((_localisation != null) && !_localisation[1].equals("")) { @@ -329,10 +296,8 @@ public class NpcInfo extends AbstractMaskPacket title = title.replace(NpcData.getInstance().getTemplate(_npc.getId()).getTitle(), _localisation[1]); } } - packet.writeS(title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -351,7 +316,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -366,20 +331,20 @@ public class NpcInfo extends AbstractMaskPacket if (containsMask(NpcInfoType.EQUIPPED)) { packet.writeD(_npc.getRightHandItem()); - packet.writeD(0x00); // Armor id? + packet.writeD(0); // Armor id? packet.writeD(_npc.getLeftHandItem()); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_npc.isDead() ? 0x00 : 0x01); + packet.writeC(_npc.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); + packet.writeC(_npc.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 0x01 : _npc.isFlying() ? 0x02 : 0x00); + packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -391,7 +356,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_npc.isFlying() ? 0x01 : 0x00); + packet.writeD(_npc.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { @@ -427,12 +392,12 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(0x00); // 2 - do some animation on spawn + packet.writeC(0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -464,12 +429,10 @@ public class NpcInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java index c95a8e5274..923e9cebad 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class NpcInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_npc.getObjectId()); packet.writeD(_npc.getTransformationDisplayId()); - final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size()); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java index a294edc57a..2a0ba41eeb 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java @@ -38,7 +38,6 @@ public class NpcQuestHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NPC_QUEST_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_questId); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java index d3328ade97..fc6d0d4a3a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java @@ -106,7 +106,6 @@ public class NpcSay implements IClientOutgoingPacket { _parameters = new ArrayList<>(); } - for (String item : params) { if ((item != null) && (item.length() > 0)) @@ -127,11 +126,9 @@ public class NpcSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_SAY.writeId(packet); - packet.writeD(_objectId); packet.writeD(_textType.getClientId()); packet.writeD(_npcId); - // Localisation related. if (_lang != null) { @@ -147,7 +144,6 @@ public class NpcSay implements IClientOutgoingPacket } } } - packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java index 356e3f48a9..ac61f9d247 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java @@ -33,11 +33,10 @@ public class ObservationMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_START.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me packet.writeD(0xc0); // TODO: Find me return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java index 5c0a0766b3..896ccea02b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java @@ -33,7 +33,6 @@ public class ObservationReturn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_END.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java index c2f7ab404f..173772c870 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java @@ -37,7 +37,6 @@ public class OnEventTrigger implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EVENT_TRIGGER.writeId(packet); - packet.writeD(_emitterId); packet.writeC(_enabled); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index d499719f31..70a51b2b0d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -44,7 +44,6 @@ public class PackageSendableList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet); - packet.writeD(_objectId); packet.writeQ(_adena); packet.writeD(_items.size()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java index a53f589386..e24d63f717 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java @@ -39,7 +39,6 @@ public class PackageToList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_TO_LIST.writeId(packet); - packet.writeD(_players.size()); for (Entry entry : _players.entrySet()) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 655c7abcd1..44b23b37f4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -55,7 +55,6 @@ public class PartyMemberPosition implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); - packet.writeD(locations.size()); for (Entry entry : locations.entrySet()) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java index 9e275ec246..c9d3595037 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java @@ -36,7 +36,6 @@ public class PartyRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java index b9c7d06769..8c97cac6b5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java @@ -36,12 +36,10 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ADD.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); // c3 packet.writeD(_party.getDistributionType().getId()); // c3 packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); - packet.writeD((int) _member.getCurrentCp()); // c4 packet.writeD(_member.getMaxCp()); // c4 packet.writeD((int) _member.getCurrentHp()); @@ -51,7 +49,7 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket packet.writeD(_member.getVitalityPoints()); packet.writeC(_member.getLevel()); packet.writeH(_member.getClassId().getId()); - packet.writeC(0x00); + packet.writeC(0); packet.writeH(_member.getRace().ordinal()); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java index 65d0c60c2e..5ad91f5463 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java @@ -37,21 +37,17 @@ public class PartySmallWindowAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ALL.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); packet.writeC(_party.getDistributionType().getId()); packet.writeC(_party.getMemberCount() - 1); - for (Player member : _party.getMembers()) { if ((member != null) && (member != _exclude)) { packet.writeD(member.getObjectId()); packet.writeS(member.getName()); - packet.writeD((int) member.getCurrentCp()); // c4 packet.writeD(member.getMaxCp()); // c4 - packet.writeD((int) member.getCurrentHp()); packet.writeD(member.getMaxHp()); packet.writeD((int) member.getCurrentMp()); @@ -59,7 +55,7 @@ public class PartySmallWindowAll implements IClientOutgoingPacket packet.writeD(member.getVitalityPoints()); packet.writeC(member.getLevel()); packet.writeH(member.getClassId().getId()); - packet.writeC(0x01); // Unk + packet.writeC(1); // Unk packet.writeH(member.getRace().ordinal()); final Summon pet = member.getPet(); packet.writeD(member.getServitors().size() + (pet != null ? 1 : 0)); // Summon size, one only atm diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java index 94a8a5a2ce..09ce132af4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java @@ -33,7 +33,6 @@ public class PartySmallWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_DELETE.writeId(packet); - packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java index c53c6c7779..e9ea2efbbe 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java @@ -42,7 +42,6 @@ public class PartySmallWindowUpdate extends AbstractMaskPacket _summon.getStat().getExp()) { packet.writeQ(_summon.getStat().getExp()); // 0% absolute value @@ -160,9 +148,7 @@ public class PetInfo implements IClientOutgoingPacket { packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value } - packet.writeQ(_summon.getExpForNextLevel()); // 100% absoulte value - packet.writeD(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight packet.writeD(_summon.getMaxLoad()); // max weight it can carry packet.writeD(_summon.getPAtk()); // patk @@ -178,25 +164,20 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD((int) _summon.getStat().getMoveSpeed()); // speed packet.writeD(_summon.getPAtkSpd()); // atkspeed packet.writeD(_summon.getMAtkSpd()); // casting speed - packet.writeC(0); // TODO: Check me, might be ride status packet.writeC(_summon.getTeam().getId()); // Confirmed packet.writeC(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed packet.writeC(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed - - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. - + packet.writeD(0); // TODO: Find me + packet.writeD(0); // "Transformation ID - Confirmed" - Used to bug Fenrir after 64 level. packet.writeC(_summon.getOwner().getSummonPoints()); // Used Summon Points packet.writeC(_summon.getOwner().getMaxSummonPoints()); // Maximum Summon Points - final Set aves = _summon.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeH(aves.size()); // Confirmed for (AbnormalVisualEffect ave : aves) { packet.writeH(ave.getClientId()); // Confirmed } - packet.writeC(_statusMask); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 5b43daa74b..1f60ec39d1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -46,7 +46,6 @@ public class PetInventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.PET_INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index e4cf35779f..16dc83b7ed 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -35,7 +35,6 @@ public class PetItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java index fdb00ddbb1..913f65d470 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusShow.java @@ -38,7 +38,6 @@ public class PetStatusShow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_SHOW.writeId(packet); - packet.writeD(_summonType); packet.writeD(_summonObjectId); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 25c2c74292..823a8c405a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -52,7 +52,6 @@ public class PetStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_UPDATE.writeId(packet); - packet.writeD(_summon.getSummonType()); packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getX()); @@ -69,7 +68,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket packet.writeQ(_summon.getStat().getExp()); packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value packet.writeQ(_summon.getExpForNextLevel()); // 100% absolute value - packet.writeD(0x01); // TODO: Find me! + packet.writeD(1); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java index 4bc3570779..0898b01f67 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PlaySound.java @@ -63,7 +63,6 @@ public class PlaySound implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLAY_SOUND.writeId(packet); - packet.writeD(_unknown1); // unknown 0 for quest and ship; packet.writeS(_soundFile); packet.writeD(_unknown3); // unknown 0 for quest; 1 for ship; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java index fbe57d4aaf..5108fe7e1b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeCrest.java @@ -44,7 +44,6 @@ public class PledgeCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java index aa11b1213e..6805f64d7c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeInfo.java @@ -34,7 +34,6 @@ public class PledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_INFO.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getId()); packet.writeS(_clan.getName()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java index 72f2c71838..193ee17589 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java @@ -36,12 +36,10 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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 - // clan or subpledge name if (_member.getPledgeType() != 0) { @@ -51,7 +49,6 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket { packet.writeS(_member.getClan().getName()); } - packet.writeS(_member.getApprenticeOrSponsorName()); // name of this member's apprentice/sponsor return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java index eefd482979..6aa5067c8f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java @@ -36,7 +36,6 @@ public class PledgeReceivePowerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_POWER_INFO.writeId(packet); - packet.writeD(_member.getPowerGrade()); // power grade packet.writeS(_member.getName()); packet.writeD(_member.getClan().getRankPrivs(_member.getPowerGrade()).getBitmask()); // privileges diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java index 818c38a076..01f71eea17 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java @@ -40,8 +40,7 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_SUB_PLEDGE_CREATED.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); packet.writeD(_subPledge.getId()); packet.writeS(_subPledge.getName()); packet.writeS(getLeaderName()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java index 4d0efeb82a..7649947064 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveWarList.java @@ -43,7 +43,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_RECEIVE_WAR_LIST.writeId(packet); - packet.writeD(_tab); // page packet.writeD(_clanList.size()); for (ClanWar clanWar : _clanList) @@ -53,7 +52,6 @@ public class PledgeReceiveWarList implements IClientOutgoingPacket { continue; } - packet.writeS(clan.getName()); packet.writeD(clanWar.getState().ordinal()); // type: 0 = Declaration, 1 = Blood Declaration, 2 = In War, 3 = Victory, 4 = Defeat, 5 = Tie, 6 = Error packet.writeD(clanWar.getRemainingTime()); // Time if friends to start remaining diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java index 2cbbdbf046..80d10fcb66 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java @@ -34,26 +34,25 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_INFO_UPDATE.writeId(packet); - // sending empty data so client will ask all the info in response ;) packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getLevel()); // clan level packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); // castle state ? + packet.writeD(0); // castle state ? packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); // clan reputation score - packet.writeD(0x00); // ? - packet.writeD(0x00); // ? + packet.writeD(0); // ? + packet.writeD(0); // ? packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); // c5 packet.writeD(_clan.getAllyCrestId()); // c5 packet.writeD(_clan.isAtWar() ? 1 : 0); // c5 - packet.writeD(0x00); // TODO: Find me! - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java index ae26e50dbb..2fa9f26d4a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java @@ -51,12 +51,11 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ADD.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); - packet.writeD(0x00); - packet.writeD(0x01); + packet.writeD(0); + packet.writeD(1); packet.writeD(_isOnline); // 1 = online 0 = offline packet.writeD(_pledgeType); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index c5ea7b284b..a1be315cf4 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -41,7 +41,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket { _clan = clan; _pledge = pledge; - _pledgeId = _pledge == null ? 0x00 : _pledge.getId(); + _pledgeId = _pledge == null ? 0 : _pledge.getId(); _leaderName = pledge == null ? clan.getLeaderName() : CharNameTable.getInstance().getNameById(pledge.getLeaderId()); _name = pledge == null ? clan.getName() : pledge.getName(); _members = _clan.getMembers(); @@ -65,31 +65,28 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(packet); - - packet.writeD(_isSubPledge ? 0x00 : 0x01); + packet.writeD(_isSubPledge ? 0 : 1); packet.writeD(_clan.getId()); packet.writeD(Config.SERVER_ID); packet.writeD(_pledgeId); packet.writeS(_name); packet.writeS(_leaderName); - packet.writeD(_clan.getCrestId()); // crest id .. is used again packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getHideoutId()); packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); // 0 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(0); // 0 packet.writeD(_clan.getAllyId()); packet.writeS(_clan.getAllyName()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.isAtWar() ? 1 : 0); // new c3 - packet.writeD(0x00); // Territory castle ID + packet.writeD(0); // Territory castle ID packet.writeD(_clan.getSubPledgeMembersCount(_pledgeId)); - for (ClanMember m : _members) { if (m.getPledgeType() != _pledgeId) @@ -107,8 +104,8 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket } else { - packet.writeD(0x01); // no visible effect - packet.writeD(0x01); // packet.writeD(1); + packet.writeD(1); // no visible effect + packet.writeD(1); // packet.writeD(1); } packet.writeD(m.isOnline() ? m.getObjectId() : 0); // objectId = online 0 = offline packet.writeD(m.getSponsor() != 0 ? 1 : 0); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java index 0fd387e419..154bcc610d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java @@ -32,7 +32,6 @@ public class PledgeShowMemberListDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_DELETE.writeId(packet); - packet.writeS(_player); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java index c61f412ed0..7b8c7c516b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java @@ -66,7 +66,6 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_level); packet.writeD(_classId); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java index 4e89797e45..09f70ea024 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java @@ -62,14 +62,14 @@ public class PledgeSkillList implements IClientOutgoingPacket { packet.writeD(sk.getDisplayId()); packet.writeH(sk.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } for (SubPledgeSkill sk : _subSkills) { packet.writeD(sk._subType); // Clan Sub-unit types packet.writeD(sk._skillId); packet.writeH(sk._skillLevel); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level } return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java index f3b8d4c26c..a94601294f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillListAdd.java @@ -37,7 +37,6 @@ public class PledgeSkillListAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_SKILL_LIST_ADD.writeId(packet); - packet.writeD(_id); packet.writeD(_level); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java index 9e1b4843ac..5f32f2bf54 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java @@ -33,15 +33,14 @@ public class PledgeStatusChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PLEDGE_STATUS_CHANGED.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_clan.getLeaderId()); packet.writeD(_clan.getId()); packet.writeD(_clan.getCrestId()); packet.writeD(_clan.getAllyId()); packet.writeD(_clan.getAllyCrestId()); packet.writeD(_clan.getCrestLargeId()); - packet.writeD(0x00); // pledge type ? + packet.writeD(0); // pledge type ? return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java index 5b56d0b28d..41d0f9f7d8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java @@ -44,12 +44,10 @@ public class PrivateStoreListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_LIST.writeId(packet); - packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(0x00); // Viewer's item count? + packet.writeD(0); // Viewer's item count? packet.writeD(_items.size()); - int slotNumber = 0; for (TradeItem item : _items) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java index 67b6ba8d94..d72050283e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java @@ -43,11 +43,10 @@ public class PrivateStoreListSell extends AbstractItemPacket else { OutgoingPackets.PRIVATE_STORE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD(_seller.getSellList().isPackaged() ? 1 : 0); packet.writeQ(_player.getAdena()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_seller.getSellList().getItems().size()); for (TradeItem item : _seller.getSellList().getItems()) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index bb462b6cd2..5e95f8b9b8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -43,17 +43,14 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MANAGE_LIST.writeId(packet); - packet.writeD(_objId); packet.writeQ(_playerAdena); - packet.writeD(_itemList.size()); // inventory items for potential buy for (Item item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(_buyList.size()); // count for all items already added for buy for (TradeItem item : _buyList) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java index 400307eb79..94ff06a790 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java @@ -45,18 +45,15 @@ public class PrivateStoreManageListSell extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MANAGE_LIST.writeId(packet); - packet.writeD(_objId); packet.writeD(_packageSale ? 1 : 0); // Package sell packet.writeQ(_playerAdena); - packet.writeD(_itemList.size()); // for potential sells for (TradeItem item : _itemList) { writeItem(packet, item); packet.writeQ(item.getItem().getReferencePrice() * 2); } - packet.writeD(_sellList.size()); // count for any items already added for sell for (TradeItem item : _sellList) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java index 8a5b9eef92..0d7bcbea16 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgBuy.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgBuy implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_BUY_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java index b00bd2add2..8fdb5701b8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreMsgSell.java @@ -38,7 +38,6 @@ public class PrivateStoreMsgSell implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PRIVATE_STORE_MSG.writeId(packet); - packet.writeD(_objId); packet.writeS(_storeMsg); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java index c3958367e8..5ddaa46ba0 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RadarControl.java @@ -40,7 +40,6 @@ public class RadarControl implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RADAR_CONTROL.writeId(packet); - packet.writeD(_showRadar); packet.writeD(_type); // maybe type packet.writeD(_x); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java index 3918894601..5d67413b6f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java @@ -43,10 +43,8 @@ public class RecipeBookItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_BOOK_ITEM_LIST.writeId(packet); - - packet.writeD(_isDwarvenCraft ? 0x00 : 0x01); // 0 = Dwarven - 1 = Common + packet.writeD(_isDwarvenCraft ? 0 : 1); // 0 = Dwarven - 1 = Common packet.writeD(_maxMp); - if (_recipes == null) { packet.writeD(0); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java index 59ec218c84..9f460fe896 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeItemMakeInfo.java @@ -55,11 +55,10 @@ public class RecipeItemMakeInfo implements IClientOutgoingPacket packet.writeD((int) _player.getCurrentMp()); packet.writeD(_player.getMaxMp()); packet.writeD(_success ? 1 : 0); // item creation success/failed - packet.writeC(0x00); - packet.writeQ(0x00); + packet.writeC(0); + packet.writeQ(0); return true; } - PacketLogger.info("Character: " + _player + ": Requested unexisting recipe with id = " + _id); return false; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java index 4474a37c03..f4db5be9df 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopItemInfo.java @@ -35,15 +35,14 @@ public class RecipeShopItemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { 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); - packet.writeQ(0x00); - packet.writeC(0x00); // Trigger offering window if 1 - packet.writeQ(0x00); + packet.writeQ(0); + packet.writeC(0); // Trigger offering window if 1 + packet.writeQ(0); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java index 75e45f5877..38b0b8ea4e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java @@ -43,7 +43,6 @@ public class RecipeShopManageList implements IClientOutgoingPacket { _recipes = _seller.getCommonRecipeBook(); } - if (_seller.hasManufactureShop()) { final Iterator it = _seller.getManufactureItems().values().iterator(); @@ -63,11 +62,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MANAGE_LIST.writeId(packet); - packet.writeD(_seller.getObjectId()); packet.writeD((int) _seller.getAdena()); - packet.writeD(_isDwarven ? 0x00 : 0x01); - + packet.writeD(_isDwarven ? 0 : 1); if (_recipes == null) { packet.writeD(0); @@ -83,10 +80,9 @@ public class RecipeShopManageList implements IClientOutgoingPacket packet.writeD(count); } } - if (!_seller.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -94,7 +90,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket for (ManufactureItem item : _seller.getManufactureItems().values()) { packet.writeD(item.getRecipeId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeQ(item.getCost()); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java index c025b5e4ed..2b9bc5b6e7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopMsg.java @@ -33,7 +33,6 @@ public class RecipeShopMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_MSG.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeS(_player.getStoreName()); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java index be8ae1181e..8b3cb42f47 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopSellList.java @@ -36,14 +36,13 @@ public class RecipeShopSellList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RECIPE_SHOP_SELL_LIST.writeId(packet); - packet.writeD(_manufacturer.getObjectId()); packet.writeD((int) _manufacturer.getCurrentMp()); // Creator's MP packet.writeD(_manufacturer.getMaxMp()); // Creator's MP packet.writeQ(_buyer.getAdena()); // Buyer Adena if (!_manufacturer.hasManufactureShop()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -51,7 +50,7 @@ public class RecipeShopSellList implements IClientOutgoingPacket for (ManufactureItem temp : _manufacturer.getManufactureItems().values()) { packet.writeD(temp.getRecipeId()); - packet.writeD(0x00); // unknown + packet.writeD(0); // unknown packet.writeQ(temp.getCost()); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 74700e29b0..269e14d50b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -88,7 +88,6 @@ public class RelationChanged implements IClientOutgoingPacket { return; } - final Relation r = new Relation(); r._objId = activeChar.getObjectId(); r._relation = relation; @@ -102,7 +101,6 @@ public class RelationChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RELATION_CHANGED.writeId(packet); - packet.writeC(_mask); if (_multi == null) { @@ -122,7 +120,6 @@ public class RelationChanged implements IClientOutgoingPacket private void writeRelation(PacketWriter packet, Relation relation) { packet.writeD(relation._objId); - if ((_mask & SEND_DEFAULT) != SEND_DEFAULT) { packet.writeD(relation._relation); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java index b4e9dc25c5..4477cfb705 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/RequestEnchant.java @@ -35,7 +35,6 @@ public class RequestEnchant implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java index 4ef15fb74c..7a0a6cbe58 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Revive.java @@ -33,7 +33,6 @@ public class Revive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.REVIVE.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java index 9c409601e3..b9ddf7733f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Ride.java @@ -42,7 +42,6 @@ public class Ride implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.RIDE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_mounted); packet.writeD(_rideType); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index 813ce03f4d..13ef62f55f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -49,11 +49,9 @@ public class SellListProcure implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SELL_LIST_PROCURE.writeId(packet); - packet.writeQ(_money); // money - packet.writeD(0x00); // lease ? + packet.writeD(0); // lease ? packet.writeH(_sellList.size()); // list size - for (Entry entry : _sellList.entrySet()) { final Item item = entry.getKey(); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java index baa37a8507..75b5b07854 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SendMacroList.java @@ -39,12 +39,10 @@ public class SendMacroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MACRO_LIST.writeId(packet); - packet.writeC(_updateType.getId()); - packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0x00); // modified, created or deleted macro's id + packet.writeD(_updateType != MacroUpdateType.LIST ? _macro.getId() : 0); // modified, created or deleted macro's id packet.writeC(_count); // count of Macros packet.writeC(_macro != null ? 1 : 0); // unknown - if ((_macro != null) && (_updateType != MacroUpdateType.DELETE)) { packet.writeD(_macro.getId()); // Macro ID @@ -52,9 +50,7 @@ public class SendMacroList implements IClientOutgoingPacket packet.writeS(_macro.getDescr()); // Desc packet.writeS(_macro.getAcronym()); // acronym packet.writeD(_macro.getIcon()); // icon - packet.writeC(_macro.getCommands().size()); // count - int i = 1; for (MacroCmd cmd : _macro.getCommands()) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java index 47fada25be..21622b5f19 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SendTradeRequest.java @@ -32,7 +32,6 @@ public class SendTradeRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_REQUEST.writeId(packet); - packet.writeD(_senderId); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java index 69aa749406..1513a0e3d1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ServerObjectInfo.java @@ -55,7 +55,6 @@ public class ServerObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SERVER_OBJECT_INFO.writeId(packet); - packet.writeD(_activeChar.getObjectId()); packet.writeD(_displayId + 1000000); packet.writeS(_name); // name @@ -70,8 +69,8 @@ public class ServerObjectInfo implements IClientOutgoingPacket packet.writeF(_collisionHeight); packet.writeD((int) (_isAttackable ? _activeChar.getCurrentHp() : 0)); packet.writeD(_isAttackable ? _activeChar.getMaxHp() : 0); - packet.writeD(0x01); // object type - packet.writeD(0x00); // special effects + packet.writeD(1); // object type + packet.writeD(0); // special effects return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java index 88b370ad8b..0164e5c4a2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SetSummonRemainTime.java @@ -34,7 +34,6 @@ public class SetSummonRemainTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SET_SUMMON_REMAIN_TIME.writeId(packet); - packet.writeD(_maxTime); packet.writeD(_remainingTime); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java index db28b72acf..016f5a0c9a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java @@ -38,7 +38,6 @@ public class ShopPreviewInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_INFO.writeId(packet); - packet.writeD(Inventory.PAPERDOLL_TOTALSLOTS); // Slots packet.writeD(getFromList(Inventory.PAPERDOLL_UNDER)); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java index df50db952f..a55186f551 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShopPreviewList.java @@ -51,11 +51,9 @@ public class ShopPreviewList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOP_PREVIEW_LIST.writeId(packet); - packet.writeD(5056); packet.writeQ(_money); // current money packet.writeD(_listId); - int newlength = 0; for (Product product : _list) { @@ -65,23 +63,20 @@ public class ShopPreviewList implements IClientOutgoingPacket } } packet.writeH(newlength); - for (Product product : _list) { if ((product.getItem().getCrystalType().getLevel() <= _expertise) && product.getItem().isEquipable()) { packet.writeD(product.getItemId()); packet.writeH(product.getItem().getType2()); // item type2 - if (product.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA) { packet.writeQ(product.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } else { - packet.writeQ(0x00); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand + packet.writeQ(0); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand } - packet.writeQ(Config.WEAR_PRICE); } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java index 298301ed0d..b13080ff28 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortBuffStatusUpdate.java @@ -40,7 +40,6 @@ public class ShortBuffStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_BUFF_STATUS_UPDATE.writeId(packet); - packet.writeD(_skillId); packet.writeH(_skillLevel); packet.writeH(_skillSubLevel); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index c6a67fb97c..b8624ce4cd 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -33,7 +33,6 @@ public class ShortCutInit implements IClientOutgoingPacket { return; } - _shortCuts = player.getAllShortCuts(); } @@ -41,24 +40,22 @@ public class ShortCutInit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_INIT.writeId(packet); - packet.writeD(_shortCuts.size()); for (Shortcut sc : _shortCuts) { packet.writeD(sc.getType().ordinal()); packet.writeD(sc.getSlot() + (sc.getPage() * 12)); - switch (sc.getType()) { case ITEM: { packet.writeD(sc.getId()); - packet.writeD(0x01); // Enabled or not + packet.writeD(1); // Enabled or not packet.writeD(sc.getSharedReuseGroup()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeQ(0x00); // Augment id - packet.writeD(0x00); // Visual id + packet.writeD(0); + packet.writeD(0); + packet.writeQ(0); // Augment id + packet.writeD(0); // Visual id break; } case SKILL: @@ -67,8 +64,8 @@ public class ShortCutInit implements IClientOutgoingPacket packet.writeH(sc.getLevel()); packet.writeH(sc.getSubLevel()); packet.writeD(sc.getSharedReuseGroup()); - packet.writeC(0x00); // C5 - packet.writeD(0x01); // C6 + packet.writeC(0); // C5 + packet.writeD(1); // C6 break; } case ACTION: @@ -77,7 +74,7 @@ public class ShortCutInit implements IClientOutgoingPacket case BOOKMARK: { packet.writeD(sc.getId()); - packet.writeD(0x01); // C6 + packet.writeD(1); // C6 } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java index 43d61af661..f099eab47e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutRegister.java @@ -37,7 +37,6 @@ public class ShortCutRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHORT_CUT_REGISTER.writeId(packet); - packet.writeD(_shortcut.getType().ordinal()); packet.writeD(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client switch (_shortcut.getType()) @@ -47,10 +46,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeD(_shortcut.getId()); packet.writeD(_shortcut.getCharacterType()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeD(0x00); // unknown - packet.writeD(0x00); // unknown - packet.writeD(0x00); // item augment id - packet.writeD(0x00); // TODO: Find me, item visual id ? + packet.writeD(0); // unknown + packet.writeD(0); // unknown + packet.writeD(0); // item augment id + packet.writeD(0); // TODO: Find me, item visual id ? break; } case SKILL: @@ -59,10 +58,10 @@ public class ShortCutRegister implements IClientOutgoingPacket packet.writeH(_shortcut.getLevel()); packet.writeH(_shortcut.getSubLevel()); packet.writeD(_shortcut.getSharedReuseGroup()); - packet.writeC(0x00); // C5 + packet.writeC(0); // C5 packet.writeD(_shortcut.getCharacterType()); - packet.writeD(0x00); // TODO: Find me - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me + packet.writeD(0); // TODO: Find me break; } case ACTION: diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java index d6f71b5f70..cfae3b3fad 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowBoard.java @@ -54,7 +54,6 @@ public class ShowBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - packet.writeC(_showBoard); // c4 1 to show community 00 to hide packet.writeS("bypass _bbshome"); // top packet.writeS("bypass _bbsgetfav"); // favorite diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java index 4b62a7001b..4d62e99d7a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowCalculator.java @@ -32,7 +32,6 @@ public class ShowCalculator implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_CALC.writeId(packet); - packet.writeD(_calculatorId); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java index 55f58d5375..4574762467 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowMiniMap.java @@ -32,9 +32,8 @@ public class ShowMiniMap implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_MINIMAP.writeId(packet); - packet.writeD(_mapId); - packet.writeC(0x00); // Seven Signs state + packet.writeC(0); // Seven Signs state return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java index 303eab4e8a..97100d09d2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java @@ -34,7 +34,6 @@ public class ShowPCCafeCouponShowUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_PCCAFE_COUPON_SHOW_UI.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java index d86958e586..0a0f3ae861 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ShowXMasSeal.java @@ -35,7 +35,6 @@ public class ShowXMasSeal implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_XMAS_SEAL.writeId(packet); - packet.writeD(_item); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java index 66eccc7fbf..1baa030c4d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeAttackerList.java @@ -28,9 +28,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = ca
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Attackers Clans?
* d = Number of Attackers Clans
* { //repeats
@@ -58,11 +58,10 @@ public class SiegeAttackerList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _castle.getSiege().getAttackerClans().size(); if (size > 0) { @@ -76,12 +75,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -90,8 +88,8 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index 5d5c831f14..8afd1f38ce 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -29,9 +29,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = 0xcb
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Defending Clans?
* d = Number of Defending Clans
* { //repeats
@@ -60,16 +60,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // Unknown - packet.writeD(0x01); // Unknown - packet.writeD(0x00); // Unknown - + packet.writeD(0); // Unknown + packet.writeD(1); // Unknown + packet.writeD(0); // Unknown final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0); packet.writeD(size); packet.writeD(size); - // Add owners final Clan ownerClan = _castle.getOwner(); if (ownerClan != null) @@ -78,14 +75,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket packet.writeS(ownerClan.getName()); packet.writeS(ownerClan.getLeaderName()); packet.writeD(ownerClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.OWNER.ordinal()); packet.writeD(ownerClan.getAllyId()); packet.writeS(ownerClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(ownerClan.getAllyCrestId()); } - // List of confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans()) { @@ -94,19 +90,17 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(defendingClan.getAllyCrestId()); } - // List of not confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans()) { @@ -115,12 +109,11 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER_PENDING.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 0a3fe46cb7..dfeefdaecf 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -59,13 +59,11 @@ public class SiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_INFO.writeId(packet); - if (_castle != null) { packet.writeD(_castle.getResidenceId()); - final int ownerId = _castle.getOwnerId(); - packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 0x01 : 0x00); + packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0); packet.writeD(ownerId); if (ownerId > 0) { @@ -89,7 +87,6 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { @@ -97,7 +94,7 @@ public class SiegeInfo implements IClientOutgoingPacket cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis()); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(Config.SIEGE_HOUR_LIST.size()); for (int hour : Config.SIEGE_HOUR_LIST) { @@ -108,7 +105,7 @@ public class SiegeInfo implements IClientOutgoingPacket else { packet.writeD((int) (_castle.getSiegeDate().getTimeInMillis() / 1000)); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index d11b3817c0..3c4c475339 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -51,12 +51,11 @@ public class SkillCoolTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SKILL_COOL_TIME.writeId(packet); - packet.writeD(_skillReuseTimeStamps.size()); for (TimeStamp ts : _skillReuseTimeStamps) { packet.writeD(ts.getSkillId()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD((int) ts.getReuse() / 1000); packet.writeD((int) Math.max(ts.getStamp() - _currentTime, 0) / 1000); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index de54232b51..ed4615c403 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -41,10 +41,9 @@ public class Snoop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SNOOP.writeId(packet); - packet.writeD(_convoId); packet.writeS(_name); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_type.getClientId()); packet.writeS(_speaker); packet.writeS(_msg); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java index 37827bdf6c..52f15519a5 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java @@ -37,10 +37,9 @@ public class SocialAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SOCIAL_ACTION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_actionId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index b93579e510..83438dff0e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -33,19 +33,18 @@ public class SpawnItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPAWN_ITEM.writeId(packet); - packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeD(_item.isStackable() ? 0x01 : 0x00); + packet.writeD(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java index ccae75b850..04f3ad716c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java @@ -110,7 +110,6 @@ public class SpecialCamera implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPECIAL_CAMERA.writeId(packet); - packet.writeD(_id); packet.writeD(_force); packet.writeD(_angle1); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java index cdd3821740..281756e793 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java @@ -34,7 +34,6 @@ public class StartPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_PLEDGE_WAR.writeId(packet); - packet.writeS(_playerName); packet.writeS(_pledgeName); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java index 48b4238eea..27fb4f606b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java @@ -38,7 +38,6 @@ public class StartRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_side); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java index b4f421df36..067bdeb082 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java @@ -72,7 +72,6 @@ public class StaticObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATIC_OBJECT.writeId(packet); - packet.writeD(_staticObjectId); packet.writeD(_objectId); packet.writeD(_type); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index 928b54aa48..40836e4af8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -46,7 +46,6 @@ public class StatusUpdate implements IClientOutgoingPacket public void addUpdate(StatusUpdateType type, int level) { _updates.put(type, level); - if (_isPlayable) { switch (type) @@ -75,10 +74,9 @@ public class StatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATUS_UPDATE.writeId(packet); - packet.writeD(_objectId); // casterId - packet.writeD(_isVisible ? _casterObjectId : 0x00); - packet.writeC(_isVisible ? 0x01 : 0x00); + packet.writeD(_isVisible ? _casterObjectId : 0); + packet.writeC(_isVisible ? 1 : 0); packet.writeC(_updates.size()); for (Entry entry : _updates.entrySet()) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java index 9919307366..cf2b71df5a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java @@ -53,7 +53,6 @@ public class StopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java index 50fdc3fe4c..78fdb5d70c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java @@ -43,7 +43,6 @@ public class StopMoveInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java index 9c828c3962..b254cad8b1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java @@ -34,7 +34,6 @@ public class StopPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java index b0392de226..ca69cd5346 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java @@ -36,7 +36,6 @@ public class StopRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FINISH_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_speed); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index c1feb37b2f..2d92796c75 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -43,10 +43,8 @@ public class SummonInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class SummonInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class SummonInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,11 +154,9 @@ public class SummonInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - // Show red aura? - // if (_statusMask != 0) + // if (_statusMask != 0x00) // { // addComponentType(NpcInfoType.VISUAL_STATE); // } @@ -229,28 +206,24 @@ public class SummonInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.SUMMON_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -269,7 +242,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -285,19 +258,19 @@ public class SummonInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -309,20 +282,20 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -346,12 +319,12 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -381,12 +354,10 @@ public class SummonInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java index 864462f76f..6f88551204 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java @@ -34,7 +34,6 @@ public class SurrenderPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SURRENDER_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 746b2da3f7..b509d599db 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -161,7 +161,6 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } - _params[_paramIndex++] = param; } @@ -267,7 +266,6 @@ public class SystemMessage implements IClientOutgoingPacket { return addString(item.getName()); } - append(new SMParam(TYPE_ITEM_NAME, id)); return this; } @@ -389,7 +387,6 @@ public class SystemMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SYSTEM_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -402,13 +399,12 @@ public class SystemMessage implements IClientOutgoingPacket params[i] = _params[i].getValue(); } packet.writeH(SystemMessageId.S1_2.getId()); - packet.writeC(0x01); + packet.writeC(1); packet.writeC(TYPE_TEXT); packet.writeS(sml.getLocalisation(params)); return true; } } - packet.writeH(getId()); packet.writeC(_params.length); for (SMParam param : _params) @@ -418,9 +414,7 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } - packet.writeC(param.getType()); - switch (param.getType()) { case TYPE_ELEMENT_NAME: diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java index a91da07e77..d357efbb0e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java @@ -47,13 +47,12 @@ public class TargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_SELECTED.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java index 3dadd249f6..3d7208c06f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java @@ -42,12 +42,11 @@ public class TargetUnselected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_UNSELECTED.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index 943b5078b6..13f9b9565a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -41,14 +41,13 @@ public class TeleportToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TELEPORT_TO_LOCATION.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // Fade 0, Instant 1. + packet.writeD(0); // Fade 0, Instant 1. packet.writeD(_heading); - packet.writeD(0x00); // Unknown. + packet.writeD(0); // Unknown. return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java index cb82f2da59..8d09576d9d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java @@ -32,7 +32,6 @@ public class TradeDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_DONE.writeId(packet); - packet.writeD(_num); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index 470ce757db..0635e50548 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -56,7 +56,6 @@ public class TradeStart extends AbstractItemPacket { _mask |= 0x08; } - // Does not shows level if (_partner.isGM()) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java index 0b92812a6f..aec0ace924 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java @@ -39,7 +39,6 @@ public class TradeUpdate extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_UPDATE.writeId(packet); - packet.writeH(1); packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2); writeItem(packet, _item); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java index c7102ca385..728020c0b1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java @@ -32,7 +32,6 @@ public class TutorialEnableClientEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_ENABLE_CLIENT_EVENT.writeId(packet); - packet.writeD(_eventId); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java index 92ac75afcf..7cc33a0f80 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java @@ -48,7 +48,6 @@ public class TutorialShowHtml extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_HTML.writeId(packet); - packet.writeD(_type); packet.writeS(getHtml()); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java index 75a57be38b..2ee62835db 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java @@ -37,7 +37,6 @@ public class TutorialShowQuestionMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_QUESTION_MARK.writeId(packet); - packet.writeC(_markType); packet.writeD(_markId); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index c9930f843b..a6a5ab7669 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -33,7 +33,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class UserInfo extends AbstractMaskPacket { private Player _player; - private int _relation; private int _runSpd; private int _walkSpd; @@ -47,14 +46,12 @@ public class UserInfo extends AbstractMaskPacket private int _enchantLevel; private int _armorEnchant; private String _title; - private final byte[] _masks = new byte[] { (byte) 0x00, (byte) 0x00, (byte) 0x00 }; - private int _initSize = 5; public UserInfo(Player player) @@ -78,6 +75,7 @@ public class UserInfo extends AbstractMaskPacket _enchantLevel = player.getInventory().getWeaponEnchant(); _armorEnchant = player.getInventory().getArmorMinEnchant(); _title = player.getTitle(); + if (player.isGM() && player.isInvisible()) { _title = "[Invisible]"; @@ -133,29 +131,25 @@ public class UserInfo extends AbstractMaskPacket } OutgoingPackets.USER_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_initSize); packet.writeH(23); packet.writeB(_masks); - if (containsMask(UserInfoType.RELATION)) { packet.writeD(_relation); } - if (containsMask(UserInfoType.BASIC_INFO)) { packet.writeH(16 + (_player.getAppearance().getVisibleName().length() * 2)); packet.writeString(_player.getName()); - packet.writeC(_player.isGM() ? 0x01 : 0x00); + packet.writeC(_player.isGM() ? 1 : 0); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } - if (containsMask(UserInfoType.BASE_STATS)) { packet.writeH(18); @@ -165,10 +159,9 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getINT()); packet.writeH(_player.getWIT()); packet.writeH(_player.getMEN()); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); } - if (containsMask(UserInfoType.MAX_HPCPMP)) { packet.writeH(14); @@ -176,7 +169,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMaxMp()); packet.writeD(_player.getMaxCp()); } - if (containsMask(UserInfoType.CURRENT_HPMPCP_EXP_SP)) { packet.writeH(38); @@ -187,32 +179,28 @@ public class UserInfo extends AbstractMaskPacket packet.writeQ(_player.getExp()); packet.writeF((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel()))); } - if (containsMask(UserInfoType.ENCHANTLEVEL)) { packet.writeH(4); packet.writeC(_enchantLevel); packet.writeC(_armorEnchant); } - if (containsMask(UserInfoType.APPAREANCE)) { packet.writeH(15); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); } - if (containsMask(UserInfoType.STATUS)) { packet.writeH(6); packet.writeC(_player.getMountType().ordinal()); packet.writeC(_player.getPrivateStoreType().getId()); packet.writeC(_player.hasDwarvenCraft() || (_player.getSkillLevel(248) > 0) ? 1 : 0); - packet.writeC(0x00); + packet.writeC(0); } - if (containsMask(UserInfoType.STATS)) { packet.writeH(56); @@ -231,18 +219,16 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); } - if (containsMask(UserInfoType.ELEMENTALS)) { packet.writeH(14); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); } - if (containsMask(UserInfoType.POSITION)) { packet.writeH(18); @@ -251,7 +237,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getZ()); packet.writeD(_player.isInVehicle() ? _player.getVehicle().getObjectId() : 0); } - if (containsMask(UserInfoType.SPEED)) { packet.writeH(18); @@ -264,28 +249,24 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_flyRunSpd); packet.writeH(_flyWalkSpd); } - if (containsMask(UserInfoType.MULTIPLIER)) { packet.writeH(18); packet.writeF(_moveMultiplier); packet.writeF(_player.getAttackSpeedMultiplier()); } - if (containsMask(UserInfoType.COL_RADIUS_HEIGHT)) { packet.writeH(18); packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); } - if (containsMask(UserInfoType.ATK_ELEMENTAL)) { packet.writeH(5); - packet.writeC(0x00); - packet.writeH(0x00); + packet.writeC(0); + packet.writeH(0); } - if (containsMask(UserInfoType.CLAN)) { packet.writeH(32 + (_title.length() * 2)); @@ -295,12 +276,11 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getClanCrestLargeId()); packet.writeD(_player.getClanCrestId()); packet.writeD(_player.getClanPrivileges().getBitmask()); - packet.writeC(_player.isClanLeader() ? 0x01 : 0x00); + packet.writeC(_player.isClanLeader() ? 1 : 0); packet.writeD(_player.getAllyId()); packet.writeD(_player.getAllyCrestId()); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); } - if (containsMask(UserInfoType.SOCIAL)) { packet.writeH(22); @@ -314,59 +294,52 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); } - if (containsMask(UserInfoType.VITA_FAME)) { packet.writeH(15); packet.writeD(_player.getVitalityPoints()); - packet.writeC(0x00); // Vita Bonus + packet.writeC(0); // Vita Bonus packet.writeD(_player.getFame()); packet.writeD(_player.getRaidbossPoints()); } - if (containsMask(UserInfoType.SLOTS)) { packet.writeH(9); packet.writeC(_player.getInventory().getTalismanSlots()); // Confirmed packet.writeC(_player.getInventory().getBroochJewelSlots()); // Confirmed packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeC(0x00); // (1 = Red, 2 = White, 3 = White Pink) dotted ring on the floor - packet.writeC(0x00); - packet.writeC(0x00); - packet.writeC(0x00); + packet.writeC(0); // (1 = Red, 2 = White, 3 = White Pink) dotted ring on the floor + packet.writeC(0); + packet.writeC(0); + packet.writeC(0); } - if (containsMask(UserInfoType.MOVEMENTS)) { packet.writeH(4); packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); - packet.writeC(_player.isRunning() ? 0x01 : 0x00); + packet.writeC(_player.isRunning() ? 1 : 0); } - if (containsMask(UserInfoType.COLOR)) { packet.writeH(10); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); } - if (containsMask(UserInfoType.INVENTORY_LIMIT)) { packet.writeH(9); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); packet.writeH(_player.getInventoryLimit()); packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); } - if (containsMask(UserInfoType.TRUE_HERO)) { packet.writeH(9); - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeC(_player.isTrueHero() ? 100 : 0x00); + packet.writeD(0); + packet.writeH(0); + packet.writeC(_player.isTrueHero() ? 100 : 0); } - return true; } @@ -383,7 +356,6 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x10; // Party leader } } - if (clan != null) { relation |= 0x20; // Clan member @@ -392,12 +364,10 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x40; // Clan leader } } - if (player.isInSiege()) { relation |= 0x80; // In siege } - return relation; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java index 283bcf1614..90c416726a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java @@ -36,7 +36,6 @@ public class ValidateLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java index 4d8f9683d0..83f72bf981 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java @@ -40,7 +40,6 @@ public class ValidateLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java index b684e70bdc..71367cd26d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java @@ -36,7 +36,6 @@ public class VehicleCheckLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_CHECK_LOCATION.writeId(packet); - packet.writeD(_boat.getObjectId()); packet.writeD(_boat.getX()); packet.writeD(_boat.getY()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java index a4a5780f30..5b565c08b7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java @@ -46,7 +46,6 @@ public class VehicleDeparture implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_DEPARTURE.writeId(packet); - packet.writeD(_objId); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java index ec611028bf..4a995a6352 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java @@ -44,7 +44,6 @@ public class VehicleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java index 207a6fd899..bf629dcbbc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java @@ -42,7 +42,6 @@ public class VehicleStarted implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_START.writeId(packet); - packet.writeD(_objectId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 455305ce79..76b391afc6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -30,6 +30,7 @@ public class WareHouseDepositList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; public static final int FREIGHT = 1; + private final long _playerAdena; private final int _warehouseSize; private final List _items = new ArrayList<>(); @@ -49,7 +50,6 @@ public class WareHouseDepositList extends AbstractItemPacket _whType = type; _playerAdena = player.getAdena(); _warehouseSize = player.getActiveWarehouse() != null ? player.getActiveWarehouse().getSize() : 0; - final boolean isPrivate = _whType == PRIVATE; for (Item temp : player.getInventory().getAvailableItems(true, isPrivate, false)) { @@ -68,19 +68,15 @@ public class WareHouseDepositList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.WAREHOUSE_DEPOSIT_LIST.writeId(packet); - packet.writeH(_whType); packet.writeQ(_playerAdena); packet.writeD(_warehouseSize); packet.writeH(_itemsStackable.size()); - for (int itemId : _itemsStackable) { packet.writeD(itemId); } - packet.writeH(_items.size()); - for (Item item : _items) { writeItem(packet, item); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 6f57005e47..785f0a0849 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -32,6 +32,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private Player _player; private long _playerAdena; private final int _invSize; @@ -58,7 +59,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } - _items = _player.getActiveWarehouse().getItems(); for (Item item : _items) { @@ -73,7 +73,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.WAREHOUSE_WITHDRAW_LIST.writeId(packet); - packet.writeH(_whType); packet.writeQ(_playerAdena); packet.writeH(_items.size()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java index 5f2dd05f3b..aea1476fb2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java @@ -35,8 +35,7 @@ public class ExDivideAdenaCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_CANCEL.writeId(packet); - - packet.writeC(0x00); // TODO: Find me + packet.writeC(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java index 6af912cebf..de4e955aba 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java @@ -46,9 +46,8 @@ public class ExDivideAdenaDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_DONE.writeId(packet); - - packet.writeC(_isPartyLeader ? 0x01 : 0x00); - packet.writeC(_isCCLeader ? 0x01 : 0x00); + packet.writeC(_isPartyLeader ? 1 : 0); + packet.writeC(_isCCLeader ? 1 : 0); packet.writeD(_memberCount); packet.writeQ(_distributedAdenaCount); packet.writeQ(_adenaCount); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index 549def456e..84b5fead76 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -43,7 +43,6 @@ public class ExChooseShapeShiftingItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_SHAPE_SHIFTING_ITEM.writeId(packet); - packet.writeD(_targetType != null ? _targetType.ordinal() : 0); packet.writeD(_type != null ? _type.ordinal() : 0); packet.writeD(_itemId); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java index 33fb439aa5..ba55887a1a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java @@ -45,7 +45,6 @@ public class ExCuriousHouseMemberUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_UPDATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_maxHp); packet.writeD(_maxCp); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java index 8ad3659725..be2d29d864 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPacket { - public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0x00); - public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(0x01); + public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0); + public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(1); private final int _result; @@ -39,7 +39,6 @@ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPa public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_EXTRACTION_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java index ec82cc14f3..e84d7a7255 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; public static final ExPutShapeShiftingTargetItemResult FAILED = new ExPutShapeShiftingTargetItemResult(RESULT_FAILED, 0); @@ -43,7 +43,6 @@ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_resultId); packet.writeQ(_price); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java index f4d3118cc4..038eae0042 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExShapeShiftingResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; - public static final int RESULT_CLOSE = 0x02; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; + public static final int RESULT_CLOSE = 2; public static final ExShapeShiftingResult FAILED = new ExShapeShiftingResult(RESULT_FAILED, 0, 0); public static final ExShapeShiftingResult CLOSE = new ExShapeShiftingResult(RESULT_CLOSE, 0, 0); @@ -47,7 +47,6 @@ public class ExShapeShiftingResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHAPE_SHIFTING_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_targetItemId); packet.writeD(_extractItemId); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java index eaf0d209fd..4b48b09002 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java @@ -38,7 +38,7 @@ public class ExConfirmVipAttendanceCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CONFIRM_VIP_ATTENDANCE_CHECK.writeId(packet); - packet.writeC(_available ? 0x01 : 0x00); // can receive reward today? 1 else 0 + packet.writeC(_available ? 1 : 0); // can receive reward today? 1 else 0 packet.writeC(_index); // active reward index packet.writeD(0); packet.writeD(0); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java index 9d61fe68d6..dd94df023f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java @@ -45,10 +45,10 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket OutgoingPackets.EX_VIP_ATTENDANCE_ITEM_LIST.writeId(packet); packet.writeC(_available ? _index + 1 : _index); // index to receive? packet.writeC(_index); // last received index? - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeC(0x01); - packet.writeC(_available ? 0x01 : 0x00); // player can receive reward today? + packet.writeD(0); + packet.writeD(0); + packet.writeC(1); + packet.writeC(_available ? 1 : 0); // player can receive reward today? packet.writeC(250); packet.writeC(AttendanceRewardData.getInstance().getRewardsCount()); // reward size int rewardCounter = 0; @@ -57,11 +57,11 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket rewardCounter++; packet.writeD(reward.getId()); packet.writeQ(reward.getCount()); - packet.writeC(0x01); // is unknown? - packet.writeC((rewardCounter % 7) == 0 ? 0x01 : 0x00); // is last in row? + packet.writeC(1); // is unknown? + packet.writeC((rewardCounter % 7) == 0 ? 1 : 0); // is last in row? } - packet.writeC(0x00); - packet.writeD(0x00); + packet.writeC(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java index 4c3ae253ea..c79b68becc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java @@ -39,7 +39,6 @@ public class ExResponseCommissionBuyInfo extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_INFO.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java index ddfa8b6db1..c1d29735b8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java @@ -40,7 +40,6 @@ public class ExResponseCommissionBuyItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_ITEM.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java index aa4bbbde24..01e4782408 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java @@ -39,7 +39,6 @@ public class ExResponseCommissionDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_DELETE.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java index e7e3c39816..b915574175 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java @@ -55,7 +55,6 @@ public class ExResponseCommissionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_INFO.writeId(packet); - packet.writeD(_result); packet.writeD(_itemId); packet.writeQ(_presetPricePerUnit); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java index 876a24c7ad..89000dd57f 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionItemList.java @@ -39,7 +39,6 @@ public class ExResponseCommissionItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_ITEM_LIST.writeId(packet); - packet.writeD(_items.size()); for (Item itemInstance : _items) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java index 4963393b42..a012b3ab30 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java @@ -64,7 +64,6 @@ public class ExResponseCommissionList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_LIST.writeId(packet); - packet.writeD(_replyType.getClientId()); switch (_replyType) { @@ -73,13 +72,11 @@ public class ExResponseCommissionList extends AbstractItemPacket { packet.writeD((int) Instant.now().getEpochSecond()); packet.writeD(_chunkId); - int chunkSize = _items.size() - _listIndexStart; if (chunkSize > MAX_CHUNK_SIZE) { chunkSize = MAX_CHUNK_SIZE; } - packet.writeD(chunkSize); for (int i = _listIndexStart; i < (_listIndexStart + chunkSize); i++) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java index b1b0a97d7a..183547af06 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java @@ -39,7 +39,6 @@ public class ExResponseCommissionRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_REGISTER.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java index 74d8a95587..b68386e4ed 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java @@ -35,8 +35,7 @@ public class ExShowCommission implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_COMMISSION.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java index 0c267ecf34..11b1ff1e0a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExEnchantFail implements IClientOutgoingPacket { public static final ExEnchantFail STATIC_PACKET = new ExEnchantFail(0, 0); + private final int _itemOne; private final int _itemTwo; @@ -39,7 +40,6 @@ public class ExEnchantFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_FAIL.writeId(packet); - packet.writeD(_itemOne); packet.writeD(_itemTwo); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java index 71ba811ed5..87d29a8e7c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java @@ -36,7 +36,6 @@ public class ExEnchantSucess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SUCESS.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java index eb4eb8b26c..ec67d50fb6 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java @@ -39,7 +39,6 @@ public class ExGetCrystalizingEstimation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - packet.writeD(_items.size()); for (ItemChanceHolder holder : _items) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java index ac16c14f5b..ebf5b64751 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java @@ -43,18 +43,18 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket } OutgoingPackets.EX_CONNECTED_TIME_AND_GETTABLE_REWARD.writeId(packet); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_oneDayRewardAvailableCount); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index a8f3304739..f11ae5f478 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -62,7 +62,6 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket } OutgoingPackets.EX_ONE_DAY_RECEIVE_REWARD_LIST.writeId(packet); - packet.writeD(_dayRemainTime); packet.writeD(_weekRemainTime); packet.writeD(_monthRemainTime); @@ -74,7 +73,7 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket { packet.writeH(reward.getId()); packet.writeC(reward.getStatus(_player)); - packet.writeC(reward.getRequiredCompletions() > 1 ? 0x01 : 0x00); + packet.writeC(reward.getRequiredCompletions() > 1 ? 1 : 0); packet.writeD(Math.min(reward.getProgress(_player), _player.getLevel())); packet.writeD(reward.getRequiredCompletions()); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java index fa605b548a..a99ad7f4e3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java @@ -52,7 +52,7 @@ public class ExFishingStart implements IClientOutgoingPacket packet.writeD(_baitLocation.getX()); packet.writeD(_baitLocation.getY()); packet.writeD(_baitLocation.getZ()); - packet.writeC(0x01); // 0 = newbie, 1 = normal, 2 = night + packet.writeC(1); // 0 = newbie, 1 = normal, 2 = night return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java index 046ad04cb6..74501fe7ff 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java @@ -49,7 +49,6 @@ public class ExUserInfoFishing implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_FISHING.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_isFishing ? 1 : 0); if (_baitLocation == null) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 5f189a3e7f..3c5a32808a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -47,9 +47,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FRIEND_DETAIL_INFO.writeId(packet); - packet.writeD(_objectId); - if (_friend == null) { packet.writeS(_name); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java index 0d4bb47ff0..a90b7b6083 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java @@ -33,8 +33,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x00); + packet.writeC(0); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java index 9add9c9caa..d24139644c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java @@ -49,7 +49,6 @@ public class FriendAddRequestResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_charId); packet.writeS(_charName); @@ -57,7 +56,7 @@ public class FriendAddRequestResult implements IClientOutgoingPacket packet.writeD(_charObjectId); packet.writeD(_charLevel); packet.writeD(_charClassId); - packet.writeH(0x00); // Always 0 on retail + packet.writeH(0); // Always 0 on retail return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java index a135944662..13a7d01967 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java @@ -86,12 +86,10 @@ public class FriendList implements IClientOutgoingPacket } continue; } - if (player1.isOnline()) { online = true; } - classid = player1.getClassId().getId(); level = player1.getLevel(); _info.add(new FriendInfo(objId, name, online, classid, level)); @@ -102,14 +100,13 @@ public class FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._classid); packet.writeD(info._level); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java index 07c23f9fd2..1bb4142e34 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java @@ -38,7 +38,6 @@ public class FriendRemove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_REMOVE.writeId(packet); - packet.writeD(_responce); packet.writeS(_charName); return true; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java index e8dbddcd63..a3990c0879 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java @@ -52,7 +52,6 @@ public class FriendStatus implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_STATUS.writeId(packet); - packet.writeD(_type); packet.writeS(_name); switch (_type) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java index 8752104e06..78da5850b8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java @@ -50,7 +50,6 @@ public class L2Friend implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND.writeId(packet); - packet.writeD(_action ? 1 : 3); // 1-add 3-remove packet.writeD(_objid); packet.writeS(_name); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java index b69a253635..e50693cb11 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java @@ -81,17 +81,16 @@ public class L2FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._level); packet.writeD(info._classId); - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java index 677c09091f..706c179a9c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java @@ -37,7 +37,6 @@ public class ExMentorAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_ADD.writeId(packet); - packet.writeS(_mentor.getName()); packet.writeD(_mentor.getActiveClass()); packet.writeD(_mentor.getLevel()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java index 4722a9cab3..18c1cdeedf 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java @@ -64,9 +64,8 @@ public class ExMentorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_LIST.writeId(packet); - packet.writeD(_type); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mentees.size()); for (Mentee mentee : _mentees) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java index d739dd94b7..2283920b98 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java @@ -32,6 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ListMenteeWaiting implements IClientOutgoingPacket { private static final int PLAYERS_PER_PAGE = 64; + private final List _possibleCandiates = new ArrayList<>(); private final int _page; @@ -51,18 +52,15 @@ public class ListMenteeWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_MENTEE_WAITING.writeId(packet); - - packet.writeD(0x01); // always 1 in retail + packet.writeD(1); // always 1 in retail if (_possibleCandiates.isEmpty()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } - packet.writeD(_possibleCandiates.size()); packet.writeD(_possibleCandiates.size() % PLAYERS_PER_PAGE); - for (Player player : _possibleCandiates) { if ((1 <= (PLAYERS_PER_PAGE * _page)) && (1 > (PLAYERS_PER_PAGE * (_page - 1)))) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java index ead46c2174..eaf44d3181 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java @@ -51,7 +51,6 @@ public class ExPledgeBonusList implements IClientOutgoingPacket packet.writeD(0); return; } - packet.writeD(bonus.getSkillReward().getSkillId()); break; } @@ -63,7 +62,6 @@ public class ExPledgeBonusList implements IClientOutgoingPacket packet.writeD(0); return; } - packet.writeD(bonus.getItemReward().getId()); break; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java index af3c790bc6..cfedfaa438 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java @@ -50,7 +50,6 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Player: " + _player + " attempting to write to a null clan!"); return false; } - final ClanRewardBonus highestMembersOnlineBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.MEMBERS_ONLINE); final ClanRewardBonus highestHuntingBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.HUNTING_MONSTERS); final ClanRewardBonus membersOnlineBonus = ClanRewardType.MEMBERS_ONLINE.getAvailableBonus(clan); @@ -75,23 +74,20 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Couldn't find item reward for highest available hunting bonus!!"); return false; } - // General OP Code OutgoingPackets.EX_PLEDGE_BONUS_OPEN.writeId(packet); - // Members online bonus packet.writeD(highestMembersOnlineBonus.getRequiredAmount()); packet.writeD(clan.getMaxOnlineMembers()); - packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0x00); - packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 0x01 : 0x00); - + packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0); + packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 1 : 0); // Hunting bonus packet.writeD(highestHuntingBonus.getRequiredAmount()); packet.writeD(clan.getHuntingPoints()); - packet.writeD(huntingBonus != null ? highestHuntingBonus.getItemReward().getId() : 0x00); - packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 0x01 : 0x00); + packet.writeD(huntingBonus != null ? highestHuntingBonus.getItemReward().getId() : 0); + packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index fb735b8925..e75426e598 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -69,7 +69,6 @@ public class ExBRBuyProduct implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUY_PRODUCT.writeId(packet); - packet.writeD(_reply); return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java index 742b3eba9d..91a186b81d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java @@ -39,10 +39,9 @@ public class ExBRGamePoint implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_GAME_POINT.writeId(packet); - packet.writeD(_charId); packet.writeQ(_charPoints); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java index 50f21df46a..e36f2ff502 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java @@ -45,7 +45,6 @@ public class ExBRProductInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_INFO.writeId(packet); - packet.writeD(_item.getBrId()); packet.writeD(_item.getPrice()); packet.writeD(_item.getItems().size()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java index dc851ffd43..0f042ba043 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java @@ -45,9 +45,8 @@ public class ExBRProductList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); // Adena - packet.writeQ(0x00); // Hero coins + packet.writeQ(0); // Hero coins packet.writeC(_type); // Type 0 - Home, 1 - History, 2 - Favorites packet.writeD(_primeList.size()); for (PrimeShopGroup brItem : _primeList) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java index 2463589c81..c09b3e899d 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java @@ -47,18 +47,15 @@ public class ExFlyMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_mapId); - packet.writeD(_locations.size()); for (SayuneEntry loc : _locations) { packet.writeD(loc.getId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(loc.getX()); packet.writeD(loc.getY()); packet.writeD(loc.getZ()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java index 03fc6b580d..70b3fb25d2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java @@ -47,16 +47,13 @@ public class ExFlyMoveBroadcast implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE_BROADCAST.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); packet.writeD(_mapId); - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD(_currentLoc.getX()); packet.writeD(_currentLoc.getY()); packet.writeD(_currentLoc.getZ()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java index cfe11a27e0..49e5d86910 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java @@ -35,7 +35,6 @@ public class ExNotifyFlyMoveStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_FLY_MOVE_START.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java index d5640a47ef..0efa37ae8c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java @@ -51,7 +51,6 @@ public class ExMoveToLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_SUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_targetX); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java index 0cbe2c3e02..a0314c39aa 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java @@ -46,7 +46,6 @@ public class ExShuttleGetOff implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_OFF.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_x); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java index 5211bef5ba..061bcafed9 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java @@ -43,7 +43,6 @@ public class ExShuttleGetOn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_ON.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java index 97d54a9019..c8aee1fde7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java @@ -43,7 +43,6 @@ public class ExShuttleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHUTTLE_INFO.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD(_shuttle.getX()); packet.writeD(_shuttle.getY()); @@ -60,8 +59,8 @@ public class ExShuttleInfo implements IClientOutgoingPacket packet.writeD(loc.getY()); packet.writeD(loc.getZ()); } - packet.writeD(stop.isDoorOpen() ? 0x01 : 0x00); - packet.writeD(stop.hasDoorChanged() ? 0x01 : 0x00); + packet.writeD(stop.isDoorOpen() ? 1 : 0); + packet.writeD(stop.hasDoorChanged() ? 1 : 0); } return true; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java index 6ba38f29a1..28b33b998e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java @@ -43,7 +43,6 @@ public class ExShuttleMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_MOVE.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD((int) _shuttle.getStat().getMoveSpeed()); packet.writeD((int) _shuttle.getStat().getRotationSpeed()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java index bf2b6ea6eb..6c31189d6a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java @@ -44,7 +44,6 @@ public class ExStopMoveInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_SHUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java index f7f6849732..8492f42a6e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java @@ -44,7 +44,6 @@ public class ExValidateLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_SHUTTLE.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java index 1d59c6d002..e7654ed911 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java @@ -60,7 +60,7 @@ public class AccountKicked implements IOutgoingPacket { OutgoingPackets.ACCOUNT_KICKED.writeId(packet); packet.writeD(_reason.getCode()); - return true; } } + diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 2e3a1f6163..1fe813e393 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: response + * Format: d d: response */ public class GGAuth implements IOutgoingPacket { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/Init.java index 4b3f71f30e..d725f45ca2 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/Init.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/Init.java @@ -52,7 +52,6 @@ public class Init implements IOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.INIT.writeId(packet); - packet.writeD(_sessionId); // session id packet.writeD(0x0000c621); // protocol revision diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index 8c534554a8..f4dcd22b00 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: the failure reason + * Format: d d: the failure reason */ public class LoginFail implements IOutgoingPacket { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/BaseRecievePacket.java index c682cb741d..a6ed15ce32 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/BaseRecievePacket.java @@ -73,7 +73,7 @@ public abstract class BaseRecievePacket try { result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE); - result = result.substring(0, result.indexOf(0x00)); + result = result.substring(0, result.indexOf(0)); _off += (result.length() * 2) + 2; } catch (Exception e) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/BaseSendablePacket.java index a9d918de4c..8fa8491cbf 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/commons/network/BaseSendablePacket.java @@ -117,16 +117,16 @@ public abstract class BaseSendablePacket public byte[] getBytes() { // if (this instanceof Init) - // writeD(0x00); // reserve for XOR initial key + // writeD(0); // reserve for XOR initial key - writeD(0x00); // reserve for checksum + writeD(0); // reserve for checksum final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++) { - writeC(0x00); + writeC(0); } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/AttackType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/AttackType.java index 6064b10ed7..e9983f15e3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/AttackType.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/AttackType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum AttackType { - MISSED(0x01), - BLOCKED(0x02), - CRITICAL(0x04), - SHOT_USED(0x08); + MISSED(1), + BLOCKED(2), + CRITICAL(4), + SHOT_USED(8); private final int _mask; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/GroupType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/GroupType.java index 954aaace8b..916a14fd05 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/GroupType.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/GroupType.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum GroupType implements IUpdateTypeComponent { - NONE(0x01), - PARTY(0x02), - COMMAND_CHANNEL(0x04); + NONE(1), + PARTY(2), + COMMAND_CHANNEL(4); private int _mask; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/ItemListType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/ItemListType.java index 35ad11dd07..9dd765e702 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/ItemListType.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/ItemListType.java @@ -23,13 +23,13 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum ItemListType implements IUpdateTypeComponent { - AUGMENT_BONUS(0x01), - ELEMENTAL_ATTRIBUTE(0x02), - ENCHANT_EFFECT(0x04), - VISUAL_ID(0x08), - SOUL_CRYSTAL(0x10), - EVOLVE(0x80), - BLESSED(0x100); + AUGMENT_BONUS(1), + ELEMENTAL_ATTRIBUTE(2), + ENCHANT_EFFECT(4), + VISUAL_ID(8), + SOUL_CRYSTAL(16), + EVOLVE(128), + BLESSED(256); private final int _mask; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java index b3d08596c6..29403b783d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum MacroUpdateType { - ADD(0x01), - LIST(0x01), - MODIFY(0x02), - DELETE(0x00); + ADD(1), + LIST(1), + MODIFY(2), + DELETE(0); private final int _id; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java index 86c6159869..7776721c0f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java @@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum PartySmallWindowUpdateType implements IUpdateTypeComponent { - CURRENT_CP(0x01), - MAX_CP(0x02), - CURRENT_HP(0x04), - MAX_HP(0x08), - CURRENT_MP(0x10), - MAX_MP(0x20), - LEVEL(0x40), - CLASS_ID(0x80), - PARTY_SUBSTITUTE(0x100), - VITALITY_POINTS(0x200); + CURRENT_CP(1), + MAX_CP(2), + CURRENT_HP(4), + MAX_HP(8), + CURRENT_MP(16), + MAX_MP(32), + LEVEL(64), + CLASS_ID(128), + PARTY_SUBSTITUTE(256), + VITALITY_POINTS(512); private final int _mask; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 00bb331778..667ce7f17c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.Broadcast; import org.l2jmobius.gameserver.util.Util; /** - * Fromat:(ch) dddddc + * Format:(ch) dddddc * @author -Wooden- */ public class RequestExMagicSkillUseGround implements IClientIncomingPacket diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java index 8744393432..033095e74d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java @@ -39,7 +39,6 @@ public class AbnormalStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ABNORMAL_STATUS_UPDATE.writeId(packet); - packet.writeH(_effects.size()); for (BuffInfo info : _effects) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 1b8ddb2042..bec794bef3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -44,7 +44,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; } @@ -60,7 +59,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; setHtml(html); } @@ -77,13 +75,11 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } - if (!html.contains(""; return; } - _html = html; } @@ -96,7 +92,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } - setHtml(content); return true; } @@ -138,12 +133,10 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { player.clearHtmlActions(getScope()); } - if (_disabledValidation) { return; } - if (player != null) { Util.buildHtmlActionCache(player, getScope(), _npcObjId, _html); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index c1843be93c..e70fd93427 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -72,7 +72,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket= 0) || (item.getAttributeDefence(AttributeType.FIRE) > 0) || (item.getAttributeDefence(AttributeType.WATER) > 0) || (item.getAttributeDefence(AttributeType.WIND) > 0) || (item.getAttributeDefence(AttributeType.EARTH) > 0) || (item.getAttributeDefence(AttributeType.HOLY) > 0) || (item.getAttributeDefence(AttributeType.DARK) > 0)) { mask |= ItemListType.ELEMENTAL_ATTRIBUTE.getMask(); } - if (item.getEnchantOptions() != null) { for (int id : item.getEnchantOptions()) @@ -205,27 +199,22 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket 0) { mask |= ItemListType.VISUAL_ID.getMask(); } - if (((item.getSoulCrystalOptions() != null) && !item.getSoulCrystalOptions().isEmpty()) || ((item.getSoulCrystalSpecialOptions() != null) && !item.getSoulCrystalSpecialOptions().isEmpty())) { mask |= ItemListType.SOUL_CRYSTAL.getMask(); } - if (item.getPetData() != null) { mask |= ItemListType.EVOLVE.getMask(); } - if (item.isBlessed()) { mask |= ItemListType.BLESSED.getMask(); } - return mask; } @@ -293,7 +282,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); packet.writeC(removeSkills.size()); for (Skill removed : removeSkills) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java index 8fa6259f64..6451dffd02 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ActionFailed implements IClientOutgoingPacket { public static final ActionFailed STATIC_PACKET = new ActionFailed(); - private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); + private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); static { for (SkillCastingType castingType : SkillCastingType.values()) @@ -57,7 +57,6 @@ public class ActionFailed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ACTION_FAIL.writeId(packet); - packet.writeD(_castingType); // MagicSkillUse castingType return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java index 6e868368c9..30ce58da60 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java @@ -44,9 +44,8 @@ public class AgitDecoInfo implements IClientOutgoingPacket { continue; } - packet.writeC(_residense.hasFunction(type) ? 0x01 : 0x00); + packet.writeC(_residense.hasFunction(type) ? 1 : 0); } - // Unknown packet.writeD(0); // TODO: Find me! packet.writeD(0); // TODO: Find me! diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java index 6cb71fc985..4683fb30f0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java @@ -44,7 +44,6 @@ public class AllianceInfo implements IClientOutgoingPacket _name = leader.getAllyName(); _leaderC = leader.getName(); _leaderP = leader.getLeaderName(); - final Collection allies = ClanTable.getInstance().getClanAllies(allianceId); _allies = new ClanInfo[allies.size()]; int idx = 0; @@ -57,7 +56,6 @@ public class AllianceInfo implements IClientOutgoingPacket total += ci.getTotal(); online += ci.getOnline(); } - _total = total; _online = online; } @@ -66,18 +64,16 @@ public class AllianceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_INFO.writeId(packet); - packet.writeS(_name); packet.writeD(_total); packet.writeD(_online); packet.writeS(_leaderC); packet.writeS(_leaderP); - packet.writeD(_allies.length); for (ClanInfo aci : _allies) { packet.writeS(aci.getClan().getName()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(aci.getClan().getLevel()); packet.writeS(aci.getClan().getLeaderName()); packet.writeD(aci.getTotal()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java index f9d08f6600..186fd12e81 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java @@ -44,7 +44,6 @@ public class AllyCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java index 6218f1717f..1ae4653f91 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java @@ -38,7 +38,6 @@ public class AskJoinAlly implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_ALLIANCE.writeId(packet); - packet.writeD(_requestorObjId); packet.writeS(null); // Ally Name ? packet.writeS(null); // TODO: Find me! diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java index a66bb3cd33..b9cfbe81b9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java @@ -39,7 +39,6 @@ public class AskJoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_PARTY.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 05c420ff59..227ab571be 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -45,7 +45,6 @@ public class Attack implements IClientOutgoingPacket _attackerObjId = attacker.getObjectId(); _attackerLoc = new Location(attacker); _targetLoc = new Location(target); - final Player player = attacker.getActingPlayer(); if (player == null) { @@ -111,7 +110,6 @@ public class Attack implements IClientOutgoingPacket final Iterator it = _hits.iterator(); final Hit firstHit = it.next(); OutgoingPackets.ATTACK.writeId(packet); - packet.writeD(_attackerObjId); packet.writeD(firstHit.getTargetId()); packet.writeD(_soulshotVisualSubstitute); // Ertheia @@ -121,13 +119,11 @@ public class Attack implements IClientOutgoingPacket packet.writeD(_attackerLoc.getX()); packet.writeD(_attackerLoc.getY()); packet.writeD(_attackerLoc.getZ()); - packet.writeH(_hits.size() - 1); while (it.hasNext()) { writeHit(packet, it.next()); } - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java index bd6878eb42..8b85fe85e3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java @@ -35,7 +35,6 @@ public class AutoAttackStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_START.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java index e767d1877a..a294b1e212 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java @@ -35,7 +35,6 @@ public class AutoAttackStop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_STOP.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java index 3f329415df..0c79677eae 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java @@ -38,7 +38,6 @@ public class BlockListPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BLOCK_LIST.writeId(packet); - packet.writeD(_playersId.size()); for (int playerId : _playersId) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index f610cdc6aa..d95f0543b9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -45,8 +45,7 @@ public class BuyList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x00); // Type BUY + packet.writeD(0); // Type BUY packet.writeQ(_money); // current money packet.writeD(_listId); packet.writeD(_inventorySlots); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index cd25af908d..7cb2bf4425 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -50,36 +50,34 @@ public class BuyListSeed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BUY_LIST_SEED.writeId(packet); - packet.writeQ(_money); // current money - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeD(_manorId); // manor id - if (!_list.isEmpty()) { packet.writeH(_list.size()); // list length for (SeedProduction s : _list) { - packet.writeC(0x00); // mask item 0 to print minimal item information + packet.writeC(0); // mask item 0 to print minimal item information packet.writeD(s.getId()); // ObjectId packet.writeD(s.getId()); // ItemId packet.writeC(0xFF); // T1 packet.writeQ(s.getAmount()); // Quantity - packet.writeC(0x05); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item - packet.writeC(0x00); // Filler (always 0) - packet.writeH(0x00); // Equipped : 00-No, 01-yes - packet.writeQ(0x00); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand - packet.writeH(0x00); // Enchant level (pet level shown in control item) + packet.writeC(5); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item + packet.writeC(0); // Filler (always 0) + packet.writeH(0); // Equipped : 00-No, 01-yes + packet.writeQ(0); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand + packet.writeH(0); // Enchant level (pet level shown in control item) packet.writeD(-1); packet.writeD(-9999); - packet.writeC(0x01); // GOD Item enabled = 1 disabled (red) = 0 + packet.writeC(1); // GOD Item enabled = 1 disabled (red) = 0 packet.writeQ(s.getPrice()); // price } _list.clear(); } else { - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java index 3a7b67af23..f3dc872dca 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java @@ -32,8 +32,7 @@ public class CSShowComBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - - packet.writeC(0x01); // c4 1 to show community 00 to hide + packet.writeC(1); // c4 1 to show community 00 to hide packet.writeB(_html); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java index eacc27aa07..b18dac4cc3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java @@ -36,7 +36,6 @@ public class CameraMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CAMERA_MODE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java index 1682f5bc62..adea754676 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java @@ -39,7 +39,6 @@ public class ChairSit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAIR_SIT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_staticObjectId); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java index 2bc31a285a..de141fa067 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java @@ -38,7 +38,6 @@ public class ChangeMoveType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_MOVE_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_running ? RUN : WALK); packet.writeD(0); // c2 diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index 73277d923d..fbe5e39e2e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -22,17 +22,17 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ChangeWaitType implements IClientOutgoingPacket { + public static final int WT_SITTING = 0; + public static final int WT_STANDING = 1; + public static final int WT_START_FAKEDEATH = 2; + public static final int WT_STOP_FAKEDEATH = 3; + private final int _objectId; private final int _moveType; private final int _x; private final int _y; private final int _z; - public static final int WT_SITTING = 0; - public static final int WT_STANDING = 1; - public static final int WT_START_FAKEDEATH = 2; - public static final int WT_STOP_FAKEDEATH = 3; - public ChangeWaitType(Creature creature, int newMoveType) { _objectId = creature.getObjectId(); @@ -46,7 +46,6 @@ public class ChangeWaitType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_WAIT_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_moveType); packet.writeD(_x); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index 41180bac50..aa2e7b2eaa 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -30,7 +30,6 @@ public class CharCreateFail implements IClientOutgoingPacket public static final int REASON_CREATE_NOT_ALLOWED = 0x05; // "Characters cannot be created from this server." public static final int REASON_CHOOSE_ANOTHER_SVR = 0x06; // "Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please // choose another server." - private final int _error; public CharCreateFail(int errorCode) @@ -42,7 +41,6 @@ public class CharCreateFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index f0e99885ad..768617e558 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -31,8 +31,7 @@ public class CharCreateOk implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_SUCCESS.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index bed289ca0a..1674eef343 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -33,7 +33,6 @@ public class CharDeleteFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_DELETE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 7a68746f74..422aa15700 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -35,6 +35,22 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { + private static final int[] PAPERDOLL_ORDER = new int[] + { + Inventory.PAPERDOLL_UNDER, + Inventory.PAPERDOLL_HEAD, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_LHAND, + Inventory.PAPERDOLL_GLOVES, + Inventory.PAPERDOLL_CHEST, + Inventory.PAPERDOLL_LEGS, + Inventory.PAPERDOLL_FEET, + Inventory.PAPERDOLL_CLOAK, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_HAIR, + Inventory.PAPERDOLL_HAIR2 + }; + private final Player _player; private final Clan _clan; private int _objId; @@ -57,22 +73,6 @@ public class CharInfo implements IClientOutgoingPacket private int _vehicleId = 0; private final boolean _gmSeeInvis; - private static final int[] PAPERDOLL_ORDER = new int[] - { - Inventory.PAPERDOLL_UNDER, - Inventory.PAPERDOLL_HEAD, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_LHAND, - Inventory.PAPERDOLL_GLOVES, - Inventory.PAPERDOLL_CHEST, - Inventory.PAPERDOLL_LEGS, - Inventory.PAPERDOLL_FEET, - Inventory.PAPERDOLL_CLOAK, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_HAIR, - Inventory.PAPERDOLL_HAIR2 - }; - public CharInfo(Player player, boolean gmSeeInvis) { _player = player; @@ -121,17 +121,15 @@ public class CharInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); // Confirmed packet.writeD(_y); // Confirmed packet.writeD(_z); // Confirmed packet.writeD(_vehicleId); // Confirmed packet.writeD(_objId); // Confirmed packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed - packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) @@ -155,10 +153,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.getPvpFlag()); packet.writeD(_player.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -169,53 +165,40 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); - packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeS(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle()); - packet.writeD(_player.getAppearance().getVisibleClanId()); packet.writeD(_player.getAppearance().getVisibleClanCrestId()); packet.writeD(_player.getAppearance().getVisibleAllyId()); packet.writeD(_player.getAppearance().getVisibleAllyCrestId()); - - packet.writeC(_player.isSitting() ? 0x00 : 0x01); // Confirmed - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // Confirmed - packet.writeC(_player.isInCombat() ? 0x01 : 0x00); // Confirmed - - packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 0x01 : 0x00); // Confirmed - - packet.writeC(_player.isInvisible() ? 0x01 : 0x00); - + packet.writeC(_player.isSitting() ? 0 : 1); // Confirmed + packet.writeC(_player.isRunning() ? 1 : 0); // Confirmed + packet.writeC(_player.isInCombat() ? 1 : 0); // Confirmed + packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 1 : 0); // Confirmed + packet.writeC(_player.isInvisible() ? 1 : 0); packet.writeC(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount packet.writeC(_player.getPrivateStoreType().getId()); // Confirmed packet.writeH(_player.getCubics().size()); // Confirmed _player.getCubics().keySet().forEach(packet::writeH); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); // Confirmed packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); packet.writeH(_player.getRecomHave()); // Confirmed packet.writeD(_player.getMountNpcId() == 0 ? 0 : _player.getMountNpcId() + 1000000); - packet.writeD(_player.getClassId().getId()); // Confirmed - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeC(_player.isMounted() ? 0 : _enchantLevel); // Confirmed - packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeD(_player.getClanCrestLargeId()); packet.writeC(_player.isNoble() ? 1 : 0); // Confirmed packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 2 : 0); // 152 - Value for enabled changed to 2? packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed - final ILocational baitLocation = _player.getFishing().getBaitLocation(); if (baitLocation != null) { @@ -231,29 +214,21 @@ public class CharInfo implements IClientOutgoingPacket } packet.writeD(_player.getAppearance().getNameColor()); // Confirmed - packet.writeD(_heading); // Confirmed - packet.writeC(_player.getPledgeClass()); packet.writeH(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); // Confirmed - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - - packet.writeC(0x00); // nPvPRestrainStatus - + packet.writeC(0); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentHp())); // Confirmed packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - - packet.writeC(0x00); // cBRLectureMark + packet.writeC(0); // cBRLectureMark final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed @@ -265,11 +240,11 @@ public class CharInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(_player.isTrueHero() ? 100 : 0); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); // Hair accessory - packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points - packet.writeD(0x00); // nCursedWeaponClassId + packet.writeC(_player.isTrueHero() ? 100 : 0); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); // Hair accessory + packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points + packet.writeD(0); // nCursedWeaponClassId // AFK animation. if ((_player.getClan() != null) && (CastleManager.getInstance().getCastleByOwner(_player.getClan()) != null)) @@ -278,17 +253,15 @@ public class CharInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); + packet.writeD(0); } // Rank. packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : RankManager.getInstance().getPlayerClassRank(_player) == 1 ? 4 : 0); - - packet.writeH(0x00); - packet.writeC(0x00); + packet.writeH(0); + packet.writeC(0); packet.writeD(_player.getClassId().getId()); - packet.writeC(0x00); - + packet.writeC(0); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 7187b73184..11f5f4df52 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -40,17 +40,16 @@ public class CharSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTED.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getTitle()); packet.writeD(_sessionId); packet.writeD(_player.getClanId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x01); // active ?? + packet.writeD(1); // active ?? packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -62,25 +61,20 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_player.getReputation()); packet.writeD(_player.getPkKills()); packet.writeD(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_player.getClassId().getId()); - packet.writeB(new byte[16]); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeB(new byte[28]); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index df11ac60d8..22fb03de1b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -44,10 +44,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { private static final Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); - private final String _loginName; - private final int _sessionId; - private int _activeId; - private final List _characterPackages; private static final int[] PAPERDOLL_ORDER = new int[] { @@ -112,7 +108,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_ARTIFACT20, // 152 Inventory.PAPERDOLL_ARTIFACT21 // 152 }; - private static final int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, @@ -126,6 +121,11 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_HAIR2, }; + private final String _loginName; + private final int _sessionId; + private int _activeId; + private final List _characterPackages; + /** * Constructor for CharSelectionInfo. * @param loginName @@ -156,17 +156,14 @@ public class CharSelectionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.size(); packet.writeD(size); // Created character count - packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) - packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 0x01 : 0x00); // if 1 can't create new char - packet.writeC(0x01); // 0=can't play, 1=can play free until level 85, 2=100% free play - packet.writeD(0x02); // if 1, Korean client - packet.writeC(0x00); // Gift message for inactive accounts // 152 - packet.writeC(0x00); // Balthus Knights, if 1 suggests premium account - + packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 1 : 0); // if 1 can't create new char + packet.writeC(1); // 0=can't play, 1=can play free until level 85, 2=100% free play + packet.writeD(2); // if 1, Korean client + packet.writeC(0); // Gift message for inactive accounts // 152 + packet.writeC(0); // Balthus Knights, if 1 suggests premium account long lastAccess = 0; if (_activeId == -1) { @@ -179,7 +176,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - for (int i = 0; i < size; i++) { final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); @@ -187,91 +183,73 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name packet.writeD(_sessionId); // Account ID - packet.writeD(0x00); // Clan ID - packet.writeD(0x00); // Builder level - + packet.writeD(0); // Clan ID + packet.writeD(0); // Builder level packet.writeD(charInfoPackage.getSex()); // Sex packet.writeD(charInfoPackage.getRace()); // Race packet.writeD(charInfoPackage.getBaseClassId()); - packet.writeD(Config.SERVER_ID); - packet.writeD(charInfoPackage.getX()); packet.writeD(charInfoPackage.getY()); packet.writeD(charInfoPackage.getZ()); packet.writeF(charInfoPackage.getCurrentHp()); packet.writeF(charInfoPackage.getCurrentMp()); - packet.writeQ(charInfoPackage.getSp()); packet.writeQ(charInfoPackage.getExp()); packet.writeF((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel()))); packet.writeD(charInfoPackage.getLevel()); - packet.writeD(charInfoPackage.getReputation()); packet.writeD(charInfoPackage.getPkKills()); packet.writeD(charInfoPackage.getPvPKills()); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); // Ertheia - packet.writeD(0x00); // Ertheia - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); // Ertheia + packet.writeD(0); // Ertheia for (int slot : getPaperdollOrder()) { packet.writeD(charInfoPackage.getPaperdollItemId(slot)); } - for (int slot : getPaperdollOrderVisualId()) { packet.writeD(charInfoPackage.getPaperdollItemVisualId(slot)); } - packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_CHEST)); // Upper Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_LEGS)); // Lower Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_HEAD)); // Headgear enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_GLOVES)); // Gloves enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_FEET)); // Boots enchant level - packet.writeD(charInfoPackage.getHairStyle()); packet.writeD(charInfoPackage.getHairColor()); packet.writeD(charInfoPackage.getFace()); - packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); - packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption1Id() : 0); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption2Id() : 0); - // packet.writeD(charInfoPackage.getTransformId()); // Used to display Transformations - packet.writeD(0x00); // Currently on retail when you are on character select you don't see your transformation. - - packet.writeD(0x00); // Pet NpcId - packet.writeD(0x00); // Pet level - packet.writeD(0x00); // Pet Food - packet.writeD(0x00); // Pet Food Level - packet.writeF(0x00); // Current pet HP - packet.writeF(0x00); // Current pet MP - + packet.writeD(0); // Currently on retail when you are on character select you don't see your transformation. + packet.writeD(0); // Pet NpcId + packet.writeD(0); // Pet level + packet.writeD(0); // Pet Food + packet.writeD(0); // Pet Food Level + packet.writeF(0); // Current pet HP + packet.writeF(0); // Current pet MP packet.writeD(charInfoPackage.getVitalityPoints()); // Vitality packet.writeD((int) Config.RATE_VITALITY_EXP_MULTIPLIER * 100); // Vitality Percent packet.writeD(charInfoPackage.getVitalityItemsUsed()); // Remaining vitality item uses - packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0x00 : 0x01); // Char is active or not - packet.writeC(charInfoPackage.isNoble() ? 0x01 : 0x00); - packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 0x02 : 0x00); // Hero glow - packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 0x01 : 0x00); // Show hair accessory if enabled - - packet.writeD(0x00); // 235 - ban time left + packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0 : 1); // Char is active or not + packet.writeC(charInfoPackage.isNoble() ? 1 : 0); + packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 2 : 0); // Hero glow + packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 1 : 0); // Show hair accessory if enabled + packet.writeD(0); // 235 - ban time left packet.writeD((int) (charInfoPackage.getLastAccess() / 1000)); // 235 - last play time } return true; @@ -281,7 +259,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); - try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate")) { @@ -294,7 +271,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (charInfopackage != null) { characterList.add(charInfopackage); - final Player player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { @@ -308,7 +284,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return characterList; } @@ -350,7 +325,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { clan.removeClanMember(objectId, 0); } - GameClient.deleteCharByObjId(objectId); return null; } @@ -369,20 +343,16 @@ public class CharSelectionInfo implements IClientOutgoingPacket charInfopackage.setHairStyle(chardata.getInt("hairstyle")); charInfopackage.setHairColor(chardata.getInt("haircolor")); charInfopackage.setSex(chardata.getInt("sex")); - charInfopackage.setExp(chardata.getLong("exp")); charInfopackage.setSp(chardata.getLong("sp")); charInfopackage.setVitalityPoints(chardata.getInt("vitality_points")); charInfopackage.setClanId(chardata.getInt("clanid")); - charInfopackage.setRace(chardata.getInt("race")); - final int baseClassId = chardata.getInt("base_class"); final int activeClassId = chardata.getInt("classid"); charInfopackage.setX(chardata.getInt("x")); charInfopackage.setY(chardata.getInt("y")); charInfopackage.setZ(chardata.getInt("z")); - final int faction = chardata.getInt("faction"); if (faction == 1) { @@ -392,7 +362,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setEvil(); } - if (Config.MULTILANG_ENABLE) { String lang = chardata.getString("language"); @@ -402,22 +371,18 @@ public class CharSelectionInfo implements IClientOutgoingPacket } charInfopackage.setHtmlPrefix("data/lang/" + lang + "/"); } - // if is in subclass, load subclass exp, sp, level info if (baseClassId != activeClassId) { loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId); } - charInfopackage.setClassId(activeClassId); - // Get the augmentation id for equipped weapon int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); if (weaponObjId < 1) { weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); } - if (weaponObjId > 0) { try (Connection con = DatabaseFactory.getConnection(); @@ -443,7 +408,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } - // Check if the base class is set to zero and also doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly. if ((baseClassId == 0) && (activeClassId > 0)) { @@ -453,7 +417,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setBaseClassId(baseClassId); } - charInfopackage.setDeleteTimer(deletetime); charInfopackage.setLastAccess(chardata.getLong("lastAccess")); charInfopackage.setNoble(chardata.getInt("nobless") == 1); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java index 847e24db87..d59df7911a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java @@ -32,7 +32,6 @@ public class ChooseInventoryItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHOOSE_INVENTORY_ITEM.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java index 12a3940521..ac66c2fa0f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java @@ -32,7 +32,6 @@ public class ClientSetTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CLIENT_SET_TIME.writeId(packet); - packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // time in client minutes packet.writeD(6); // constant to match the server time( this determines the speed of the client clock) return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java index 43732f74fa..66a1f5e20d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java @@ -68,7 +68,6 @@ public class ConfirmDlg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CONFIRM_DLG.writeId(packet); - final SMParam[] params = _systemMessage.getParams(); packet.writeD(_systemMessage.getId()); packet.writeD(params.length); @@ -131,7 +130,6 @@ public class ConfirmDlg implements IClientOutgoingPacket } } } - packet.writeD(_time); packet.writeD(_requesterId); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index e11807bdba..63acd728ea 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -73,7 +73,6 @@ public class CreatureSay implements IClientOutgoingPacket _mask |= 0x08; } } - // Does not shows level if (sender.isGM()) { @@ -125,7 +124,6 @@ public class CreatureSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_sender == null ? 0 : _sender.getObjectId()); packet.writeD(_chatType.getClientId()); if (_senderName != null) @@ -156,7 +154,6 @@ public class CreatureSay implements IClientOutgoingPacket packet.writeS(s); } } - // Rank if ((_sender != null) && _sender.isPlayer()) { @@ -165,7 +162,6 @@ public class CreatureSay implements IClientOutgoingPacket { packet.writeC(0); // unknown clan byte } - final int rank = RankManager.getInstance().getPlayerGlobalRank(_sender.getActingPlayer()); if ((rank == 0) || (rank > 100)) { @@ -183,7 +179,6 @@ public class CreatureSay implements IClientOutgoingPacket { packet.writeC(3); } - if (clan != null) { packet.writeC(clan.getCastleId()); @@ -197,7 +192,6 @@ public class CreatureSay implements IClientOutgoingPacket { packet.writeC(0); } - return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index dfc40d995f..a307b06e4b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -38,9 +38,8 @@ public class DeleteObject implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DELETE_OBJECT.writeId(packet); - packet.writeD(_objectId); - packet.writeC(0x00); // c2 + packet.writeC(0); // c2 return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java index 982c8f3311..3b5917e55b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java @@ -50,7 +50,6 @@ public class Dice implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DICE.writeId(packet); - packet.writeD(_objectId); // object id of player packet.writeD(_itemId); // item id of dice (spade) 4625,4626,4627,4628 packet.writeD(_number); // number rolled diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 52daec99cc..609b485b51 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -57,7 +57,6 @@ public class Die implements IClientOutgoingPacket siegeClan = fort.getSiege().getAttackerClan(clan); isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan); } - // ClanHall check. if ((clan != null) && (clan.getHideoutId() > 0)) { @@ -92,12 +91,12 @@ public class Die implements IClientOutgoingPacket OutgoingPackets.DIE.writeId(packet); packet.writeD(_objectId); packet.writeQ(_flags); - packet.writeD(_isSweepable ? 0x01 : 0x00); - packet.writeD(0x00); // Feather item time. - packet.writeC(0x00); // Hide die animation. - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(_isSweepable ? 1 : 0); + packet.writeD(0); // Feather item time. + packet.writeC(0); // Hide die animation. + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java index 15404f9dee..5837faec19 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java @@ -33,7 +33,6 @@ public class DoorInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_INFO.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.getId()); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java index 54f8742a73..14d41afee7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java @@ -33,7 +33,6 @@ public class DoorStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_STATUS_UPDATE.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.isOpen() ? 0 : 1); packet.writeD(_door.getDamage()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index b12458e719..3035890956 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -40,20 +40,17 @@ public class DropItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DROP_ITEM.writeId(packet); - packet.writeD(_objectId); packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeC(_item.isStackable() ? 0x01 : 0x00); + packet.writeC(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - - packet.writeC(0x00); - // packet.writeD(0x01); if above C == true (1) then packet.readD() + packet.writeC(0); + // packet.writeD(1); if above C == true (1) then packet.readD() packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java index 631c43ba0c..99bd80d97e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java @@ -62,13 +62,12 @@ public class Earthquake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EARTHQUAKE.writeId(packet); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_intensity); packet.writeD(_duration); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 6063a54535..1a8b8ddfbb 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -59,25 +59,20 @@ public class EnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_crystal); packet.writeQ(_count); - // Guessing. // With 166 options became 3x write integers instead of shorts and enchant level moved bellow. - // Commenting until actually knowing. // for (int option : _enchantOptions) // { // packet.writeD(option); // } - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_enchantLevel); // Confirmed. - return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java index d7be9824ff..ef78a83f25 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java @@ -42,7 +42,6 @@ public class EtcStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ETC_STATUS_UPDATE.writeId(packet); - packet.writeC(_player.getCharges()); // 1-7 increase force, level packet.writeD(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%) packet.writeC(0); // Weapon Grade Penalty [1-4] diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java index 5dca90f960..9f8d576148 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java @@ -24,13 +24,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class Ex2ndPasswordAck implements IClientOutgoingPacket { + // TODO: Enum + public static final int SUCCESS = 0; + public static final int WRONG_PATTERN = 1; + private final int _status; private final int _response; - // TODO: Enum - public static final int SUCCESS = 0x00; - public static final int WRONG_PATTERN = 0x01; - public Ex2ndPasswordAck(int status, int response) { _status = status; @@ -41,10 +41,9 @@ public class Ex2ndPasswordAck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_ACK.writeId(packet); - packet.writeC(_status); - packet.writeD(_response == WRONG_PATTERN ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(_response == WRONG_PATTERN ? 1 : 0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java index 48bde5161d..c86b5185d0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordCheck implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_NEW = 0x00; - public static final int PASSWORD_PROMPT = 0x01; - public static final int PASSWORD_OK = 0x02; + public static final int PASSWORD_NEW = 0; + public static final int PASSWORD_PROMPT = 1; + public static final int PASSWORD_OK = 2; private final int _windowType; @@ -40,9 +40,8 @@ public class Ex2ndPasswordCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_CHECK.writeId(packet); - packet.writeD(_windowType); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java index 1abf50ab01..f6731bf18f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordVerify implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_OK = 0x00; - public static final int PASSWORD_WRONG = 0x01; - public static final int PASSWORD_BAN = 0x02; + public static final int PASSWORD_OK = 0; + public static final int PASSWORD_WRONG = 1; + public static final int PASSWORD_BAN = 2; private final int _wrongTentatives; private final int _mode; @@ -42,7 +42,6 @@ public class Ex2ndPasswordVerify implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_VERIFY.writeId(packet); - packet.writeD(_mode); packet.writeD(_wrongTentatives); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java index 55abf718c5..db551344ef 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java @@ -45,10 +45,8 @@ public class ExAbnormalStatusUpdateFromTarget implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ABNORMAL_STATUS_UPDATE_FROM_TARGET.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeH(_effects.size()); - for (BuffInfo info : _effects) { packet.writeD(info.getSkill().getDisplayId()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java index c4b9cd8356..f3abd6ec5c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java @@ -41,7 +41,6 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRABLE_SKILL_LIST_BY_CLASS.writeId(packet); - packet.writeH(_type.getId()); packet.writeH(_learnable.size()); for (SkillLearn skill : _learnable) @@ -54,7 +53,7 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket packet.writeC(skill.getRequiredItems().size()); if (_type == AcquireSkillType.SUBPLEDGE) { - packet.writeH(0x00); + packet.writeH(0); } } return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java index fd0e2fc97c..8555bb6e86 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java @@ -61,7 +61,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_SKILL_INFO.writeId(packet); - packet.writeD(_id); packet.writeD(_level); packet.writeQ(_spCost); @@ -73,7 +72,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket packet.writeD(holder.getId()); packet.writeQ(holder.getCount()); } - packet.writeD(_skillRem.size()); for (Skill skill : _skillRem) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java index 29793f4d6c..ff8c526ec4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java @@ -36,7 +36,6 @@ public class ExAdenaInvenCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ADENA_INVEN_COUNT.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeH(_player.getInventory().getSize()); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java index 2aa2d85bc5..5ef11e0f1e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java @@ -50,13 +50,11 @@ public class ExAirShipInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_INFO.writeId(packet); - packet.writeD(_ship.getObjectId()); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(_captain); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); @@ -73,14 +71,13 @@ public class ExAirShipInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - packet.writeD(_ship.getFuel()); packet.writeD(_ship.getMaxFuel()); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java index 4cfc76bfba..8b37f4fc0a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java @@ -42,7 +42,6 @@ public class ExAirShipStopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_airShipId); packet.writeD(_playerId); packet.writeD(_x); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java index 33c57712da..52958f931b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java @@ -37,12 +37,10 @@ public class ExAirShipTeleportList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_TELEPORT_LIST.writeId(packet); - packet.writeD(_dockId); if (_teleports != null) { packet.writeD(_teleports.length); - for (int i = 0; i < _teleports.length; i++) { packet.writeD(i - 1); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java index 392b228f0d..7918022c72 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java @@ -50,13 +50,12 @@ public class ExAlchemySkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_SKILL_LIST.writeId(packet); - packet.writeD(_skills.size()); for (Skill skill : _skills) { packet.writeD(skill.getId()); packet.writeD(skill.getLevel()); - packet.writeQ(0x00); // Always 0 on Naia, SP i guess? + packet.writeQ(0); // Always 0 on Naia, SP i guess? packet.writeC(skill.getId() == CommonSkill.ALCHEMY_CUBE.getId() ? 0 : 1); // This is type in flash, visible or not } return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java index 3d7ee12a81..1990e1e701 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java @@ -37,7 +37,6 @@ public class ExAskCoupleAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_COUPLE_ACTION.writeId(packet); - packet.writeD(_actionId); packet.writeD(_objectId); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java index 61cabedd98..45615daf5a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java @@ -39,9 +39,8 @@ public class ExAskJoinMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_MPCC.writeId(packet); - packet.writeS(_requestorName); // name of CCLeader - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java index 17fa9d028f..908022ff7e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java @@ -38,7 +38,6 @@ public class ExAskJoinPartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_PARTY_ROOM.writeId(packet); - packet.writeS(_charName); packet.writeS(_roomName); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java index 2a6b958dc9..1551840013 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java @@ -38,7 +38,6 @@ public class ExAskModifyPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_MODIFY_PARTY_LOOTING.writeId(packet); - packet.writeS(_requestor); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java index 958e7c3d06..fa62c8a207 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java @@ -45,7 +45,6 @@ public class ExAttributeEnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ATTRIBUTE_ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeC(_isWeapon); packet.writeH(_type); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java index 1a3a1ef3fe..3d65055b3c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java @@ -41,9 +41,8 @@ public class ExAutoSoulShot implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AUTO_SOUL_SHOT.writeId(packet); - packet.writeD(_itemId); - packet.writeD(_enable ? 0x01 : 0x00); + packet.writeD(_enable ? 1 : 0); packet.writeD(_type); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java index 8680c6bd7a..a8137347ec 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java @@ -37,8 +37,7 @@ public class ExBaseAttributeCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASE_ATTRIBUTE_CANCEL_RESULT.writeId(packet); - - packet.writeD(0x01); // result + packet.writeD(1); // result packet.writeD(_objId); packet.writeD(_attribute); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java index 755fbc66c8..a454d136c6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java @@ -75,7 +75,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 1149, 1150, 1151, 1152, 1153, 1154, 1155 }; - public static final int[] DEFAULT_ACTION_LIST = { 0, 1, 2, 3, @@ -147,7 +146,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 5012, 5013, 5014, 5015 }; //@formatter:on - public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST); private final int[] _actionIds; @@ -161,7 +159,6 @@ public class ExBasicActionList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASIC_ACTION_LIST.writeId(packet); - packet.writeD(_actionIds.length); for (int _actionId : _actionIds) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java index 4c4fac8c91..d32dca4d21 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java @@ -34,13 +34,14 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBeautyItemList implements IClientOutgoingPacket { - private int _colorCount; - private final BeautyData _beautyData; - private final Map> _colorData = new HashMap<>(); private static final int HAIR_TYPE = 0; private static final int FACE_TYPE = 1; private static final int COLOR_TYPE = 2; + private int _colorCount; + private final BeautyData _beautyData; + private final Map> _colorData = new HashMap<>(); + public ExBeautyItemList(Player player) { _beautyData = BeautyShopData.getInstance().getBeautyData(player.getRace(), player.getAppearance().getSexType()); @@ -60,7 +61,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BEAUTY_ITEM_LIST.writeId(packet); - packet.writeD(HAIR_TYPE); packet.writeD(_beautyData.getHairList().size()); for (BeautyItem hair : _beautyData.getHairList().values()) @@ -72,7 +72,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(hair.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(FACE_TYPE); packet.writeD(_beautyData.getFaceList().size()); for (BeautyItem face : _beautyData.getFaceList().values()) @@ -84,7 +83,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(face.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(COLOR_TYPE); packet.writeD(_colorCount); for (Entry> entry : _colorData.entrySet()) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java index 1825236886..6d4c45cb2b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java @@ -34,7 +34,6 @@ public class ExBirthdayPopup implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_BIRTH_DAY.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java index 7d2f17e697..43e525f05f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java @@ -26,6 +26,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBrBroadcastEventState implements IClientOutgoingPacket { + public static final int APRIL_FOOLS = 20090401; + public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) + public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) + public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) + public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) + private final int _eventId; private final int _eventState; private int _param0; @@ -36,12 +42,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket private String _param5; private String _param6; - public static final int APRIL_FOOLS = 20090401; - public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) - public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) - public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) - public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) - public ExBrBroadcastEventState(int eventId, int eventState) { _eventId = eventId; @@ -65,7 +65,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BROADCAST_EVENT_STATE.writeId(packet); - packet.writeD(_eventId); packet.writeD(_eventState); packet.writeD(_param0); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java index 1fd7ec663a..c0683c8797 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java @@ -44,7 +44,6 @@ public class ExBrBuffEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUFF_EVENT_STATE.writeId(packet); - packet.writeD(_type); packet.writeD(_value); packet.writeD(_state); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java index 943aae8a62..8e009d7b09 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java @@ -43,7 +43,6 @@ public class ExBrLoadEventTopRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_LOAD_EVENT_TOP_RANKERS.writeId(packet); - packet.writeD(_eventId); packet.writeD(_day); packet.writeD(_count); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java index 0a0ddf31b8..291f7a6b55 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java @@ -36,9 +36,8 @@ public class ExBrPremiumState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PREMIUM_STATE.writeId(packet); - packet.writeD(_player.getObjectId()); - packet.writeC(_player.hasPremiumStatus() || (_player.getVipTier() > 0) ? 0x01 : 0x00); + packet.writeC(_player.hasPremiumStatus() || (_player.getVipTier() > 0) ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 381dd859ad..567cfc70f9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -59,10 +59,8 @@ public class ExBuySellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x01); // Type SELL + packet.writeD(1); // Type SELL packet.writeD(_inventorySlots); - if ((_sellList != null)) { packet.writeH(_sellList.size()); @@ -74,9 +72,8 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - if ((_refundList != null) && !_refundList.isEmpty()) { packet.writeH(_refundList.size()); @@ -90,10 +87,9 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - - packet.writeC(_done ? 0x01 : 0x00); + packet.writeC(_done ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java index 2b43c0ce4b..e0ec81e0e7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java @@ -39,7 +39,6 @@ public class ExCastleState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CASTLE_STATE.writeId(packet); - packet.writeD(_castleId); packet.writeD(_castleSide.ordinal()); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java index b7f90d261b..a8196c7a83 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java @@ -52,7 +52,6 @@ public class ExChangeClientEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_CLIENT_EFFECT_INFO.writeId(packet); - packet.writeD(_type); packet.writeD(_key); packet.writeD(_value); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java index 472abc88df..eea59162ee 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java @@ -37,7 +37,6 @@ public class ExChangeNpcState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NPC_STATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java index 8cdcb4460d..45f2805517 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java @@ -49,7 +49,6 @@ public class ExChangePostState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_POST_STATE.writeId(packet); - packet.writeD(_receivedBoard ? 1 : 0); packet.writeD(_changedMsgIds.length); for (int postId : _changedMsgIds) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java index fc58ec9a2e..d765ab54e0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java @@ -35,7 +35,6 @@ public class ExChangeToAwakenedClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_TO_AWAKENED_CLASS.writeId(packet); - packet.writeD(_classId); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index f51a3eb3ae..1e9b8e9dc8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -47,7 +47,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket throw new IllegalArgumentException("Undefined Atribute item: " + stone); } _level = ElementalAttributeData.getInstance().getMaxElementLevel(_itemId); - // Register only items that can be put an attribute stone/crystal for (Item item : player.getInventory().getItems()) { @@ -62,7 +61,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_INVENTORY_ATTRIBUTE_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeQ(_count); packet.writeD(_atribute == AttributeType.FIRE ? 1 : 0); // Fire diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java index a272d85469..238882cd11 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java @@ -35,7 +35,6 @@ public class ExCloseMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java index d2ecd70952..877bca760a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java @@ -34,7 +34,6 @@ public class ExClosePartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_PARTY_ROOM.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java index 27c112776b..1d02c972b5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java @@ -54,7 +54,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLOSSEUM_FENCE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_clientState); packet.writeD(_x); @@ -62,7 +61,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_width); packet.writeD(_length); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java index 766d3619ad..b72bef93e8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java @@ -37,9 +37,8 @@ public class ExConfirmAddingContact implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AGIT_AUCTION_CMD.writeId(packet); - packet.writeS(_charName); - packet.writeD(_added ? 0x01 : 0x00); + packet.writeD(_added ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java index beded32254..c832d507ed 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameAddPlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x01); - + packet.writeD(1); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java index 5f36f730d0..847ea93e6a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java @@ -45,9 +45,7 @@ public class ExCubeGameChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java index 66abbf4b75..a2f2e61ded 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java @@ -43,12 +43,10 @@ public class ExCubeGameChangeTeam implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x05); - + packet.writeD(5); packet.writeD(_player.getObjectId()); - packet.writeD(_fromRedTeam ? 0x01 : 0x00); - packet.writeD(_fromRedTeam ? 0x00 : 0x01); + packet.writeD(_fromRedTeam ? 1 : 0); + packet.writeD(_fromRedTeam ? 0 : 1); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java index 5273b2099a..136b439283 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java @@ -39,9 +39,7 @@ public class ExCubeGameChangeTimeToStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x03); - + packet.writeD(3); packet.writeD(_seconds); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java index f81a302941..9bdba49029 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java @@ -35,7 +35,6 @@ public class ExCubeGameCloseUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0xffffffff); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java index 259a0e9407..3177e7a488 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java @@ -40,11 +40,9 @@ public class ExCubeGameEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x01); - - packet.writeD(_isRedTeamWin ? 0x01 : 0x00); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(1); + packet.writeD(_isRedTeamWin ? 1 : 0); + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java index 4d89e621ce..8b96bb545f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java @@ -55,14 +55,11 @@ public class ExCubeGameExtendedChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeD(_playerPoints); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java index e5a00f1ab7..c084789f13 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameRemovePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java index 00be884d2f..35a3f289d1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java @@ -35,8 +35,7 @@ public class ExCubeGameRequestReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x04); + packet.writeD(4); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java index 1bc89e0c32..8b755dd3cc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java @@ -30,7 +30,6 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket // Players Lists private final List _bluePlayers; private final List _redPlayers; - // Common Values private final int _roomNumber; @@ -51,12 +50,9 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_roomNumber); packet.writeD(0xffffffff); - packet.writeD(_bluePlayers.size()); for (Player player : _bluePlayers) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java index 2f2c092c08..d000112787 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java @@ -31,7 +31,6 @@ public class ExCursedWeaponList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet); - final Set ids = CursedWeaponsManager.getInstance().getCursedWeaponsIds(); packet.writeD(ids.size()); ids.forEach(packet::writeD); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java index 2f60a1b80c..5bc7ff3238 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java @@ -39,7 +39,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet); - if (!_cursedWeaponInfo.isEmpty()) { packet.writeD(_cursedWeaponInfo.size()); @@ -47,7 +46,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { packet.writeD(w.id); packet.writeD(w.activated); - packet.writeD(w.pos.getX()); packet.writeD(w.pos.getY()); packet.writeD(w.pos.getZ()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java index a0ba15da9f..8bee464fb0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java @@ -41,7 +41,6 @@ public class ExDieInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIE_INFO.writeId(packet); - packet.writeH(_droppedItems.size()); for (Item item : _droppedItems) { @@ -49,17 +48,15 @@ public class ExDieInfo implements IClientOutgoingPacket packet.writeD(item.getEnchantLevel()); packet.writeD((int) item.getCount()); } - packet.writeD(_lastDamageTaken.size()); for (DamageTakenHolder damageHolder : _lastDamageTaken) { packet.writeS(damageHolder.getCreature().getName()); - packet.writeH(0x00); + packet.writeH(0); packet.writeD(damageHolder.getSkillId()); packet.writeF(damageHolder.getDamage()); - packet.writeD(0x00); + packet.writeD(0); } - return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java index f475a02b28..0456fb9dae 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java @@ -34,7 +34,6 @@ public class ExDissmissMPCCRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DISSMISS_MPCC_ROOM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java index 258010f717..c731b7c7a9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java @@ -37,7 +37,6 @@ public class ExDuelAskStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_ASK_START.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDuel); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java index 043c82c0db..e9a31bee57 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java @@ -38,7 +38,6 @@ public class ExDuelEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_END.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java index 264409b3d6..e1fa1cea88 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java @@ -38,7 +38,6 @@ public class ExDuelReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_READY.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java index 488aafcb7d..ecdd528a16 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java @@ -38,7 +38,6 @@ public class ExDuelStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_START.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java index 7df040c5e7..5ed0c09675 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java @@ -36,7 +36,6 @@ public class ExDuelUpdateUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_UPDATE_USER_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeD(_player.getClassId().getId()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 7ab055a3d8..f58c0573a8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExEnchantSkillInfo implements IClientOutgoingPacket { private final Set _routes; - private final int _skillId; private final int _skillLevel; private final int _skillSubLevel; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 41368a8efb..e4ee350e64 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -50,7 +50,6 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_INFO_DETAIL.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java index 5cedcd6284..1d32f0d725 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java @@ -43,7 +43,6 @@ public class ExEnchantSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_LIST.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skills.size()); for (Skill skill : _skills) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java index 6ab5e869f2..853d74039f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java @@ -38,7 +38,6 @@ public class ExEnchantSkillResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_RESULT.writeId(packet); - packet.writeD(_enchanted ? 1 : 0); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java index 7b7d2d008d..410bf16510 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java @@ -42,7 +42,6 @@ public class ExEventMatchMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_EVENT_MATCH_MESSAGE.writeId(packet); - packet.writeC(_type); packet.writeS(_message); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java index 7264e90233..1946758bf5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java @@ -37,11 +37,9 @@ public class ExGetBookMarkInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOOK_MARK_INFO.writeId(packet); - - packet.writeD(0x00); // Dummy + packet.writeD(0); // Dummy packet.writeD(_player.getBookMarkSlot()); packet.writeD(_player.getTeleportBookmarks().size()); - for (TeleportBookmark tpbm : _player.getTeleportBookmarks()) { packet.writeD(tpbm.getId()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java index 36e7bb81af..201e8eb49b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java @@ -42,15 +42,14 @@ public class ExGetBossRecord implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOSS_RECORD.writeId(packet); - packet.writeD(_ranking); packet.writeD(_totalPoints); if (_bossRecordInfo == null) { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } else { @@ -59,7 +58,7 @@ public class ExGetBossRecord implements IClientOutgoingPacket { packet.writeD(entry.getKey()); packet.writeD(entry.getValue()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? } } return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java index ea0a5f8b18..85ccad0758 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java @@ -41,7 +41,6 @@ public class ExGetOffAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_OFF_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_x); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java index f8e16a4191..9a02e49223 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java @@ -39,7 +39,6 @@ public class ExGetOnAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_ON_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java index 51197344a5..704b3212a1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExGetPremiumItemList implements IClientOutgoingPacket { private final Player _player; - private final Map _map; public ExGetPremiumItemList(Player player) @@ -43,7 +42,6 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_PREMIUM_ITEM_LIST.writeId(packet); - packet.writeD(_map.size()); for (Entry entry : _map.entrySet()) { @@ -51,7 +49,7 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket packet.writeQ(entry.getKey()); packet.writeD(item.getItemId()); packet.writeQ(item.getCount()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeS(item.getSender()); } return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index 5f4810be42..34ef181b22 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -40,19 +40,18 @@ public class ExHeroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HERO_LIST.writeId(packet); - packet.writeD(_heroList.size()); for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); packet.writeD(hero.getInt(Olympiad.CLASS_ID)); packet.writeS(hero.getString(Hero.CLAN_NAME, "")); - packet.writeD(0x00); // hero.getInt(Hero.CLAN_CREST, 0) + packet.writeD(0); // hero.getInt(Hero.CLAN_CREST, 0) packet.writeS(hero.getString(Hero.ALLY_NAME, "")); - packet.writeD(0x00); // hero.getInt(Hero.ALLY_CREST, 0) + packet.writeD(0); // hero.getInt(Hero.ALLY_CREST, 0) packet.writeD(hero.getInt(Hero.COUNT)); - packet.writeD(0x00); - packet.writeC(0x00); // 272 + packet.writeD(0); + packet.writeC(0); // 272 } return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index d5b5430142..0baca7cd86 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -48,8 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); - - packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade + packet.writeC(_hide ? 0 : 1); // Grand Crusade packet.writeD(_currentTemplateId); packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java index 81db66b88f..323c0cdf1e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java @@ -35,7 +35,6 @@ public class ExIsCharNameCreatable implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_IS_CHAR_NAME_CREATABLE.writeId(packet); - packet.writeD(_allowed); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java index 6f00d41989..132003d4d8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExItemAnnounce implements IClientOutgoingPacket { - public static final int ENCHANT = 0x00; - public static final int RANDOM_CRAFT = 0x02; + public static final int ENCHANT = 0; + public static final int RANDOM_CRAFT = 2; private final Item _item; private final Player _player; @@ -48,7 +48,7 @@ public class ExItemAnnounce implements IClientOutgoingPacket packet.writeString(_player.getName()); // name of player packet.writeD(_item.getId()); // item id packet.writeD(_item.getEnchantLevel()); // enchant level - packet.writeC(0x00); // name of item + packet.writeC(0); // name of item return true; } } \ No newline at end of file diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java index ecc751eab3..45def9e0be 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java @@ -38,7 +38,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { throw new NullPointerException(); } - if (currentAuction.getAuctionState() != ItemAuctionState.STARTED) { _timeRemaining = 0; @@ -47,7 +46,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { _timeRemaining = (int) (currentAuction.getFinishingTimeRemaining() / 1000); // in seconds } - _refresh = refresh; _currentAuction = currentAuction; _nextAuction = nextAuction; @@ -57,16 +55,12 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_AUCTION_INFO.writeId(packet); - - packet.writeC(_refresh ? 0x00 : 0x01); + packet.writeC(_refresh ? 0 : 1); packet.writeD(_currentAuction.getInstanceId()); - final ItemAuctionBid highestBid = _currentAuction.getHighestBid(); packet.writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid()); - packet.writeD(_timeRemaining); writeItem(packet, _currentAuction.getItemInfo()); - if (_nextAuction != null) { packet.writeQ(_nextAuction.getAuctionInitBid()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExLetterCollectorUI.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExLetterCollectorUI.java index 1f6701e6dc..61e987edef 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExLetterCollectorUI.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExLetterCollectorUI.java @@ -36,7 +36,7 @@ public class ExLetterCollectorUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LETTER_COLLECTOR_UI_LAUNCHER.writeId(packet); - packet.writeC(0x01); // enabled (0x00 - no, 0x01 -yes) + packet.writeC(1); // enabled (0x00 - no, 0x01 -yes) packet.writeD(LETTER_COLLECTOR_MIN_LEVEL); // Minimum Level return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java index 53ad8abd58..1c5e38cbab 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListMpccWaiting implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _rooms = new LinkedList<>(); @@ -53,7 +54,6 @@ public class ExListMpccWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_MPCC_WAITING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 78f2fec636..eafea24fa6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _players = new LinkedList<>(); @@ -60,7 +61,6 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(packet); - packet.writeD(_size); packet.writeD(_players.size()); for (Player player : _players) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java index 786c616875..c8723a9fc0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java @@ -46,7 +46,6 @@ public class ExMPCCPartyInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCPARTY_INFO_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_LeaderOID); packet.writeD(_memberCount); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java index 4bf07f0133..08259e4e6c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java @@ -37,7 +37,6 @@ public class ExMPCCPartymasterList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_PARTYMASTER_LIST.writeId(packet); - packet.writeD(_leadersName.size()); _leadersName.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java index abbdc8fe76..f021ef5f1f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java @@ -36,7 +36,6 @@ public class ExMPCCRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java index 154e156270..2eec590cb4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java @@ -41,7 +41,6 @@ public class ExMPCCRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java index 06e3027bfc..a0e9d0a4b0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java @@ -37,7 +37,6 @@ public class ExMPCCShowPartyMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCSHOW_PARTY_MEMBER_INFO.writeId(packet); - packet.writeD(_party.getMemberCount()); for (Player pc : _party.getMembers()) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java index e454a746f3..771b2f22cb 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java @@ -49,7 +49,6 @@ public class ExMagicAttackInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAGIC_ATTACK_INFO.writeId(packet); - packet.writeD(_caster); packet.writeD(_target); packet.writeD(_type); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java index 9cfbeb5aee..1aaa5b6520 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java @@ -35,7 +35,6 @@ public class ExMailArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAIL_ARRIVED.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java index 983ff22b92..48156c0600 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java @@ -44,7 +44,6 @@ public class ExManageMpccRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MANAGE_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java index f710c006e8..9d7d14211e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java @@ -45,7 +45,6 @@ public class ExMoveToLocationAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_objId); packet.writeD(_tx); packet.writeD(_ty); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java index 3e3bdc9fed..87e44b51cd 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java @@ -43,7 +43,6 @@ public class ExMoveToLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java index 7ab0d1c7da..3c1902892a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java @@ -40,11 +40,9 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet); - packet.writeS(_channel.getLeader().getName()); - packet.writeD(0x00); // Channel loot 0 or 1 + packet.writeD(0); // Channel loot 0 or 1 packet.writeD(_channel.getMemberCount()); - packet.writeD(_channel.getParties().size()); for (Party p : _channel.getParties()) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java index 1536bd5f9b..f2a32bb6e8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java @@ -43,7 +43,6 @@ public class ExNeedToChangeName implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEED_TO_CHANGE_NAME.writeId(packet); - packet.writeD(_type); packet.writeD(_subType); packet.writeS(_name); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java index be9bec8559..d18b4606b3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java @@ -35,7 +35,6 @@ public class ExNevitAdventEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CHANNELING_EFFECT.writeId(packet); - packet.writeD(_timeLeft); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java index 3a0367c178..09f6250f51 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java @@ -35,7 +35,6 @@ public class ExNevitAdventPointInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_AGATHION_ENERGY_INFO.writeId(packet); - packet.writeD(_points); // 72 = 1%, max 7200 = 100% return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java index 88fdaae499..ef220d86de 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java @@ -37,9 +37,8 @@ public class ExNevitAdventTimeChange implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - // state 0 - pause 1 - started - packet.writeC(_paused ? 0x00 : 0x01); + packet.writeC(_paused ? 0 : 1); // left time in ms max is 16000 its 4m and state is automatically changed to quit packet.writeD(_time); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java index fccdf510cc..4025bf78fa 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java @@ -34,7 +34,6 @@ public class ExNewSkillToLearnByLevelUp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEW_SKILL_TO_LEARN_BY_LEVEL_UP.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java index 324c18a517..f2ce8614dc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java @@ -43,8 +43,7 @@ public class ExNoticePostArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTICE_POST_ARRIVED.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java index afe3719d9b..050c7ccea5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java @@ -43,8 +43,7 @@ public class ExNoticePostSent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_WRITE_POST.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java index 5d98c20b09..e0bd08d39a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java @@ -30,7 +30,6 @@ public class ExNotifyPremiumItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_PREMIUM_ITEM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java index 6cb3724448..ba3c0cfeaa 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java @@ -34,7 +34,6 @@ public class ExOlympiadMatchEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MATCH_END.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java index 264d5aa484..7ffd5ed3bd 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java @@ -55,19 +55,15 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x00); // Type 0 = Match List, 1 = Match Result - + packet.writeD(0); // Type 0 = Match List, 1 = Match Result packet.writeD(_games.size()); - packet.writeD(0x00); - + packet.writeD(0); for (OlympiadGameTask curGame : _games) { final AbstractOlympiadGame game = curGame.getGame(); if (game != null) { packet.writeD(game.getStadiumId()); // Stadium Id (Arena 1 = 0) - if (game instanceof OlympiadGameNonClassed) { packet.writeD(1); @@ -80,8 +76,7 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket { packet.writeD(0); } - - packet.writeD(curGame.isRunning() ? 0x02 : 0x01); // (1 = Standby, 2 = Playing) + packet.writeD(curGame.isRunning() ? 2 : 1); // (1 = Standby, 2 = Playing) packet.writeS(game.getPlayerNames()[0]); // Player 1 Name packet.writeS(game.getPlayerNames()[1]); // Player 2 Name } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java index 712651603d..b387271fba 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java @@ -53,9 +53,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x01); // Type 0 = Match List, 1 = Match Result - + packet.writeD(1); // Type 0 = Match List, 1 = Match Result packet.writeD(_tie ? 1 : 0); // 0 - win, 1 - tie packet.writeS(_winnerList.get(0).getName()); packet.writeD(_winTeam); @@ -69,9 +67,8 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } - packet.writeD(_loseTeam); packet.writeD(_loserList.size()); for (OlympiadInfo info : _loserList) @@ -83,7 +80,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java index 34d81d1f53..712b9e06c6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java @@ -38,7 +38,6 @@ public class ExOlympiadMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MODE.writeId(packet); - packet.writeC(_mode); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java index ebea6c56f3..5b4f2c2523 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java @@ -53,7 +53,6 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_SPELLED_INFO.writeId(packet); - packet.writeD(_playerId); packet.writeD(_effects.size() + _effects2.size()); for (BuffInfo info : _effects) @@ -62,7 +61,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(info.getSkill().getDisplayId()); packet.writeH(info.getSkill().getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(info.getSkill().getAbnormalType().getClientId()); writeOptionalD(packet, info.getSkill().isAura() ? -1 : info.getTime()); } @@ -73,7 +72,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(skill.getDisplayId()); packet.writeH(skill.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(skill.getAbnormalType().getClientId()); packet.writeH(-1); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java index 18c34fe9de..ca473edfcf 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java @@ -76,7 +76,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_USER_INFO.writeId(packet); - if (_player != null) { packet.writeC(_player.getOlympiadSide()); @@ -91,7 +90,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket packet.writeS(_par.getName()); packet.writeD(_par.getBaseClass()); } - packet.writeD(_curHp); packet.writeD(_maxHp); packet.writeD(_curCp); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java index e84d0251bd..7ec64cc8c3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java @@ -35,7 +35,6 @@ public class ExOpenMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OPEN_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java index 90349cc1a2..5661dc9f57 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java @@ -56,7 +56,6 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PCCAFE_POINT_INFO.writeId(packet); - packet.writeD(_points); // num points packet.writeD(_mAddPoint); // points inc display packet.writeC(_mPeriodType); // period(0=don't show window,1=acquisition,2=use points) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java index f7e8b4a99a..248a2f7d98 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_ADD.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java index 832bee0012..1f452f4bae 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_DELETE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_summon.getSummonType()); packet.writeD(_summon.getOwner().getObjectId()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java index 0646a67001..703694fa2f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_UPDATE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 0e3edb3ea7..e4c6b79ae0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -47,7 +47,6 @@ public class ExPartyRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java index 082f4c7662..0f72c05a3a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java @@ -34,7 +34,6 @@ public class ExPlayScene implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLAY_SCENE.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java index e98d317e14..7e3803bdaa 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java @@ -36,7 +36,6 @@ public class ExPledgeCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_COUNT.writeId(packet); - packet.writeD(_count); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java index 838029e284..4084de3481 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java @@ -38,7 +38,6 @@ public class ExPledgeDraftListSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_DRAFT_LIST_SEARCH.writeId(packet); - packet.writeD(_pledgeRecruitList.size()); for (PledgeWaitingInfo prl : _pledgeRecruitList) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java index fb956e9996..44e34004ea 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java @@ -25,11 +25,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExPledgeEmblem implements IClientOutgoingPacket { + private static final int TOTAL_SIZE = 65664; + private final int _crestId; private final int _clanId; private final byte[] _data; private final int _chunkId; - private static final int TOTAL_SIZE = 65664; public ExPledgeEmblem(int crestId, byte[] chunkedData, int clanId, int chunkId) { @@ -43,7 +44,6 @@ public class ExPledgeEmblem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clanId); packet.writeD(_crestId); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java index ed19bf976b..b32f8c0645 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitApplyInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_APPLY_INFO.writeId(packet); - packet.writeD(_status.ordinal()); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java index fc98b7b6f7..af4af9c9c1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitBoardDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_DETAIL.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClanId()); packet.writeD(_pledgeRecruitInfo.getKarma()); packet.writeS(_pledgeRecruitInfo.getInformation()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index b4d48373a6..eda808e754 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -34,7 +34,6 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket private final int _clanOnCurrentPage; private final int _startIndex; private final int _endIndex; - static final int CLAN_PER_PAGE = 12; public ExPledgeRecruitBoardSearch(List clanList, int currentPage) @@ -51,11 +50,9 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_SEARCH.writeId(packet); - packet.writeD(_currentPage); packet.writeD(_totalNumberOfPage); packet.writeD(_clanOnCurrentPage); - for (int i = _startIndex; i < _endIndex; i++) { packet.writeD(_clanList.get(i).getClanId()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 4ae5ffe316..b1f139226d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -40,7 +40,6 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java index 77080a3820..5844f220ec 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java @@ -39,7 +39,6 @@ public class ExPledgeWaitingList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST.writeId(packet); - packet.writeD(pledgePlayerRecruitInfos.size()); for (PledgeApplicantInfo recruitInfo : pledgePlayerRecruitInfos.values()) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java index a9245c1309..6b88572057 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java @@ -30,7 +30,6 @@ public class ExPledgeWaitingListAlarm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_ALARM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java index 60997b3da0..28c3967119 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java @@ -40,7 +40,6 @@ public class ExPledgeWaitingListApplied implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_APPLIED.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClan().getId()); packet.writeS(_pledgeRecruitInfo.getClan().getName()); packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java index 66a06892c2..1f53d1bb38 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java @@ -36,7 +36,6 @@ public class ExPledgeWaitingUser implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_USER.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getPlayerId()); packet.writeS(_pledgeRecruitInfo.getMessage()); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java index 49bc9b0995..5f404779f5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java @@ -43,7 +43,6 @@ public class ExPrivateStoreSetWholeMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_objectId); packet.writeS(_msg); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java index cb5e8fbce9..ff996b5d0c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutCommissionResultForVariationMake implements IClientOutgoingPac public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_COMMISSION_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_gemstoneObjId); packet.writeD(_itemId); packet.writeQ(_gemstoneCount); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java index 81721e921f..098472b7ae 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantScrollItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SCROLL_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java index 871f377db2..ffea182a49 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java index c47a4bcff4..8016e128f4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java index c8b46be499..95c0c0e4e1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_INTENSIVE_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_refinerItemObjId); packet.writeD(_lifestoneItemId); packet.writeD(_gemstoneItemId); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 2128b2b19f..2970ca00a2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -41,13 +41,12 @@ public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_CANCEL.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); packet.writeD(_itemAug1); packet.writeD(_itemAug2); packet.writeQ(_price); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java index 80541e65cd..c25dd16b01 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java @@ -34,10 +34,9 @@ public class ExPutItemResultForVariationMake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java index fe5eb74eb0..bc8896164d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java @@ -56,13 +56,12 @@ public class ExQuestNpcLogList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_NPC_LOG_LIST.writeId(packet); - packet.writeD(_questId); packet.writeC(_npcLogList.size()); for (NpcLogListHolder holder : _npcLogList) { packet.writeD(holder.isNpcString() ? holder.getId() : holder.getId() + 1000000); - packet.writeC(holder.isNpcString() ? 0x01 : 0x00); + packet.writeC(holder.isNpcString() ? 1 : 0); packet.writeD(holder.getCount()); } return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java index 62d622caff..60616b256d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java @@ -35,7 +35,6 @@ public class ExRedSky implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RED_SKY.writeId(packet); - packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java index ce40b1a792..163faff855 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java @@ -36,7 +36,6 @@ public class ExRegenMax implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REGEN_MAX.writeId(packet); - packet.writeD(1); packet.writeD(_time); packet.writeD(_tickInterval); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java index d864795cd6..a17525576b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java @@ -34,7 +34,6 @@ public class ExRemoveEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REMOVE_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 57ed88ac29..4e479e75a6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -56,7 +56,6 @@ public class ExReplyReceivedPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_RECEIVED_POST.writeId(packet); - packet.writeD(_msg.getMailType().ordinal()); // GOD if (_msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED) { @@ -76,11 +75,10 @@ public class ExReplyReceivedPost extends AbstractItemPacket } packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown packet.writeS(_msg.getSenderName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -92,9 +90,8 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeQ(_msg.getReqAdena()); packet.writeD(_msg.hasAttachments() ? 1 : 0); packet.writeD(_msg.isReturned() ? 1 : 0); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 75f6596194..ed490eae91 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -54,14 +54,12 @@ public class ExReplySentPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_SENT_POST.writeId(packet); - - packet.writeD(0x00); // GOD + packet.writeD(0); // GOD packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); packet.writeS(_msg.getReceiverName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -73,11 +71,11 @@ public class ExReplySentPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeQ(_msg.getReqAdena()); - packet.writeD(_msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(_msg.isReturned() ? 0x01 : 00); + packet.writeD(_msg.hasAttachments() ? 1 : 0); + packet.writeD(_msg.isReturned() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index cc4f7ce1d8..e6a3f9bca2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -35,7 +35,6 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java index 2634aa1cdd..60201b177f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java @@ -35,7 +35,6 @@ public class ExRequestHackShield implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REQUEST_HACK_SHIELD.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java index c51ff31d0b..75e3b3a945 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java @@ -29,13 +29,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyList implements IClientOutgoingPacket { + public static final int SHOW_FACESHAPE = 1; + public static final int SHOW_HAIRSTYLE = 0; + private final Player _player; private final int _type; private final Map _beautyItem; - public static final int SHOW_FACESHAPE = 1; - public static final int SHOW_HAIRSTYLE = 0; - public ExResponseBeautyList(Player player, int type) { _player = player; @@ -54,7 +54,6 @@ public class ExResponseBeautyList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java index ca2ed360ab..4b19201833 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java @@ -25,16 +25,15 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket { + public static final int FAILURE = 0; + public static final int SUCCESS = 1; + public static final int CHANGE = 0; + public static final int RESTORE = 1; + private final Player _player; private final int _type; private final int _result; - public static final int FAILURE = 0; - public static final int SUCCESS = 1; - - public static final int CHANGE = 0; - public static final int RESTORE = 1; - public ExResponseBeautyRegistReset(Player player, int type, int result) { _player = player; @@ -46,7 +45,6 @@ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_REGIST_RESET.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java index 0e313ef3b7..c0922cfb04 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java @@ -36,10 +36,8 @@ public class ExResponseResetList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_RESET_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); - packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java index 01fe1945ef..a230033d67 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java @@ -37,7 +37,6 @@ public class ExRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ROTATION.writeId(packet); - packet.writeD(_charId); packet.writeD(_heading); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index c58ccfc233..2646a71e77 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -36,7 +36,6 @@ public class ExRpItemLink extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RP_ITEM_LINK.writeId(packet); - writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java index 04556bbed2..f0c6eba8e9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java @@ -34,7 +34,6 @@ public class ExSearchOrc implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEARCH_ORC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index 1e06cc2a3f..7a4dced122 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -38,7 +38,6 @@ public class ExSendManorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_MANOR_LIST.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java index b63c69f37e..2c25cc8bfc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java @@ -124,7 +124,6 @@ public class ExSendUIEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_UIEVENT.writeId(packet); - packet.writeD(_objectId); packet.writeD(_type); // 0 = show, 1 = hide (there is 2 = pause and 3 = resume also but they don't work well you can only pause count down and you cannot resume it because resume hides the counter). packet.writeD(0); // unknown diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java index 4378479707..716a3e8623 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java @@ -385,16 +385,13 @@ public class ExServerPrimitive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SERVER_PRIMITIVE.writeId(packet); - packet.writeS(_name); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(65535); // has to do something with display range and angle packet.writeD(65535); // has to do something with display range and angle - packet.writeD(_points.size() + _lines.size()); - for (Point point : _points) { packet.writeC(1); // Its the type in this case Point @@ -408,7 +405,6 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(point.getY()); packet.writeD(point.getZ()); } - for (Line line : _lines) { packet.writeC(2); // Its the type in this case Line diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java index fb32e199b2..51fb91b643 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java @@ -46,7 +46,6 @@ public class ExSetCompassZoneCode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_COMPASS_ZONE_CODE.writeId(packet); - packet.writeD(_zoneType); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java index 1d0fbae3a4..34dee8bda0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java @@ -38,7 +38,6 @@ public class ExSetPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_PARTY_LOOTING.writeId(packet); - packet.writeD(_result); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java index 7b14ec8412..4e491af9d1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java @@ -34,7 +34,6 @@ public class ExShowAdventurerGuideBook implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_ADVENTURER_GUIDE_BOOK.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index 82554fdc5f..1f8df76083 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -39,7 +39,6 @@ public class ExShowAgitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AGIT_INFO.writeId(packet); - final Collection clanHalls = ClanHallData.getInstance().getClanHalls(); packet.writeD(clanHalls.size()); clanHalls.forEach(clanHall -> diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index dd11ee0150..51e6646ff5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -44,7 +44,6 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BASE_ATTRIBUTE_CANCEL_WINDOW.writeId(packet); - packet.writeD(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java index 14e55d39f3..e22345c4fd 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java @@ -25,13 +25,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExShowBeautyMenu implements IClientOutgoingPacket { - private final Player _player; - private final int _type; - // TODO: Enum public static final int MODIFY_APPEARANCE = 0; public static final int RESTORE_APPEARANCE = 1; + private final Player _player; + private final int _type; + public ExShowBeautyMenu(Player player, int type) { _player = player; @@ -42,7 +42,6 @@ public class ExShowBeautyMenu implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BEAUTY_MENU.writeId(packet); - packet.writeD(_type); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 15d011befc..b0d2b90494 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -41,7 +41,6 @@ public class ExShowCastleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CASTLE_INFO.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) @@ -65,8 +64,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } packet.writeD(castle.getTaxPercent(TaxType.BUY)); packet.writeD((int) (castle.getSiege().getSiegeDate().getTimeInMillis() / 1000)); - - packet.writeC(castle.getSiege().isInProgress() ? 0x01 : 0x00); // Grand Crusade + packet.writeC(castle.getSiege().isInProgress() ? 1 : 0); // Grand Crusade packet.writeC(castle.getSide().ordinal()); // Grand Crusade } return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java index aeb4079f3a..f9a6ebe0e7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java @@ -38,7 +38,6 @@ public class ExShowContactList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_SHOW_POST_FRIEND.writeId(packet); - packet.writeD(_contacts.size()); _contacts.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index a079ea3129..94b989b583 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -37,7 +37,6 @@ public class ExShowCropInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _crops = (nextPeriod && !manor.isManorApproved()) ? null : manor.getCropProcure(manorId, nextPeriod); } @@ -46,10 +45,9 @@ public class ExShowCropInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Crop Sales" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Crop Sales" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); + packet.writeD(0); if (_crops != null) { packet.writeD(_crops.size()); @@ -64,17 +62,17 @@ public class ExShowCropInfo implements IClientOutgoingPacket if (seed == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(seed.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(seed.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(seed.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index ebffd775d8..1f01ee7b87 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -62,10 +62,8 @@ public class ExShowCropSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getCropId()); // crop id diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index ee9fa9fd37..b625a1e4e7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -39,7 +39,6 @@ public class ExShowFortressInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_INFO.writeId(packet); - final Collection forts = FortManager.getInstance().getForts(); packet.writeD(forts.size()); for (Fort fort : forts) @@ -47,7 +46,7 @@ public class ExShowFortressInfo implements IClientOutgoingPacket final Clan clan = fort.getOwnerClan(); packet.writeD(fort.getResidenceId()); packet.writeS(clan != null ? clan.getName() : ""); - packet.writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00); + packet.writeD(fort.getSiege().isInProgress() ? 1 : 0); // Time of possession packet.writeD(fort.getOwnedTime()); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index f389b26ed5..678ab43e96 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -42,11 +42,9 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_MAP_INFO.writeId(packet); - packet.writeD(_fortress.getResidenceId()); packet.writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status packet.writeD(_fortress.getFortSize()); // barracks count - final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId()); if ((commanders != null) && !commanders.isEmpty() && _fortress.getSiege().isInProgress()) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 27da99cf41..da186103ae 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -51,7 +51,6 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_SIEGE_INFO.writeId(packet); - packet.writeD(_fortId); // Fortress Id packet.writeD(_size); // Total Barracks Count if (_csize > 0) @@ -64,22 +63,22 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { case 0: { - packet.writeD(0x03); + packet.writeD(3); break; } case 1: { - packet.writeD(0x02); + packet.writeD(2); break; } case 2: { - packet.writeD(0x01); + packet.writeD(1); break; } case 3: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -92,27 +91,27 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket // TODO: once control room supported, update packet.writeD(0x0x) to support 5th room case 0: { - packet.writeD(0x05); + packet.writeD(5); break; } case 1: { - packet.writeD(0x04); + packet.writeD(4); break; } case 2: { - packet.writeD(0x03); + packet.writeD(3); break; } case 3: { - packet.writeD(0x02); + packet.writeD(2); break; } case 4: { - packet.writeD(0x01); + packet.writeD(1); break; } } @@ -124,7 +123,7 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { for (int i = 0; i < _size; i++) { - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java index f7aca7dffd..912839e242 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java @@ -41,8 +41,7 @@ public class ExShowManorDefaultInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_MANOR_DEFAULT_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" and "Crop Sales" buttons + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" and "Crop Sales" buttons packet.writeD(_crops.size()); for (Seed crop : _crops) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 1d3312d668..d03ce2a5fd 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -52,10 +52,8 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet); - packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java index cf38d18c1c..f41999329f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java @@ -34,7 +34,6 @@ public class ExShowQuestInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_INFO.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java index 70f31e318f..0fa64c401d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java @@ -37,7 +37,6 @@ public class ExShowQuestMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_MARK.writeId(packet); - packet.writeD(_questId); packet.writeD(_questState); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index ab85228caf..1a6ee00a10 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ExShowReceivedPostList implements IClientOutgoingPacket { - private final List _inbox; - private static final int MESSAGE_FEE = 100; private static final int MESSAGE_FEE_PER_SLOT = 1000; + private final List _inbox; + public ExShowReceivedPostList(int objectId) { _inbox = MailManager.getInstance().getInbox(objectId); @@ -45,7 +45,6 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { @@ -64,18 +63,18 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getSenderName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); + packet.writeD(msg.isUnread() ? 1 : 0); packet.writeD(((msg.getMailType() == MailType.COMMISSION_ITEM_SOLD) || (msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED)) ? 0 : 1); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(msg.isReturned() ? 0x01 : 0x00); - packet.writeD(0x00); // SysString in some case it seems + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(msg.isReturned() ? 1 : 0); + packet.writeD(0); // SysString in some case it seems } } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(MESSAGE_FEE); packet.writeD(MESSAGE_FEE_PER_SLOT); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java index 9679468789..deebb99c8f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java @@ -33,6 +33,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; */ public class ExShowScreenMessage implements IClientOutgoingPacket { + // Positions + public static final byte TOP_LEFT = 1; + public static final byte TOP_CENTER = 2; + public static final byte TOP_RIGHT = 3; + public static final byte MIDDLE_LEFT = 4; + public static final byte MIDDLE_CENTER = 5; + public static final byte MIDDLE_RIGHT = 6; + public static final byte BOTTOM_CENTER = 7; + public static final byte BOTTOM_RIGHT = 8; + private final int _type; private final int _sysMessageId; private final int _unk1; @@ -48,15 +58,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket private List _parameters; // Localisation related. private String _lang; - // Positions - public static final byte TOP_LEFT = 0x01; - public static final byte TOP_CENTER = 0x02; - public static final byte TOP_RIGHT = 0x03; - public static final byte MIDDLE_LEFT = 0x04; - public static final byte MIDDLE_CENTER = 0x05; - public static final byte MIDDLE_RIGHT = 0x06; - public static final byte BOTTOM_CENTER = 0x07; - public static final byte BOTTOM_RIGHT = 0x08; public void setLang(String lang) { @@ -265,7 +266,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SCREEN_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -284,9 +284,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(sml.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -308,9 +308,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -318,7 +318,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket } } } - packet.writeD(_type); packet.writeD(_sysMessageId); packet.writeD(_position); @@ -326,9 +325,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java index 29ab5d355f..6123b08991 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java @@ -37,7 +37,6 @@ public class ExShowSeedInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _seeds = (nextPeriod && !manor.isManorApproved()) ? null : manor.getSeedProduction(manorId, nextPeriod); } @@ -46,16 +45,14 @@ public class ExShowSeedInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown if (_seeds == null) { packet.writeD(0); return true; } - packet.writeD(_seeds.size()); for (SeedProduction seed : _seeds) { @@ -67,17 +64,17 @@ public class ExShowSeedInfo implements IClientOutgoingPacket if (s == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(s.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(s.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(s.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java index e628099700..eb6e686e10 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java @@ -32,13 +32,10 @@ public class ExShowSeedMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_MAP_INFO.writeId(packet); - packet.writeD(2); // seed count - // Seed of Destruction packet.writeD(1); // id 1? Grand Crusade packet.writeD(2770 + GraciaSeedsManager.getInstance().getSoDState()); // sys msg id - // Seed of Infinity packet.writeD(2); // id 2? Grand Crusade // Manager not implemented yet diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index 4fd891a466..373c314eba 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -62,10 +62,8 @@ public class ExShowSeedSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getSeedId()); // seed id diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 1994402da2..269bec5b97 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -47,7 +47,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _cropsItems.put(cropId, item); } } - for (CropProcure crop : CastleManorManager.getInstance().getCropProcure(_manorId, false)) { if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) @@ -61,7 +60,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_cropsItems.size()); // size for (Item item : _cropsItems.values()) @@ -70,9 +68,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket packet.writeD(item.getObjectId()); // Object id packet.writeD(item.getId()); // crop id packet.writeD(seed.getLevel()); // seed level - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(1)); // reward 1 id - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(2)); // reward 2 id if (_castleCrops.containsKey(item.getId())) { @@ -85,9 +83,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket else { packet.writeD(0xFFFFFFFF); // manor - packet.writeQ(0x00); // buy residual - packet.writeQ(0x00); // buy price - packet.writeC(0x00); // reward + packet.writeQ(0); // buy residual + packet.writeQ(0); // buy price + packet.writeC(0); // reward } packet.writeQ(item.getCount()); // my crops } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index db4bccc928..b61d5b2301 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -40,7 +40,6 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { @@ -50,17 +49,17 @@ public class ExShowSentPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getReceiverName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); - packet.writeD(0x01); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(msg.isUnread() ? 1 : 0); + packet.writeD(1); + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(0); } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java index 0e4e9fd2ef..0dca57f2f8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java @@ -48,7 +48,6 @@ public class ExShowTerritory implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TERRITORY.writeId(packet); - packet.writeD(_vertices.size()); packet.writeD(_minZ); packet.writeD(_maxZ); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java index 4e284f82c5..86e1009bbf 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java @@ -46,7 +46,6 @@ public class ExShowTrace implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TRACE.writeId(packet); - packet.writeH(0); // type broken in H5 packet.writeD(0); // time broken in H5 packet.writeH(_locations.size()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java index 3245767ed7..836a5c9624 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java @@ -44,7 +44,6 @@ public class ExShowUsm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_USM.writeId(packet); - packet.writeD(_videoId); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java index 4acdffa842..1f1a14c31b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java @@ -34,7 +34,6 @@ public class ExShowVariationCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_CANCEL_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java index 3a2298019e..9870424e26 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java @@ -35,7 +35,6 @@ public class ExShowVariationMakeWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_MAKE_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java index 169827bab3..86211c8d97 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java @@ -44,10 +44,9 @@ public class ExSpawnEmitter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SPAWN_EMITTER.writeId(packet); - packet.writeD(_npcObjectId); packet.writeD(_playerObjectId); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java index 620800c1c4..534549b4fe 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java @@ -36,7 +36,6 @@ public class ExStartScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_START_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java index 0bd990cf34..babac59129 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java index 0e2689d598..d3e67afe99 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipObjId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java index 44b064113f..f5b3e1340f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java @@ -36,7 +36,6 @@ public class ExStopScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index 8029930c9a..367ac79be4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -66,7 +66,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket } OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet); - packet.writeD(_inventory); packet.writeD(_warehouse); // packet.writeD(_freight); // Removed with 152. diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java index 3293a5b557..57563ca2f9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java @@ -39,7 +39,6 @@ public class ExSubPledgeSkillAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUB_PLEDGET_SKILL_ADD.writeId(packet); - packet.writeD(_type); packet.writeD(_skillId); packet.writeD(_skillLevel); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java index d61dfa20ab..816d6f16a6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java @@ -97,7 +97,6 @@ public class ExSubjobInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUBJOB_INFO.writeId(packet); - packet.writeC(_type); packet.writeD(_currClassId); packet.writeD(_currRace); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java index 85616016c7..b7a152629d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java @@ -38,7 +38,6 @@ public class ExTacticalSign implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TACTICAL_SIGN.writeId(packet); - packet.writeD(_target.getObjectId()); packet.writeD(_tokenId); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java index 3486e6281d..9e03a8bd0a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java @@ -39,7 +39,6 @@ public class ExTeleportToLocationActivate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_TO_LOCATION_ACTIVATE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java index a214c53a0f..7bcddd964d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java @@ -27,6 +27,7 @@ public class ExUISetting implements IClientOutgoingPacket { public static final String UI_KEY_MAPPING_VAR = "UI_KEY_MAPPING"; public static final String SPLIT_VAR = " "; + private final byte[] _uiKeyMapping; public ExUISetting(Player player) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java index 187770cfc8..eff4285a8b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java @@ -37,7 +37,6 @@ public class ExUnReadMailCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_UN_READ_MAIL_COUNT.writeId(packet); - packet.writeD(_mailUnreadCount); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java index f992b3c937..e59c651371 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java @@ -41,7 +41,6 @@ public class ExUseSharedGroupItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USE_SHARED_GROUP_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeD(_grpId); packet.writeD(_remainingTime); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java index 2b35f4fed1..53f6aa83de 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java @@ -40,7 +40,6 @@ public class ExUserBoostStat implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_BOOST_STAT.writeId(packet); - int count = 0; int bonus = 0; switch (_type) @@ -68,11 +67,9 @@ public class ExUserBoostStat implements IClientOutgoingPacket break; } } - packet.writeC(_type.getId()); packet.writeC(count); packet.writeH(bonus); - return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java index 474fcc5208..f49d451587 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class ExUserInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getTransformationId()); - final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); final boolean isInvisible = _player.isInvisible(); packet.writeD(abnormalVisualEffects.size() + (isInvisible ? 1 : 0)); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java index b841449ab3..1069a64e3e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java @@ -36,12 +36,9 @@ public class ExUserInfoCubic implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_CUBIC.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(_player.getCubics().size()); - _player.getCubics().keySet().forEach(packet::writeH); - packet.writeD(_player.getAgathionId()); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java index 3e4afb995b..6ef31d6117 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java @@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExUserInfoEquipSlot extends AbstractMaskPacket { private final Player _player; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -66,11 +65,9 @@ public class ExUserInfoEquipSlot extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_EQUIP_SLOT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(InventorySlot.values().length); // 152 packet.writeB(_masks); - final PlayerInventory inventory = _player.getInventory(); for (InventorySlot slot : InventorySlot.values()) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java index 3eb1cf9578..d655e48843 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java @@ -36,7 +36,6 @@ public class ExUserInfoInvenWeight implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_INVEN_WEIGHT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java index 91e0e92338..16aa81e9c0 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java @@ -44,7 +44,6 @@ public class ExValidateLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java index 727267c9d5..50cb4025e4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java @@ -35,7 +35,6 @@ public class ExVariationCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_CANCEL_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java index 5cdc1b8d0e..4fde190ae2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java @@ -32,14 +32,13 @@ public class ExVariationResult implements IClientOutgoingPacket { _option1 = option1; _option2 = option2; - _success = success ? 0x01 : 0x00; + _success = success ? 1 : 0; } @Override public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_RESULT.writeId(packet); - packet.writeD(_option1); packet.writeD(_option2); packet.writeD(_success); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java index db0acfd5ff..60fb57c0b3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java @@ -41,10 +41,9 @@ public class ExVitalityEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_EFFECT_INFO.writeId(packet); - packet.writeD(_points); packet.writeD(_vitalityBonus); // Vitality Bonus - packet.writeH(0x00); // Vitality additional bonus in % + packet.writeH(0); // Vitality additional bonus in % packet.writeH(_vitalityItemsRemaining); // How much vitality items remaining for use packet.writeH(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java index 71baff96ea..c4c5539ca4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java @@ -45,7 +45,6 @@ public class ExVoteSystemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VOTE_SYSTEM_INFO.writeId(packet); - packet.writeD(_recomLeft); packet.writeD(_recomHave); packet.writeD(_bonusTime); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java index bc41adf7f2..8abcfc022e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java @@ -37,7 +37,6 @@ public class ExWorldChatCnt implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_WORLD_CHAT_CNT.writeId(packet); - packet.writeD(_points); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java index 5f935fe0dc..dc9c2288f8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java @@ -79,19 +79,17 @@ public class FakePlayerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // vehicleId + packet.writeD(0); // vehicleId packet.writeD(_objId); packet.writeS(_npc.getName()); - packet.writeH(_npc.getRace().ordinal()); - packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 0x01 : 0x00); + packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 1 : 0); packet.writeD(_fpcHolder.getClassId()); - - packet.writeD(0x00); // Inventory.PAPERDOLL_UNDER + packet.writeD(0); // Inventory.PAPERDOLL_UNDER packet.writeD(_fpcHolder.getEquipHead()); packet.writeD(_fpcHolder.getEquipRHand()); packet.writeD(_fpcHolder.getEquipLHand()); @@ -103,28 +101,22 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_fpcHolder.getEquipRHand()); // dual hand packet.writeD(_fpcHolder.getEquipHair()); packet.writeD(_fpcHolder.getEquipHair2()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderAugument()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } - packet.writeC(_fpcHolder.getArmorEnchantLevel()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderVisualId()) { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeC(_npc.getScriptValue()); // getPvpFlag() packet.writeD(_npc.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -135,16 +127,12 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_npc.getCollisionRadius()); packet.writeF(_npc.getCollisionHeight()); - packet.writeD(_fpcHolder.getHair()); packet.writeD(_fpcHolder.getHairColor()); packet.writeD(_fpcHolder.getFace()); - packet.writeS(_npc.getTemplate().getTitle()); - if (_clan != null) { packet.writeD(_clan.getId()); @@ -154,71 +142,51 @@ public class FakePlayerInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - - packet.writeC(0x01); // isSitting() ? 0x00 : 0x01 (at some initial tests it worked) - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); - packet.writeC(_npc.isInCombat() ? 0x01 : 0x00); - - packet.writeC(_npc.isAlikeDead() ? 0x01 : 0x00); - - packet.writeC(_npc.isInvisible() ? 0x01 : 0x00); - - packet.writeC(0x00); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount - packet.writeC(0x00); // getPrivateStoreType().getId() - - packet.writeH(0x00); // getCubics().size() + packet.writeC(1); // isSitting() ? 0 : 1 (at some initial tests it worked) + packet.writeC(_npc.isRunning() ? 1 : 0); + packet.writeC(_npc.isInCombat() ? 1 : 0); + packet.writeC(_npc.isAlikeDead() ? 1 : 0); + packet.writeC(_npc.isInvisible() ? 1 : 0); + packet.writeC(0); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount + packet.writeC(0); // getPrivateStoreType().getId() + packet.writeH(0); // getCubics().size() // getCubics().keySet().forEach(packet::writeH); - packet.writeC(0x00); - + packet.writeC(0); packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : 0); packet.writeH(_fpcHolder.getRecommends()); - packet.writeD(0x00); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 - + packet.writeD(0); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 packet.writeD(_fpcHolder.getClassId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(_fpcHolder.getWeaponEnchantLevel()); // isMounted() ? 0 : _enchantLevel - packet.writeC(_npc.getTeam().getId()); - - packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0x00); + packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0); packet.writeC(_fpcHolder.getNobleLevel()); - packet.writeC(_fpcHolder.isHero() ? 0x01 : 0x00); - - packet.writeC(_fpcHolder.isFishing() ? 0x01 : 0x00); - + packet.writeC(_fpcHolder.isHero() ? 1 : 0); + packet.writeC(_fpcHolder.isFishing() ? 1 : 0); packet.writeD(_fpcHolder.getBaitLocationX()); packet.writeD(_fpcHolder.getBaitLocationY()); packet.writeD(_fpcHolder.getBaitLocationZ()); - packet.writeD(_fpcHolder.getNameColor()); - packet.writeD(_heading); - packet.writeC(_fpcHolder.getPledgeStatus()); - packet.writeH(0x00); // getPledgeType() - + packet.writeH(0); // getPledgeType() packet.writeD(_fpcHolder.getTitleColor()); - - packet.writeC(0x00); // isCursedWeaponEquipped - - packet.writeD(0x00); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 - packet.writeD(0x00); // getTransformationDisplayId() + packet.writeC(0); // isCursedWeaponEquipped + packet.writeD(0); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 + packet.writeD(0); // getTransformationDisplayId() packet.writeD(_fpcHolder.getAgathionId()); - - packet.writeC(0x00); - - packet.writeD(0x00); // getCurrentCp() + packet.writeC(0); + packet.writeD(0); // getCurrentCp() packet.writeD(_npc.getMaxHp()); packet.writeD((int) Math.round(_npc.getCurrentHp())); packet.writeD(_npc.getMaxMp()); packet.writeD((int) Math.round(_npc.getCurrentMp())); - - packet.writeC(0x00); + packet.writeC(0); final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) @@ -229,9 +197,9 @@ public class FakePlayerInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(0x00); // cocPlayer.getPosition() - packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 0x01 : 0x00); - packet.writeC(0x00); // Used Ability Points + packet.writeC(0); // cocPlayer.getPosition() + packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 1 : 0); + packet.writeC(0); // Used Ability Points return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java index ae088538da..03223c8a3e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java @@ -62,7 +62,6 @@ public class FlyToLocation implements IClientOutgoingPacket _destY = destY; _destZ = destZ; _type = type; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -82,7 +81,6 @@ public class FlyToLocation implements IClientOutgoingPacket _flySpeed = flySpeed; _flyDelay = flyDelay; _animationSpeed = animationSpeed; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -103,7 +101,6 @@ public class FlyToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FLY_TO_LOCATION.writeId(packet); - packet.writeD(_chaObjId); packet.writeD(_destX); packet.writeD(_destY); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java index 1e52b0ef72..471d70f791 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java @@ -35,8 +35,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x01); + packet.writeC(1); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index ef1d37297e..2ee6ffbcd9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -50,25 +50,24 @@ public class GMHennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GMHENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON packet.writeH(_player.getHennaValue(BaseStat.MEN)); // equip MEN packet.writeH(_player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeH(_player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeH(0x00); // equip LUC - packet.writeH(0x00); // equip CHA + packet.writeH(0); // equip LUC + packet.writeH(0); // equip CHA packet.writeD(3); // Slots packet.writeD(_hennas.size()); // Size for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java index 38ca4c7be0..59bf0d9d93 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java @@ -38,7 +38,6 @@ public class GMHide implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_HIDE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index cd876896af..c2f0803303 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -50,7 +50,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -69,8 +68,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getINT()); packet.writeD(_player.getWIT()); packet.writeD(_player.getMEN()); - packet.writeD(0x00); // LUC - packet.writeD(0x00); // CHA + packet.writeD(0); // LUC + packet.writeD(0); // CHA packet.writeD(_player.getMaxHp()); packet.writeD((int) _player.getCurrentHp()); packet.writeD(_player.getMaxMp()); @@ -79,28 +78,24 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); packet.writeD(_player.getPkKills()); - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollObjectId(slot)); } - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); } - for (int slot = 0; slot < 11; slot++) { final VariationInstance augment = _player.getInventory().getPaperdollAugmentation(slot); packet.writeD(augment != null ? augment.getOption1Id() : 0); // Confirmed packet.writeD(augment != null ? augment.getOption2Id() : 0); // Confirmed } - packet.writeC(_player.getInventory().getTalismanSlots()); // CT2.3 packet.writeC(_player.getInventory().canEquipCloak() ? 1 : 0); // CT2.3 - packet.writeD(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeH(0); packet.writeD(_player.getPAtk()); packet.writeD(_player.getPAtkSpd()); packet.writeD(_player.getPDef()); @@ -108,18 +103,14 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAccuracy()); packet.writeD(_player.getCriticalHit()); packet.writeD(_player.getMAtk()); - packet.writeD(_player.getMAtkSpd()); packet.writeD(_player.getPAtkSpd()); - packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicEvasionRate()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name packet.writeD(_player.getReputation()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -135,8 +126,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeD(_player.isGM() ? 0x01 : 0x00); // builder level - + packet.writeD(_player.isGM() ? 1 : 0); // builder level packet.writeS(_player.getTitle()); packet.writeD(_player.getClanId()); // pledge id packet.writeD(_player.getClanCrestId()); // pledge crest id @@ -146,26 +136,19 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeC(_player.hasDwarvenCraft() ? 1 : 0); packet.writeD(_player.getPkKills()); packet.writeD(_player.getPvpKills()); - packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); - - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeC(321); - packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window - - packet.writeC(_player.isNoble() ? 0x01 : 0x00); - packet.writeC(_player.isHero() ? 0x01 : 0x00); - + packet.writeC(_player.isNoble() ? 1 : 0); + packet.writeC(_player.isHero() ? 1 : 0); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); - final AttributeType attackAttribute = _player.getAttackElement(); packet.writeH(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); @@ -175,8 +158,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket } packet.writeD(_player.getFame()); packet.writeD(_player.getVitalityPoints()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index 1d88596096..552b6e6168 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -37,14 +37,12 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_player.getName()); packet.writeD(_clan.getId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); @@ -52,15 +50,14 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 packet.writeD(_clan.getAllyCrestId()); // c2 packet.writeD(_clan.isAtWar() ? 1 : 0); // c3 - packet.writeD(0x00); // T3 Unknown - + packet.writeD(0); // T3 Unknown packet.writeD(_clan.getMembers().size()); for (ClanMember member : _clan.getMembers()) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java index 93af10e254..3c155ff816 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -38,10 +38,8 @@ public class GMViewSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_SKILL_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_skills.size()); - final boolean isDisabled = (_player.getClan() != null) && (_player.getClan().getReputationScore() < 0); for (Skill skill : _skills) { @@ -49,7 +47,7 @@ public class GMViewSkillInfo implements IClientOutgoingPacket packet.writeH(skill.getDisplayLevel()); packet.writeH(skill.getSubLevel()); packet.writeD(skill.getDisplayId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(isDisabled && skill.isClanSkill() ? 1 : 0); packet.writeC(skill.isEnchantable() ? 1 : 0); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index f49138fafe..c909d5e6e1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -51,7 +51,6 @@ public class GMViewWarehouseWithdrawList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_WAREHOUSE_WITHDRAW_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java index d8c273f914..449271993b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java @@ -35,7 +35,6 @@ public class GameGuardQuery implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GAME_GUARD_QUERY.writeId(packet); - packet.writeD(0x27533DD9); packet.writeD(0x2E72A51D); packet.writeD(0x2017038B); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index b0c011b696..037b2e6b6b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -35,10 +35,8 @@ public class GetItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ITEM.writeId(packet); - packet.writeD(_playerId); packet.writeD(_item.getObjectId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java index f8c6126c87..5f4d7bf3ca 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java @@ -50,7 +50,6 @@ public class GetOffVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_OFF_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_x); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java index ffa8d5f310..77d1e6ba28 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java @@ -45,7 +45,6 @@ public class GetOnVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ON_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java index e5dcb9ded6..b1f5b588f9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java @@ -44,14 +44,13 @@ public class GmViewQuestInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_QUEST_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeH(_questList.size()); // quest count - for (Quest quest : _questList) { final QuestState qs = _player.getQuestState(quest.getName()); packet.writeD(quest.getId()); packet.writeD(qs == null ? 0 : qs.getCond()); } - packet.writeH(0x00); // some size + packet.writeH(0); // some size // for size; ddQQ return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 7e0614b359..3283ac802a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -51,7 +51,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeQ(_player.getAdena()); // activeChar current amount of Adena packet.writeD(3); // available equip slot packet.writeD(_hennaEquipList.size()); - for (Henna henna : _hennaEquipList) { // Player must have at least one dye in inventory @@ -62,8 +61,8 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); // item Id of the dye packet.writeQ(henna.getWearCount()); // amount of dyes required packet.writeQ(henna.getWearFee()); // amount of Adena required - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not - // packet.writeD(0x00); // Does not exist in Classic. + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // meet the requirement or not + // packet.writeD(0); // Does not exist in Classic. } } return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 0e6e64c7b2..23364ad722 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -50,25 +50,24 @@ public class HennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON packet.writeH(_player.getHennaValue(BaseStat.MEN)); // equip MEN packet.writeH(_player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeH(_player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeH(0x00); // equip LUC - packet.writeH(0x00); // equip CHA + packet.writeH(0); // equip LUC + packet.writeH(0); // equip CHA packet.writeD(3 - _player.getHennaEmptySlots()); // Slots packet.writeD(_hennas.size()); // Size for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); } - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 658087380a..9a22f0a564 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -40,12 +40,11 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_ITEM_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getWearCount()); // total amount of dye require packet.writeQ(_henna.getWearFee()); // total amount of Adena require to draw symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to draw or not 0 is false and 1 is true + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to draw or not 0 is false and 1 is true packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() + _player.getHennaValue(BaseStat.INT)); // equip INT @@ -59,7 +58,7 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket packet.writeH(_player.getDEX() + _player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeD(_player.getWIT()); // current WIT packet.writeH(_player.getWIT() + _player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 3800940bac..162812f30b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -40,12 +40,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getCancelCount()); // total amount of dye require packet.writeQ(_henna.getCancelFee()); // total amount of Adena require to remove symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to remove or not + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to remove or not packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() - _player.getHennaValue(BaseStat.INT)); // equip INT @@ -59,11 +58,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket packet.writeH(_player.getDEX() - _player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeD(_player.getWIT()); // current WIT packet.writeH(_player.getWIT() - _player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeD(0x00); // current LUC - packet.writeH(0x00); // equip LUC - packet.writeD(0x00); // current CHA - packet.writeH(0x00); // equip CHA - packet.writeD(0x00); + packet.writeD(0); // current LUC + packet.writeH(0); // equip LUC + packet.writeD(0); // current CHA + packet.writeH(0); // equip CHA + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 3a780986a0..d9f092b327 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -37,11 +37,9 @@ public class HennaRemoveList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); - packet.writeD(0x03); // seems to be max size + packet.writeD(3); // seems to be max size packet.writeD(3 - _player.getHennaEmptySlots()); - for (Henna henna : _player.getHennaList()) { if (henna != null) @@ -50,7 +48,7 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); packet.writeQ(henna.getCancelCount()); packet.writeQ(henna.getCancelFee()); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index b5c8628b50..f2a9cf1822 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -89,14 +89,12 @@ public interface IClientOutgoingPacket extends IOutgoingPacket Inventory.PAPERDOLL_ARTIFACT20, Inventory.PAPERDOLL_ARTIFACT21, }; - int[] PAPERDOLL_ORDER_AUGMENT = new int[] { Inventory.PAPERDOLL_RHAND, Inventory.PAPERDOLL_LHAND, Inventory.PAPERDOLL_RHAND }; - int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 0c54e810f0..3378827f34 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -46,7 +46,6 @@ public class InventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index c4598a72e6..cef69ecb6f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -59,8 +59,8 @@ public class ItemList extends AbstractItemPacket } else { - packet.writeC(0x01); // _showWindow ? 0x01 : 0x00 - packet.writeD(0x00); + packet.writeC(1); // _showWindow ? 1 : 0 + packet.writeD(0); packet.writeD(_items.size()); } writeInventoryBlock(packet, _player.getInventory()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java index b32b4df4a3..c3b9918230 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java @@ -32,9 +32,8 @@ public class JoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PARTY.writeId(packet); - packet.writeD(_response); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java index 65e06efeb7..f347f7efcd 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java @@ -32,7 +32,6 @@ public class JoinPledge implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PLEDGE.writeId(packet); - packet.writeD(_pledgeId); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index ae9fff536d..407e46a895 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -35,17 +35,16 @@ public class KeyPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VERSION_CHECK.writeId(packet); - packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok for (int i = 0; i < 8; i++) { packet.writeC(_key[i]); // key } - packet.writeD(0x01); + packet.writeD(1); packet.writeD(Config.SERVER_ID); // server id - packet.writeC(0x01); - packet.writeD(0x00); // obfuscation key - packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 0x04 : 0x00); // isClassic + packet.writeC(1); + packet.writeD(0); // obfuscation key + packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 4 : 0); // isClassic return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java index 484c10f0c4..62424fd03a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java @@ -40,7 +40,6 @@ public class L2FriendSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_SAY.writeId(packet); - packet.writeD(0); // ?? packet.writeS(_receiver); packet.writeS(_sender); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java index b875edb772..790d599b5b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java @@ -32,11 +32,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ListPartyWaiting implements IClientOutgoingPacket { + private static final int NUM_PER_PAGE = 64; + private final List _rooms = new LinkedList<>(); private final int _size; - private static final int NUM_PER_PAGE = 64; - public ListPartyWaiting(PartyMatchingRoomLevelType type, int location, int page, int requestorLevel) { final List rooms = MatchingRoomManager.getInstance().getPartyMathchingRooms(location, type, requestorLevel); @@ -57,7 +57,6 @@ public class ListPartyWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_PARTY_WATING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java index 4f8f9adc64..bb0ac61dbd 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java @@ -54,7 +54,6 @@ public class LoginFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LOGIN_FAIL.writeId(packet); - packet.writeD(_success); packet.writeD(_reason); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java index 18a522c315..6743e3e66f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java @@ -32,7 +32,6 @@ public class MagicSkillCanceld implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_CANCELED.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java index d56de10079..7ab29cc1a8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java @@ -66,7 +66,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // MagicSkillUse castingType packet.writeD(_objectId); packet.writeD(_skillId); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java index 3df8463279..a86626cfa6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java @@ -84,7 +84,6 @@ public class MagicSkillUse implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_USE.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // Casting bar type: 0 - default, 1 - default up, 2 - blue, 3 - green, 4 - red. packet.writeD(_creature.getObjectId()); packet.writeD(_target.getObjectId()); @@ -111,7 +110,7 @@ public class MagicSkillUse implements IClientOutgoingPacket packet.writeD(_target.getX()); packet.writeD(_target.getY()); packet.writeD(_target.getZ()); - packet.writeD(_actionId >= 0 ? 0x01 : 0x00); // 1 when ID from RequestActionUse is used + packet.writeD(_actionId >= 0 ? 1 : 0); // 1 when ID from RequestActionUse is used packet.writeD(_actionId >= 0 ? _actionId : 0); // ID from RequestActionUse. Used to set cooldown on summon skills. return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java index 6b710c692e..12e2488f24 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java @@ -37,11 +37,9 @@ public class ManagePledgePower implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet); - packet.writeD(_rank); packet.writeD(_action); packet.writeD(_clan.getRankPrivs(_rank).getBitmask()); - return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 95f4b6f201..4e2ab3f00b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -42,11 +42,9 @@ public class MonRaceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MON_RACE_INFO.writeId(packet); - packet.writeD(_unknown1); packet.writeD(_unknown2); - packet.writeD(0x08); - + packet.writeD(8); for (int i = 0; i < 8; i++) { packet.writeD(_monsters[i].getObjectId()); // npcObjectID @@ -68,7 +66,7 @@ public class MonRaceInfo implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java index 0093b3edc9..e6386921ff 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java @@ -45,13 +45,10 @@ public class MoveToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_xDst); packet.writeD(_yDst); packet.writeD(_zDst); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java index b1fb3ea003..59103c6c4c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java @@ -48,7 +48,6 @@ public class MoveToLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java index 30ff3c96af..aa261f924f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java @@ -50,11 +50,9 @@ public class MoveToPawn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_PAWN.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetId); packet.writeD(_distance); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index 00d7618d34..f94917d93d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -58,18 +58,16 @@ public class MultiSellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.MULTI_SELL_LIST.writeId(packet); - - packet.writeC(0x00); // Helios + packet.writeC(0); // Helios packet.writeD(_list.getId()); // list id - packet.writeC(0x00); // GOD Unknown + packet.writeC(0); // GOD Unknown packet.writeD(1 + (_index / PAGE_SIZE)); // page started from 1 - packet.writeD(_finished ? 0x01 : 0x00); // finished + packet.writeD(_finished ? 1 : 0); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - packet.writeC(0x00); // Grand Crusade - packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window - packet.writeD(0x20); // Helios - Always 32 - + packet.writeC(0); // Grand Crusade + packet.writeC(_list.isChanceMultisell() ? 1 : 0); // new multisell window + packet.writeD(32); // Helios - Always 32 while (_size-- > 0) { ItemInfo itemEnchantment = _list.getItemEnchantment(_index); @@ -86,20 +84,16 @@ public class MultiSellList extends AbstractItemPacket } } } - packet.writeD(_index); // Entry ID. Start from 1. packet.writeC(entry.isStackable() ? 1 : 0); - // Those values will be passed down to MultiSellChoose packet. packet.writeH(itemEnchantment != null ? itemEnchantment.getEnchantLevel() : 0); // enchant level writeItemAugment(packet, itemEnchantment); writeItemElemental(packet, itemEnchantment); writeItemEnsoulOptions(packet, itemEnchantment); - packet.writeC(0x00); // 286 - + packet.writeC(0); // 286 packet.writeH(entry.getProducts().size()); packet.writeH(entry.getIngredients().size()); - for (ItemChanceHolder product : entry.getProducts()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(product.getId()); @@ -122,9 +116,8 @@ public class MultiSellList extends AbstractItemPacket writeItemAugment(packet, displayItemEnchantment); writeItemElemental(packet, displayItemEnchantment); writeItemEnsoulOptions(packet, displayItemEnchantment); - packet.writeC(0x00); // 286 + packet.writeC(0); // 286 } - for (ItemChanceHolder ingredient : entry.getIngredients()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(ingredient.getId()); @@ -144,7 +137,7 @@ public class MultiSellList extends AbstractItemPacket writeItemAugment(packet, displayItemEnchantment); writeItemElemental(packet, displayItemEnchantment); writeItemEnsoulOptions(packet, displayItemEnchantment); - packet.writeC(0x00); // 286 + packet.writeC(0); // 286 } } return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java index 6e85f5348c..cd46aac3aa 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java @@ -45,11 +45,10 @@ public class MyTargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MY_TARGET_SELECTED.writeId(packet); - - packet.writeD(0x01); // Grand Crusade + packet.writeD(1); // Grand Crusade packet.writeD(_objectId); packet.writeH(_color); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java index 1901ad1297..166c5c1e00 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java @@ -36,7 +36,6 @@ public class NewCharacterSuccess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NEW_CHARACTER_SUCCESS.writeId(packet); - packet.writeD(_chars.size()); for (PlayerTemplate chr : _chars) { @@ -44,31 +43,24 @@ public class NewCharacterSuccess implements IClientOutgoingPacket { continue; } - // TODO: Unhardcode these packet.writeD(chr.getRace().ordinal()); packet.writeD(chr.getClassId().getId()); - packet.writeD(99); packet.writeD(chr.getBaseSTR()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseDEX()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseCON()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseINT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseWIT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseMEN()); packet.writeD(1); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java index be1605f679..6061ea26ef 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java @@ -38,7 +38,6 @@ public class NicknameChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NICK_NAME_CHANGED.writeId(packet); - packet.writeD(_objectId); packet.writeS(_title); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index f9cd107e2c..3e4837b4a4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -54,24 +54,20 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public NpcHtmlMessage(int npcObjId, int itemId) { super(npcObjId); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } public NpcHtmlMessage(int npcObjId, int itemId, String html) { super(npcObjId, html); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } @@ -79,11 +75,10 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java index 2b296c3d8e..ce56e727f2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java @@ -47,10 +47,8 @@ public class NpcInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -58,7 +56,6 @@ public class NpcInfo extends AbstractMaskPacket private int _clanId = 0; private int _statusMask = 0; private final Set _abnormalVisualEffects; - private String[] _localisation; public void setLang(String lang) @@ -101,112 +98,90 @@ public class NpcInfo extends AbstractMaskPacket { addComponentType(NpcInfoType.HEADING); } - if ((npc.getStat().getPAtkSpd() > 0) || (npc.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (npc.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((npc.getLeftHandItem() > 0) || (npc.getRightHandItem() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (npc.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (npc.getDisplayEffect() > 0) { addComponentType(NpcInfoType.DISPLAY_EFFECT); } - if (npc.isInsideZone(ZoneId.WATER) || npc.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (npc.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (npc.getCloneObjId() > 0) { addComponentType(NpcInfoType.CLONE); } - if (npc.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (npc.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (npc.getCurrentHp() <= npc.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (npc.getCurrentMp() <= npc.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (npc.getTemplate().isUsingServerSideName()) { addComponentType(NpcInfoType.NAME); } - if (npc.getTemplate().isUsingServerSideTitle() || (npc.isMonster() && (Config.SHOW_NPC_LEVEL || Config.SHOW_NPC_AGGRESSION)) || npc.isChampion() || npc.isTrap()) { addComponentType(NpcInfoType.TITLE); } - if (npc.getNameString() != null) { addComponentType(NpcInfoType.NAME_NPCSTRINGID); } - if (npc.getTitleString() != null) { addComponentType(NpcInfoType.TITLE_NPCSTRINGID); } - if (_npc.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (!_abnormalVisualEffects.isEmpty() || npc.isInvisible()) { addComponentType(NpcInfoType.ABNORMALS); } - if (npc.getEnchantEffect() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (npc.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (npc.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (npc.getClanId() > 0) { final Clan clan = ClanTable.getInstance().getClan(npc.getClanId()); @@ -220,14 +195,11 @@ public class NpcInfo extends AbstractMaskPacket addComponentType(NpcInfoType.CLAN); } } - addComponentType(NpcInfoType.COLOR_EFFECT); - if (npc.getPvpFlag() > 0) { addComponentType(NpcInfoType.PVP_FLAG); } - // TODO: Confirm me if (npc.isInCombat()) { @@ -245,8 +217,7 @@ public class NpcInfo extends AbstractMaskPacket { _statusMask |= 0x08; } - - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -296,27 +267,23 @@ public class NpcInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO.writeId(packet); - packet.writeD(_npc.getObjectId()); - packet.writeC(_npc.isShowSummonAnimation() ? 0x02 : 0x00); // // 0=teleported 1=default 2=summoned + packet.writeC(_npc.isShowSummonAnimation() ? 2 : 0); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 0x01 : 0x00); + packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0x00); + packet.writeQ(0); } if (containsMask(NpcInfoType.TITLE)) { String title = _npc.getTitle(); - // Localisation related. if ((_localisation != null) && !_localisation[1].equals("")) { @@ -329,10 +296,8 @@ public class NpcInfo extends AbstractMaskPacket title = title.replace(NpcData.getInstance().getTemplate(_npc.getId()).getTitle(), _localisation[1]); } } - packet.writeS(title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -351,7 +316,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -366,20 +331,20 @@ public class NpcInfo extends AbstractMaskPacket if (containsMask(NpcInfoType.EQUIPPED)) { packet.writeD(_npc.getRightHandItem()); - packet.writeD(0x00); // Armor id? + packet.writeD(0); // Armor id? packet.writeD(_npc.getLeftHandItem()); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_npc.isDead() ? 0x00 : 0x01); + packet.writeC(_npc.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); + packet.writeC(_npc.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 0x01 : _npc.isFlying() ? 0x02 : 0x00); + packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -391,7 +356,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_npc.isFlying() ? 0x01 : 0x00); + packet.writeD(_npc.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { @@ -427,12 +392,12 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(0x00); // 2 - do some animation on spawn + packet.writeC(0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -464,12 +429,10 @@ public class NpcInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java index c95a8e5274..923e9cebad 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class NpcInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_npc.getObjectId()); packet.writeD(_npc.getTransformationDisplayId()); - final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size()); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java index a294edc57a..2a0ba41eeb 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java @@ -38,7 +38,6 @@ public class NpcQuestHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NPC_QUEST_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_questId); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java index d3328ade97..fc6d0d4a3a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java @@ -106,7 +106,6 @@ public class NpcSay implements IClientOutgoingPacket { _parameters = new ArrayList<>(); } - for (String item : params) { if ((item != null) && (item.length() > 0)) @@ -127,11 +126,9 @@ public class NpcSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_SAY.writeId(packet); - packet.writeD(_objectId); packet.writeD(_textType.getClientId()); packet.writeD(_npcId); - // Localisation related. if (_lang != null) { @@ -147,7 +144,6 @@ public class NpcSay implements IClientOutgoingPacket } } } - packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java index 356e3f48a9..ac61f9d247 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java @@ -33,11 +33,10 @@ public class ObservationMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_START.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me packet.writeD(0xc0); // TODO: Find me return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java index 5c0a0766b3..896ccea02b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java @@ -33,7 +33,6 @@ public class ObservationReturn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_END.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java index c2f7ab404f..173772c870 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java @@ -37,7 +37,6 @@ public class OnEventTrigger implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EVENT_TRIGGER.writeId(packet); - packet.writeD(_emitterId); packet.writeC(_enabled); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index fbb5c84dfe..37d4fea9cf 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -45,7 +45,6 @@ public class PackageSendableList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java index a53f589386..e24d63f717 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java @@ -39,7 +39,6 @@ public class PackageToList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_TO_LIST.writeId(packet); - packet.writeD(_players.size()); for (Entry entry : _players.entrySet()) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 655c7abcd1..44b23b37f4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -55,7 +55,6 @@ public class PartyMemberPosition implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); - packet.writeD(locations.size()); for (Entry entry : locations.entrySet()) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java index 9e275ec246..c9d3595037 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java @@ -36,7 +36,6 @@ public class PartyRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java index 2233054c14..76c4555d3b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java @@ -36,12 +36,10 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ADD.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); // c3 packet.writeD(_party.getDistributionType().getId()); // c3 packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); - packet.writeD((int) _member.getCurrentCp()); // c4 packet.writeD(_member.getMaxCp()); // c4 packet.writeD((int) _member.getCurrentHp()); @@ -51,9 +49,9 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket packet.writeD(_member.getVitalityPoints()); packet.writeC(_member.getLevel()); packet.writeH(_member.getClassId().getId()); - packet.writeC(0x00); + packet.writeC(0); packet.writeH(_member.getRace().ordinal()); - packet.writeD(0x00); // 228 + packet.writeD(0); // 228 return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java index e806018375..3a47801de1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java @@ -37,21 +37,17 @@ public class PartySmallWindowAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ALL.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); packet.writeC(_party.getDistributionType().getId()); packet.writeC(_party.getMemberCount() - 1); - for (Player member : _party.getMembers()) { if ((member != null) && (member != _exclude)) { packet.writeD(member.getObjectId()); packet.writeS(member.getName()); - packet.writeD((int) member.getCurrentCp()); // c4 packet.writeD(member.getMaxCp()); // c4 - packet.writeD((int) member.getCurrentHp()); packet.writeD(member.getMaxHp()); packet.writeD((int) member.getCurrentMp()); @@ -59,10 +55,9 @@ public class PartySmallWindowAll implements IClientOutgoingPacket packet.writeD(member.getVitalityPoints()); packet.writeC(member.getLevel()); packet.writeH(member.getClassId().getId()); - packet.writeC(0x01); // Unk + packet.writeC(1); // Unk packet.writeH(member.getRace().ordinal()); - packet.writeD(0x00); // 228 - + packet.writeD(0); // 228 final Summon pet = member.getPet(); packet.writeD(member.getServitors().size() + (pet != null ? 1 : 0)); // Summon size, one only atm if (pet != null) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java index 94a8a5a2ce..09ce132af4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java @@ -33,7 +33,6 @@ public class PartySmallWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_DELETE.writeId(packet); - packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java index c53c6c7779..e9ea2efbbe 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java @@ -42,7 +42,6 @@ public class PartySmallWindowUpdate extends AbstractMaskPacket * c = ca
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Attackers Clans?
* d = Number of Attackers Clans
* { //repeats
@@ -58,11 +58,10 @@ public class SiegeAttackerList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _castle.getSiege().getAttackerClans().size(); if (size > 0) { @@ -76,12 +75,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -90,8 +88,8 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index 5d5c831f14..8afd1f38ce 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -29,9 +29,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = 0xcb
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Defending Clans?
* d = Number of Defending Clans
* { //repeats
@@ -60,16 +60,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // Unknown - packet.writeD(0x01); // Unknown - packet.writeD(0x00); // Unknown - + packet.writeD(0); // Unknown + packet.writeD(1); // Unknown + packet.writeD(0); // Unknown final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0); packet.writeD(size); packet.writeD(size); - // Add owners final Clan ownerClan = _castle.getOwner(); if (ownerClan != null) @@ -78,14 +75,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket packet.writeS(ownerClan.getName()); packet.writeS(ownerClan.getLeaderName()); packet.writeD(ownerClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.OWNER.ordinal()); packet.writeD(ownerClan.getAllyId()); packet.writeS(ownerClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(ownerClan.getAllyCrestId()); } - // List of confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans()) { @@ -94,19 +90,17 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(defendingClan.getAllyCrestId()); } - // List of not confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans()) { @@ -115,12 +109,11 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER_PENDING.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 0a3fe46cb7..dfeefdaecf 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -59,13 +59,11 @@ public class SiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_INFO.writeId(packet); - if (_castle != null) { packet.writeD(_castle.getResidenceId()); - final int ownerId = _castle.getOwnerId(); - packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 0x01 : 0x00); + packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0); packet.writeD(ownerId); if (ownerId > 0) { @@ -89,7 +87,6 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { @@ -97,7 +94,7 @@ public class SiegeInfo implements IClientOutgoingPacket cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis()); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(Config.SIEGE_HOUR_LIST.size()); for (int hour : Config.SIEGE_HOUR_LIST) { @@ -108,7 +105,7 @@ public class SiegeInfo implements IClientOutgoingPacket else { packet.writeD((int) (_castle.getSiegeDate().getTimeInMillis() / 1000)); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index d11b3817c0..3c4c475339 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -51,12 +51,11 @@ public class SkillCoolTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SKILL_COOL_TIME.writeId(packet); - packet.writeD(_skillReuseTimeStamps.size()); for (TimeStamp ts : _skillReuseTimeStamps) { packet.writeD(ts.getSkillId()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD((int) ts.getReuse() / 1000); packet.writeD((int) Math.max(ts.getStamp() - _currentTime, 0) / 1000); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index de54232b51..ed4615c403 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -41,10 +41,9 @@ public class Snoop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SNOOP.writeId(packet); - packet.writeD(_convoId); packet.writeS(_name); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_type.getClientId()); packet.writeS(_speaker); packet.writeS(_msg); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java index 37827bdf6c..52f15519a5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java @@ -37,10 +37,9 @@ public class SocialAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SOCIAL_ACTION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_actionId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index fd7e43a153..19066f5f85 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -33,16 +33,15 @@ public class SpawnItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPAWN_ITEM.writeId(packet); - packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeD(_item.isStackable() ? 0x01 : 0x00); + packet.writeD(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java index ccae75b850..04f3ad716c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java @@ -110,7 +110,6 @@ public class SpecialCamera implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPECIAL_CAMERA.writeId(packet); - packet.writeD(_id); packet.writeD(_force); packet.writeD(_angle1); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java index cdd3821740..281756e793 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java @@ -34,7 +34,6 @@ public class StartPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_PLEDGE_WAR.writeId(packet); - packet.writeS(_playerName); packet.writeS(_pledgeName); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java index 48b4238eea..27fb4f606b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java @@ -38,7 +38,6 @@ public class StartRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_side); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java index b4f421df36..067bdeb082 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java @@ -72,7 +72,6 @@ public class StaticObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATIC_OBJECT.writeId(packet); - packet.writeD(_staticObjectId); packet.writeD(_objectId); packet.writeD(_type); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index c1a90dbcf0..0f99a19cd2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -46,7 +46,6 @@ public class StatusUpdate implements IClientOutgoingPacket public void addUpdate(StatusUpdateType type, int level) { _updates.put(type, level); - if (_isPlayable) { switch (type) @@ -76,10 +75,9 @@ public class StatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATUS_UPDATE.writeId(packet); - packet.writeD(_objectId); // casterId - packet.writeD(_isVisible ? _casterObjectId : 0x00); - packet.writeC(_isVisible ? 0x01 : 0x00); + packet.writeD(_isVisible ? _casterObjectId : 0); + packet.writeC(_isVisible ? 1 : 0); packet.writeC(_updates.size()); for (Entry entry : _updates.entrySet()) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java index 9919307366..cf2b71df5a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java @@ -53,7 +53,6 @@ public class StopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java index 50fdc3fe4c..78fdb5d70c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java @@ -43,7 +43,6 @@ public class StopMoveInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java index 9c828c3962..b254cad8b1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java @@ -34,7 +34,6 @@ public class StopPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java index b0392de226..ca69cd5346 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java @@ -36,7 +36,6 @@ public class StopRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FINISH_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_speed); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index 4b332d0467..377301825d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -43,10 +43,8 @@ public class SummonInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class SummonInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class SummonInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,11 +154,9 @@ public class SummonInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - // Show red aura? - // if (_statusMask != 0) + // if (_statusMask != 0x00) // { // addComponentType(NpcInfoType.VISUAL_STATE); // } @@ -229,28 +206,24 @@ public class SummonInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.SUMMON_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0x00); + packet.writeQ(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -269,7 +242,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -285,19 +258,19 @@ public class SummonInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -309,20 +282,20 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -346,12 +319,12 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -381,12 +354,10 @@ public class SummonInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java index 864462f76f..6f88551204 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java @@ -34,7 +34,6 @@ public class SurrenderPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SURRENDER_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 55902e07e1..bbd7706dbe 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -162,7 +162,6 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } - _params[_paramIndex++] = param; } @@ -268,7 +267,6 @@ public class SystemMessage implements IClientOutgoingPacket { return addString(item.getName()); } - append(new SMParam(TYPE_ITEM_NAME, id)); return this; } @@ -396,7 +394,6 @@ public class SystemMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SYSTEM_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -409,13 +406,12 @@ public class SystemMessage implements IClientOutgoingPacket params[i] = _params[i].getValue(); } packet.writeH(SystemMessageId.S1_2.getId()); - packet.writeC(0x01); + packet.writeC(1); packet.writeC(TYPE_TEXT); packet.writeS(sml.getLocalisation(params)); return true; } } - packet.writeH(getId()); packet.writeC(_params.length); for (SMParam param : _params) @@ -425,9 +421,7 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } - packet.writeC(param.getType()); - switch (param.getType()) { case TYPE_ELEMENT_NAME: diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java index a91da07e77..d357efbb0e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java @@ -47,13 +47,12 @@ public class TargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_SELECTED.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java index 3dadd249f6..3d7208c06f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java @@ -42,12 +42,11 @@ public class TargetUnselected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_UNSELECTED.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index 943b5078b6..13f9b9565a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -41,14 +41,13 @@ public class TeleportToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TELEPORT_TO_LOCATION.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // Fade 0, Instant 1. + packet.writeD(0); // Fade 0, Instant 1. packet.writeD(_heading); - packet.writeD(0x00); // Unknown. + packet.writeD(0); // Unknown. return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java index cb82f2da59..8d09576d9d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java @@ -32,7 +32,6 @@ public class TradeDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_DONE.writeId(packet); - packet.writeD(_num); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java index 716ed2a099..6a94d2463f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java @@ -41,9 +41,9 @@ public class TradeOtherAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java index 3d0ef0b501..7907f3d498 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java @@ -41,9 +41,9 @@ public class TradeOwnAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c59568bf1d..3822108c5a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -58,7 +58,6 @@ public class TradeStart extends AbstractItemPacket { _mask |= 0x08; } - // Does not shows level if (_partner.isGM()) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java index f8e2a191de..e5ec2376cc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java @@ -44,10 +44,10 @@ public class TradeUpdate extends AbstractItemPacket { OutgoingPackets.TRADE_UPDATE.writeId(packet); packet.writeC(_sendType); - packet.writeD(0x01); + packet.writeD(1); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2); writeItem(packet, _item, _count); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java index c7102ca385..728020c0b1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java @@ -32,7 +32,6 @@ public class TutorialEnableClientEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_ENABLE_CLIENT_EVENT.writeId(packet); - packet.writeD(_eventId); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java index 92ac75afcf..7cc33a0f80 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java @@ -48,7 +48,6 @@ public class TutorialShowHtml extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_HTML.writeId(packet); - packet.writeD(_type); packet.writeS(getHtml()); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java index 75a57be38b..2ee62835db 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java @@ -37,7 +37,6 @@ public class TutorialShowQuestionMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_QUESTION_MARK.writeId(packet); - packet.writeC(_markType); packet.writeD(_markId); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 4545110d5f..0b68d76ee1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class UserInfo extends AbstractMaskPacket { private Player _player; - private int _relation; private int _runSpd; private int _walkSpd; @@ -51,7 +50,6 @@ public class UserInfo extends AbstractMaskPacket private int _enchantLevel; private int _armorEnchant; private String _title; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -59,7 +57,6 @@ public class UserInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 5; public UserInfo(Player player) @@ -83,6 +80,7 @@ public class UserInfo extends AbstractMaskPacket _enchantLevel = player.getInventory().getWeaponEnchant(); _armorEnchant = player.getInventory().getArmorMinEnchant(); _title = player.getTitle(); + if (player.isGM() && player.isInvisible()) { _title = "[Invisible]"; @@ -138,30 +136,26 @@ public class UserInfo extends AbstractMaskPacket } OutgoingPackets.USER_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_initSize); packet.writeH(28); // 286 - 28 packet.writeB(_masks); - if (containsMask(UserInfoType.RELATION)) { packet.writeD(_relation); } - if (containsMask(UserInfoType.BASIC_INFO)) { packet.writeH(23 + (_player.getAppearance().getVisibleName().length() * 2)); packet.writeString(_player.getName()); - packet.writeC(_player.isGM() ? 0x01 : 0x00); + packet.writeC(_player.isGM() ? 1 : 0); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeD(_player.getLevel()); // 270 packet.writeD(_player.getClassId().getId()); // 286 } - if (containsMask(UserInfoType.BASE_STATS)) { packet.writeH(18); @@ -171,10 +165,9 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getINT()); packet.writeH(_player.getWIT()); packet.writeH(_player.getMEN()); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); } - if (containsMask(UserInfoType.MAX_HPCPMP)) { packet.writeH(14); @@ -182,7 +175,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMaxMp()); packet.writeD(_player.getMaxCp()); } - if (containsMask(UserInfoType.CURRENT_HPMPCP_EXP_SP)) { packet.writeH(38); @@ -193,32 +185,28 @@ public class UserInfo extends AbstractMaskPacket packet.writeQ(_player.getExp()); packet.writeF((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel()))); } - if (containsMask(UserInfoType.ENCHANTLEVEL)) { packet.writeH(4); packet.writeC(_enchantLevel); packet.writeC(_armorEnchant); } - if (containsMask(UserInfoType.APPAREANCE)) { packet.writeH(15); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); } - if (containsMask(UserInfoType.STATUS)) { packet.writeH(6); packet.writeC(_player.getMountType().ordinal()); packet.writeC(_player.getPrivateStoreType().getId()); packet.writeC(_player.hasDwarvenCraft() || (_player.getSkillLevel(248) > 0) ? 1 : 0); - packet.writeC(0x00); + packet.writeC(0); } - if (containsMask(UserInfoType.STATS)) { packet.writeH(64); // 270 @@ -236,21 +224,19 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(0x00); // 270 - packet.writeD(0x00); // 270 + packet.writeD(0); // 270 + packet.writeD(0); // 270 } - if (containsMask(UserInfoType.ELEMENTALS)) { packet.writeH(14); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); } - if (containsMask(UserInfoType.POSITION)) { packet.writeH(18); @@ -259,7 +245,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getZ()); packet.writeD(_player.isInVehicle() ? _player.getVehicle().getObjectId() : 0); } - if (containsMask(UserInfoType.SPEED)) { packet.writeH(18); @@ -272,28 +257,24 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_flyRunSpd); packet.writeH(_flyWalkSpd); } - if (containsMask(UserInfoType.MULTIPLIER)) { packet.writeH(18); packet.writeF(_moveMultiplier); packet.writeF(_player.getAttackSpeedMultiplier()); } - if (containsMask(UserInfoType.COL_RADIUS_HEIGHT)) { packet.writeH(18); packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); } - if (containsMask(UserInfoType.ATK_ELEMENTAL)) { packet.writeH(5); - packet.writeC(0x00); - packet.writeH(0x00); + packet.writeC(0); + packet.writeH(0); } - if (containsMask(UserInfoType.CLAN)) { packet.writeH(32 + (_title.length() * 2)); @@ -303,12 +284,11 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getClanCrestLargeId()); packet.writeD(_player.getClanCrestId()); packet.writeD(_player.getClanPrivileges().getBitmask()); - packet.writeC(_player.isClanLeader() ? 0x01 : 0x00); + packet.writeC(_player.isClanLeader() ? 1 : 0); packet.writeD(_player.getAllyId()); packet.writeD(_player.getAllyCrestId()); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); } - if (containsMask(UserInfoType.SOCIAL)) { packet.writeH(30); // 228 @@ -328,82 +308,72 @@ public class UserInfo extends AbstractMaskPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeD(0x00); // 228 + packet.writeD(0); // 228 } - if (containsMask(UserInfoType.VITA_FAME)) { packet.writeH(19); // 196 packet.writeD(_player.getVitalityPoints()); - packet.writeC(0x00); // Vita Bonus - packet.writeD(0x00); // _player.getFame() - packet.writeD(0x00); // _player.getRaidbossPoints() - packet.writeC(0x00); // 196 - packet.writeH(0x00); // Henna Seal Engraving Gauge - packet.writeC(0x00); // 196 + packet.writeC(0); // Vita Bonus + packet.writeD(0); // _player.getFame() + packet.writeD(0); // _player.getRaidbossPoints() + packet.writeC(0); // 196 + packet.writeH(0); // Henna Seal Engraving Gauge + packet.writeC(0); // 196 } - if (containsMask(UserInfoType.SLOTS)) { packet.writeH(12); // 152 packet.writeC(_player.getInventory().getTalismanSlots()); packet.writeC(_player.getInventory().getBroochJewelSlots()); packet.writeC(_player.getTeam().getId()); - packet.writeD(0x00); - + packet.writeD(0); if (_player.getInventory().getAgathionSlots() > 0) { - packet.writeC(0x01); // Charm slots + packet.writeC(1); // Charm slots packet.writeC(_player.getInventory().getAgathionSlots() - 1); packet.writeC(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152 } else { - packet.writeC(0x00); // Charm slots - packet.writeC(0x00); + packet.writeC(0); // Charm slots + packet.writeC(0); packet.writeC(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152 } } - if (containsMask(UserInfoType.MOVEMENTS)) { packet.writeH(4); packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); - packet.writeC(_player.isRunning() ? 0x01 : 0x00); + packet.writeC(_player.isRunning() ? 1 : 0); } - if (containsMask(UserInfoType.COLOR)) { packet.writeH(10); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); } - if (containsMask(UserInfoType.INVENTORY_LIMIT)) { packet.writeH(13); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); packet.writeH(_player.getInventoryLimit()); - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 } - if (containsMask(UserInfoType.TRUE_HERO)) { packet.writeH(9); - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeC(_player.isTrueHero() ? 100 : 0x00); + packet.writeD(0); + packet.writeH(0); + packet.writeC(_player.isTrueHero() ? 100 : 0); } - if (containsMask(UserInfoType.ATT_SPIRITS)) // 152 { packet.writeH(26); @@ -414,13 +384,11 @@ public class UserInfo extends AbstractMaskPacket packet.writeD((int) _player.getEarthSpiritDefense()); packet.writeD(_player.getActiveElementalSpiritType()); } - if (containsMask(UserInfoType.RANKING)) // 196 { packet.writeH(6); packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : RankManager.getInstance().getPlayerClassRank(_player) == 1 ? 4 : 0); } - if (containsMask(UserInfoType.STAT_POINTS)) // 235 { packet.writeH(16); @@ -432,7 +400,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getVariables().getInt(PlayerVariables.STAT_WIT, 0)); packet.writeH(_player.getVariables().getInt(PlayerVariables.STAT_MEN, 0)); } - if (containsMask(UserInfoType.STAT_ABILITIES)) // 235 { packet.writeH(18); @@ -442,10 +409,9 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getINT() - _player.getTemplate().getBaseINT() - _player.getVariables().getInt(PlayerVariables.STAT_INT, 0)); // additional INT packet.writeH(_player.getWIT() - _player.getTemplate().getBaseWIT() - _player.getVariables().getInt(PlayerVariables.STAT_WIT, 0)); // additional WIT packet.writeH(_player.getMEN() - _player.getTemplate().getBaseMEN() - _player.getVariables().getInt(PlayerVariables.STAT_MEN, 0)); // additional MEN - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); } - if (containsMask(UserInfoType.ELIXIR_USED)) // 286 { packet.writeD(_player.getVariables().getInt(PlayerVariables.ELIXIRS_USED, 0)); // count @@ -480,7 +446,6 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x10; // Party leader } } - if (clan != null) { relation |= 0x20; // Clan member @@ -489,12 +454,10 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x40; // Clan leader } } - if (player.isInSiege()) { relation |= 0x80; // In siege } - return relation; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java index 283bcf1614..90c416726a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java @@ -36,7 +36,6 @@ public class ValidateLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java index 4d8f9683d0..83f72bf981 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java @@ -40,7 +40,6 @@ public class ValidateLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java index b684e70bdc..71367cd26d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java @@ -36,7 +36,6 @@ public class VehicleCheckLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_CHECK_LOCATION.writeId(packet); - packet.writeD(_boat.getObjectId()); packet.writeD(_boat.getX()); packet.writeD(_boat.getY()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java index a4a5780f30..5b565c08b7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java @@ -46,7 +46,6 @@ public class VehicleDeparture implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_DEPARTURE.writeId(packet); - packet.writeD(_objId); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java index ec611028bf..4a995a6352 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java @@ -44,7 +44,6 @@ public class VehicleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java index 207a6fd899..bf629dcbbc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java @@ -42,7 +42,6 @@ public class VehicleStarted implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_START.writeId(packet); - packet.writeD(_objectId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 35ca986d35..5eb9eb7ab9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -30,6 +30,7 @@ public class WareHouseDepositList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; public static final int FREIGHT = 1; + private final int _sendType; private final long _playerAdena; private final List _items = new ArrayList<>(); @@ -49,7 +50,6 @@ public class WareHouseDepositList extends AbstractItemPacket _sendType = sendType; _whType = type; _playerAdena = player.getAdena(); - final boolean isPrivate = _whType == PRIVATE; for (Item temp : player.getInventory().getAvailableItems(true, isPrivate, false)) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 7af1cd273c..5ece99310a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -32,6 +32,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private final int _sendType; private Player _player; private long _playerAdena; @@ -60,7 +61,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } - _items = _player.getActiveWarehouse().getItems(); for (Item item : _items) { @@ -78,15 +78,15 @@ public class WareHouseWithdrawalList extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeH(0x00); + packet.writeH(0); packet.writeD(_invSize); packet.writeD(_items.size()); for (Item item : _items) { writeItem(packet, item); packet.writeD(item.getObjectId()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } else diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java index 5f2dd05f3b..aea1476fb2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java @@ -35,8 +35,7 @@ public class ExDivideAdenaCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_CANCEL.writeId(packet); - - packet.writeC(0x00); // TODO: Find me + packet.writeC(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java index 6af912cebf..de4e955aba 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java @@ -46,9 +46,8 @@ public class ExDivideAdenaDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_DONE.writeId(packet); - - packet.writeC(_isPartyLeader ? 0x01 : 0x00); - packet.writeC(_isCCLeader ? 0x01 : 0x00); + packet.writeC(_isPartyLeader ? 1 : 0); + packet.writeC(_isCCLeader ? 1 : 0); packet.writeD(_memberCount); packet.writeQ(_distributedAdenaCount); packet.writeQ(_adenaCount); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index 549def456e..84b5fead76 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -43,7 +43,6 @@ public class ExChooseShapeShiftingItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_SHAPE_SHIFTING_ITEM.writeId(packet); - packet.writeD(_targetType != null ? _targetType.ordinal() : 0); packet.writeD(_type != null ? _type.ordinal() : 0); packet.writeD(_itemId); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java index 33fb439aa5..ba55887a1a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java @@ -45,7 +45,6 @@ public class ExCuriousHouseMemberUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_UPDATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_maxHp); packet.writeD(_maxCp); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java index 8ad3659725..be2d29d864 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPacket { - public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0x00); - public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(0x01); + public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0); + public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(1); private final int _result; @@ -39,7 +39,6 @@ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPa public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_EXTRACTION_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java index ec82cc14f3..e84d7a7255 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; public static final ExPutShapeShiftingTargetItemResult FAILED = new ExPutShapeShiftingTargetItemResult(RESULT_FAILED, 0); @@ -43,7 +43,6 @@ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_resultId); packet.writeQ(_price); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java index f4d3118cc4..038eae0042 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExShapeShiftingResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; - public static final int RESULT_CLOSE = 0x02; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; + public static final int RESULT_CLOSE = 2; public static final ExShapeShiftingResult FAILED = new ExShapeShiftingResult(RESULT_FAILED, 0, 0); public static final ExShapeShiftingResult CLOSE = new ExShapeShiftingResult(RESULT_CLOSE, 0, 0); @@ -47,7 +47,6 @@ public class ExShapeShiftingResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHAPE_SHIFTING_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_targetItemId); packet.writeD(_extractItemId); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java index eaf0d209fd..4b48b09002 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java @@ -38,7 +38,7 @@ public class ExConfirmVipAttendanceCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CONFIRM_VIP_ATTENDANCE_CHECK.writeId(packet); - packet.writeC(_available ? 0x01 : 0x00); // can receive reward today? 1 else 0 + packet.writeC(_available ? 1 : 0); // can receive reward today? 1 else 0 packet.writeC(_index); // active reward index packet.writeD(0); packet.writeD(0); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java index 9d61fe68d6..dd94df023f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java @@ -45,10 +45,10 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket OutgoingPackets.EX_VIP_ATTENDANCE_ITEM_LIST.writeId(packet); packet.writeC(_available ? _index + 1 : _index); // index to receive? packet.writeC(_index); // last received index? - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeC(0x01); - packet.writeC(_available ? 0x01 : 0x00); // player can receive reward today? + packet.writeD(0); + packet.writeD(0); + packet.writeC(1); + packet.writeC(_available ? 1 : 0); // player can receive reward today? packet.writeC(250); packet.writeC(AttendanceRewardData.getInstance().getRewardsCount()); // reward size int rewardCounter = 0; @@ -57,11 +57,11 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket rewardCounter++; packet.writeD(reward.getId()); packet.writeQ(reward.getCount()); - packet.writeC(0x01); // is unknown? - packet.writeC((rewardCounter % 7) == 0 ? 0x01 : 0x00); // is last in row? + packet.writeC(1); // is unknown? + packet.writeC((rewardCounter % 7) == 0 ? 1 : 0); // is last in row? } - packet.writeC(0x00); - packet.writeD(0x00); + packet.writeC(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java index 0282966053..9963a080c6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java @@ -41,7 +41,7 @@ public class ExActivateAutoShortcut implements IClientOutgoingPacket { OutgoingPackets.EX_ACTIVATE_AUTO_SHORTCUT.writeId(packet); packet.writeH(_position); - packet.writeC(_active ? 0x01 : 0x00); + packet.writeC(_active ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java index 4c3ae253ea..c79b68becc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java @@ -39,7 +39,6 @@ public class ExResponseCommissionBuyInfo extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_INFO.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java index ddfa8b6db1..c1d29735b8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java @@ -40,7 +40,6 @@ public class ExResponseCommissionBuyItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_ITEM.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java index aa4bbbde24..01e4782408 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java @@ -39,7 +39,6 @@ public class ExResponseCommissionDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_DELETE.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java index e7e3c39816..b915574175 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java @@ -55,7 +55,6 @@ public class ExResponseCommissionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_INFO.writeId(packet); - packet.writeD(_result); packet.writeD(_itemId); packet.writeQ(_presetPricePerUnit); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java index 4963393b42..a012b3ab30 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java @@ -64,7 +64,6 @@ public class ExResponseCommissionList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_LIST.writeId(packet); - packet.writeD(_replyType.getClientId()); switch (_replyType) { @@ -73,13 +72,11 @@ public class ExResponseCommissionList extends AbstractItemPacket { packet.writeD((int) Instant.now().getEpochSecond()); packet.writeD(_chunkId); - int chunkSize = _items.size() - _listIndexStart; if (chunkSize > MAX_CHUNK_SIZE) { chunkSize = MAX_CHUNK_SIZE; } - packet.writeD(chunkSize); for (int i = _listIndexStart; i < (_listIndexStart + chunkSize); i++) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java index b1b0a97d7a..183547af06 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java @@ -39,7 +39,6 @@ public class ExResponseCommissionRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_REGISTER.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java index 74d8a95587..b68386e4ed 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java @@ -35,8 +35,7 @@ public class ExShowCommission implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_COMMISSION.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java index 0c267ecf34..11b1ff1e0a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExEnchantFail implements IClientOutgoingPacket { public static final ExEnchantFail STATIC_PACKET = new ExEnchantFail(0, 0); + private final int _itemOne; private final int _itemTwo; @@ -39,7 +40,6 @@ public class ExEnchantFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_FAIL.writeId(packet); - packet.writeD(_itemOne); packet.writeD(_itemTwo); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java index 71ba811ed5..87d29a8e7c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java @@ -36,7 +36,6 @@ public class ExEnchantSucess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SUCESS.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java index eb4eb8b26c..ec67d50fb6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java @@ -39,7 +39,6 @@ public class ExGetCrystalizingEstimation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - packet.writeD(_items.size()); for (ItemChanceHolder holder : _items) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java index ac16c14f5b..ebf5b64751 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java @@ -43,18 +43,18 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket } OutgoingPackets.EX_CONNECTED_TIME_AND_GETTABLE_REWARD.writeId(packet); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_oneDayRewardAvailableCount); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index 8667d9144f..57acfedd38 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -62,7 +62,6 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket } OutgoingPackets.EX_ONE_DAY_RECEIVE_REWARD_LIST.writeId(packet); - packet.writeD(_dayRemainTime); packet.writeD(_weekRemainTime); packet.writeD(_monthRemainTime); @@ -75,7 +74,7 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket packet.writeH(reward.getId()); final int status = reward.getStatus(_player); packet.writeC(status); - packet.writeC(reward.getRequiredCompletions() > 1 ? 0x01 : 0x00); + packet.writeC(reward.getRequiredCompletions() > 1 ? 1 : 0); packet.writeD(reward.getParams().getInt("level", -1) == -1 ? (status == 1 ? 0 : reward.getProgress(_player)) : _player.getLevel()); packet.writeD(reward.getRequiredCompletions()); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java index f0d1fb0d65..03c8bc9b68 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java @@ -43,9 +43,7 @@ abstract class AbstractElementalSpiritPacket implements IClientOutgoingPacket packet.writeD(spirit.getMaxCharacteristics()); packet.writeD(spirit.getMaxCharacteristics()); packet.writeD(spirit.getMaxCharacteristics()); - packet.writeC(1); // unk - for (int j = 0; j < 1; j++) { packet.writeH(2); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java index 3a53a42a95..53c6d5b3e9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java @@ -45,16 +45,14 @@ public class ElementalSpiritAbsorbInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_ABSORB_INFO.writeId(packet); - final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type)); if (spirit == null) { - packet.writeC(0x00); - packet.writeC(0x00); + packet.writeC(0); + packet.writeC(0); return true; } - - packet.writeC(0x01); + packet.writeC(1); packet.writeC(_type); packet.writeC(spirit.getStage()); packet.writeQ(spirit.getExperience()); @@ -62,7 +60,6 @@ public class ElementalSpiritAbsorbInfo implements IClientOutgoingPacket packet.writeQ(spirit.getExperienceToNextLevel()); // MaxExp packet.writeD(spirit.getLevel()); packet.writeD(spirit.getMaxLevel()); - final List absorbItems = spirit.getAbsorbItems(); packet.writeD(absorbItems.size()); // AbsorbCount for (ElementalSpiritAbsorbItemHolder absorbItem : absorbItems) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java index 430c43f891..7012b8a7a2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java @@ -44,7 +44,6 @@ public class ElementalSpiritEvolutionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_EVOLUTION_INFO.writeId(packet); - final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type)); if (spirit == null) { @@ -52,13 +51,11 @@ public class ElementalSpiritEvolutionInfo implements IClientOutgoingPacket packet.writeD(0); return true; } - packet.writeC(_type); packet.writeD(spirit.getNpcId()); - packet.writeD(0x01); // unk + packet.writeD(1); // unk packet.writeD(spirit.getStage()); packet.writeF(100); // chance ?? - final List items = spirit.getItemsToEvolve(); packet.writeD(items.size()); for (ItemHolder item : items) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java index 83c7057dfb..030eec0eb4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java @@ -42,7 +42,6 @@ public class ElementalSpiritExtractInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_EXTRACT_INFO.writeId(packet); - final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type)); if (spirit == null) { @@ -50,15 +49,12 @@ public class ElementalSpiritExtractInfo implements IClientOutgoingPacket packet.writeC(0); return true; } - packet.writeC(_type); // active elemental spirit packet.writeC(1); // is extract ? - packet.writeC(1); // cost count // for each cost count packet.writeD(57); // item id packet.writeD(ElementalSpiritData.EXTRACT_FEES[spirit.getStage() - 1]); // item count - packet.writeD(spirit.getExtractItem()); packet.writeD(spirit.getExtractAmount()); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java index 15fa123db6..ba363bf243 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java @@ -41,7 +41,6 @@ public class ElementalSpiritInfo extends AbstractElementalSpiritPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_INFO.writeId(packet); - final ElementalSpirit[] spirits = _player.getSpirits(); if (spirits == null) { @@ -50,20 +49,16 @@ public class ElementalSpiritInfo extends AbstractElementalSpiritPacket packet.writeC(0); return true; } - packet.writeC(_type); // show spirit info window 1; Change type 2; Only update 0 packet.writeC(_spiritType); - packet.writeC(spirits.length); // spirit count - for (ElementalSpirit spirit : spirits) { packet.writeC(spirit.getType()); - packet.writeC(0x01); // spirit active ? + packet.writeC(1); // spirit active ? // if active writeSpiritInfo(packet, spirit); } - packet.writeD(1); // Reset talent items count for (int j = 0; j < 1; j++) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java index bc05ef3212..66488267d4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java @@ -38,7 +38,6 @@ public class ExElementalSpiritGetExp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_GET_EXP.writeId(packet); - packet.writeC(_type); packet.writeQ(_experience); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java index 7f380efe99..8f5cfd3c98 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java @@ -41,7 +41,6 @@ public abstract class UpdateElementalSpiritPacket extends AbstractElementalSpiri { packet.writeC(_update ? 1 : 0); packet.writeC(_type); - if (_update) { final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type)); @@ -49,7 +48,6 @@ public abstract class UpdateElementalSpiritPacket extends AbstractElementalSpiri { return; } - packet.writeC(_type); writeSpiritInfo(packet, spirit); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java index 23b770e406..ebe77fa654 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java @@ -29,7 +29,7 @@ public class ExShowUpgradeSystem extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_UPGRADE_SYSTEM.writeId(packet); - packet.writeH(0x01); + packet.writeH(1); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java index fa605b548a..a99ad7f4e3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java @@ -52,7 +52,7 @@ public class ExFishingStart implements IClientOutgoingPacket packet.writeD(_baitLocation.getX()); packet.writeD(_baitLocation.getY()); packet.writeD(_baitLocation.getZ()); - packet.writeC(0x01); // 0 = newbie, 1 = normal, 2 = night + packet.writeC(1); // 0 = newbie, 1 = normal, 2 = night return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java index 046ad04cb6..74501fe7ff 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java @@ -49,7 +49,6 @@ public class ExUserInfoFishing implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_FISHING.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_isFishing ? 1 : 0); if (_baitLocation == null) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index dc0e3e05bc..336a384bcc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -47,9 +47,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FRIEND_DETAIL_INFO.writeId(packet); - packet.writeD(_objectId); - if (_friend == null) { packet.writeS(_name); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java index 0d4bb47ff0..a90b7b6083 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java @@ -33,8 +33,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x00); + packet.writeC(0); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java index 9add9c9caa..d24139644c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java @@ -49,7 +49,6 @@ public class FriendAddRequestResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_charId); packet.writeS(_charName); @@ -57,7 +56,7 @@ public class FriendAddRequestResult implements IClientOutgoingPacket packet.writeD(_charObjectId); packet.writeD(_charLevel); packet.writeD(_charClassId); - packet.writeH(0x00); // Always 0 on retail + packet.writeH(0); // Always 0 on retail return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java index a135944662..13a7d01967 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java @@ -86,12 +86,10 @@ public class FriendList implements IClientOutgoingPacket } continue; } - if (player1.isOnline()) { online = true; } - classid = player1.getClassId().getId(); level = player1.getLevel(); _info.add(new FriendInfo(objId, name, online, classid, level)); @@ -102,14 +100,13 @@ public class FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._classid); packet.writeD(info._level); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java index 07c23f9fd2..1bb4142e34 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java @@ -38,7 +38,6 @@ public class FriendRemove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_REMOVE.writeId(packet); - packet.writeD(_responce); packet.writeS(_charName); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java index e8dbddcd63..a3990c0879 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java @@ -52,7 +52,6 @@ public class FriendStatus implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_STATUS.writeId(packet); - packet.writeD(_type); packet.writeS(_name); switch (_type) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java index 8752104e06..78da5850b8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java @@ -50,7 +50,6 @@ public class L2Friend implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND.writeId(packet); - packet.writeD(_action ? 1 : 3); // 1-add 3-remove packet.writeD(_objid); packet.writeS(_name); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java index b69a253635..e50693cb11 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java @@ -81,17 +81,16 @@ public class L2FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._level); packet.writeD(info._classId); - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java index 0d4fa5cb5d..d0b92dbd1d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java @@ -40,7 +40,7 @@ public class TimedHuntingZoneEnter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); - packet.writeC(0x01); // bEnterSuccess + packet.writeC(1); // bEnterSuccess packet.writeD(_zoneId); packet.writeD((int) ((Chronos.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) packet.writeD(_player.getTimedHuntingZoneRemainingTime(_zoneId) / 1000); // nRemainTime (zone left time) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java index 2c93f25c76..c80dbcfa6a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java @@ -35,7 +35,7 @@ public class TimedHuntingZoneExit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); - packet.writeC(0x00); // bEnterSuccess + packet.writeC(0); // bEnterSuccess return true; } } \ No newline at end of file diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java index 1694dae91d..63468d2a8d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java @@ -42,7 +42,6 @@ public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket { _shopType = shopType; _player = player; - switch (shopType) { case 3: // Normal Lcoin Shop @@ -66,7 +65,6 @@ public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PURCHASE_LIMIT_SHOP_ITEM_LIST_NEW.writeId(packet); - packet.writeC(_shopType); // packet.writeD(_products.size()); for (LimitShopProductHolder product : _products) @@ -82,7 +80,6 @@ public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket packet.writeH(product.getIngredientEnchants()[0]); packet.writeH(product.getIngredientEnchants()[1]); packet.writeH(product.getIngredientEnchants()[2]); - // Check limits. if (product.getAccountDailyLimit() > 0) // Sale period. { @@ -90,7 +87,7 @@ public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket { if ((_player.getAccountVariables().getLong(AccountVariables.LCOIN_SHOP_PRODUCT_TIME + product.getProductionId(), 0) + 86400000) > Chronos.currentTimeMillis()) { - packet.writeD(0x00); + packet.writeD(0); } else // Reset limit. { @@ -107,7 +104,7 @@ public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket { if (_player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_COUNT + product.getProductionId(), 0) >= product.getAccountBuyLimit()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -116,12 +113,11 @@ public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket } else // No account limits. { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x00); // nRemainSec - packet.writeD(0x00); // nRemainServerItemAmount + packet.writeD(0); // nRemainSec + packet.writeD(0); // nRemainServerItemAmount } - return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemResult.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemResult.java index e4ee346643..0bf970f724 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemResult.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemResult.java @@ -42,7 +42,6 @@ public class ExPurchaseLimitShopItemResult implements IClientOutgoingPacket _category = category; _productId = productId; _rewards = rewards; - switch (_category) { case 3: // Normal Lcoin Shop diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampExpInfoUI.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampExpInfoUI.java index 8e23bfb677..52777d85fc 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampExpInfoUI.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampExpInfoUI.java @@ -38,7 +38,7 @@ public class ExMagicLampExpInfoUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAGICLAMP_EXP_INFO.writeId(packet); - packet.writeD(Config.ENABLE_MAGIC_LAMP ? 0x01 : 0x00); // IsOpen + packet.writeD(Config.ENABLE_MAGIC_LAMP ? 1 : 0); // IsOpen packet.writeD(Config.MAGIC_LAMP_MAX_LEVEL_EXP); // MaxMagicLampExp packet.writeD(_player.getLampExp()); // MagicLampExp packet.writeD(_player.getLampCount()); // MagicLampCount diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java index 677c09091f..706c179a9c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java @@ -37,7 +37,6 @@ public class ExMentorAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_ADD.writeId(packet); - packet.writeS(_mentor.getName()); packet.writeD(_mentor.getActiveClass()); packet.writeD(_mentor.getLevel()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java index b3e3dcb1e7..2f08d72ba6 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java @@ -63,9 +63,8 @@ public class ExMentorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_LIST.writeId(packet); - packet.writeD(_type); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mentees.size()); for (Mentee mentee : _mentees) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java index e2a71fecd7..3f3a83b27d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ListMenteeWaiting implements IClientOutgoingPacket { private static final int PLAYERS_PER_PAGE = 64; + private final List _possibleCandiates = new ArrayList<>(); private final int _page; @@ -49,18 +50,15 @@ public class ListMenteeWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_MENTEE_WAITING.writeId(packet); - - packet.writeD(0x01); // always 1 in retail + packet.writeD(1); // always 1 in retail if (_possibleCandiates.isEmpty()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } - packet.writeD(_possibleCandiates.size()); packet.writeD(_possibleCandiates.size() % PLAYERS_PER_PAGE); - for (Player player : _possibleCandiates) { if ((1 <= (PLAYERS_PER_PAGE * _page)) && (1 > (PLAYERS_PER_PAGE * (_page - 1)))) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java index f3a98a919a..89cb697e8b 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java @@ -44,10 +44,8 @@ public class ExPetInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -69,88 +67,71 @@ public class ExPetInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -160,9 +141,7 @@ public class ExPetInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -176,9 +155,8 @@ public class ExPetInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -228,28 +206,24 @@ public class ExPetInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PET_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0x00); + packet.writeQ(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -268,7 +242,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -284,19 +258,19 @@ public class ExPetInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -308,20 +282,20 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -345,12 +319,12 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -380,12 +354,10 @@ public class ExPetInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetDelete.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetDelete.java index 17dba0fec9..f9b697323e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetDelete.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetDelete.java @@ -35,7 +35,6 @@ public class PetDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_DELETE.writeId(packet); - packet.writeD(_petType); packet.writeD(_petObjId); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java index 6e26ae016c..fa9c9d8693 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java @@ -71,7 +71,6 @@ public class PetInfo implements IClientOutgoingPacket _curFed = sum.getLifeTimeRemaining(); _maxFed = sum.getLifeTime(); } - if (summon.isBetrayed()) { _statusMask |= 0x01; // Auto attackable status @@ -99,19 +98,15 @@ public class PetInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_INFO.writeId(packet); - packet.writeC(_summon.getSummonType()); packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); - packet.writeD(_summon.getX()); packet.writeD(_summon.getY()); packet.writeD(_summon.getZ()); packet.writeD(_summon.getHeading()); - packet.writeD(_summon.getStat().getMAtkSpd()); packet.writeD(_summon.getStat().getPAtkSpd()); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -120,16 +115,13 @@ public class PetInfo implements IClientOutgoingPacket packet.writeH(_flWalkSpd); packet.writeH(_flyRunSpd); packet.writeH(_flyWalkSpd); - packet.writeF(_moveMultiplier); packet.writeF(_summon.getAttackSpeedMultiplier()); // attack speed multiplier packet.writeF(_summon.getTemplate().getFCollisionRadius()); packet.writeF(_summon.getTemplate().getFCollisionHeight()); - packet.writeD(_summon.getWeapon()); // right hand weapon packet.writeD(_summon.getArmor()); // body armor - packet.writeD(0x00); // left hand weapon - + packet.writeD(0); // left hand weapon packet.writeC(_summon.isDead() ? 0 : _summon.isShowSummonAnimation() ? 2 : _value); packet.writeD(-1); // High Five NPCString ID if (_summon.isPet()) @@ -142,24 +134,19 @@ public class PetInfo implements IClientOutgoingPacket } packet.writeD(-1); // High Five NPCString ID packet.writeS(_summon.getTitle()); // owner name - packet.writeC(_summon.getPvpFlag()); // confirmed packet.writeD(_summon.getReputation()); // confirmed - packet.writeD(_curFed); // how fed it is packet.writeD(_maxFed); // max fed it can be packet.writeD((int) _summon.getCurrentHp()); // current hp packet.writeD(_summon.getMaxHp()); // max hp packet.writeD((int) _summon.getCurrentMp()); // current mp packet.writeD(_summon.getMaxMp()); // max mp - packet.writeQ(_summon.getStat().getSp()); // sp packet.writeH(_summon.getLevel()); // level packet.writeQ(_summon.getStat().getExp()); - // 0% absolute value packet.writeQ(Math.min(_summon.getExpForThisLevel(), _summon.getStat().getExp())); // 0% absolute value - packet.writeQ(_summon.getExpForNextLevel()); // 100% absoulte value packet.writeD(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight packet.writeD(_summon.getMaxLoad()); // max weight it can carry @@ -176,12 +163,10 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD((int) _summon.getStat().getMoveSpeed()); // speed packet.writeD(_summon.getPAtkSpd()); // atkspeed packet.writeD(_summon.getMAtkSpd()); // casting speed - packet.writeC(0); // TODO: Check me, might be ride status packet.writeC(_summon.getTeam().getId()); // Confirmed packet.writeC(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed packet.writeC(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed - packet.writeD(-1); packet.writeD(0); final Set aves = _summon.getEffectList().getCurrentAbnormalVisualEffects(); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java index f45d3262ac..19688209cb 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java @@ -47,7 +47,6 @@ public class PetInventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.PET_INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java index cd0744b2c4..80e9863809 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java @@ -36,7 +36,6 @@ public class PetItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusShow.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusShow.java index 68143367e8..d2e571e518 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusShow.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusShow.java @@ -39,7 +39,6 @@ public class PetStatusShow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_SHOW.writeId(packet); - packet.writeD(_summonType); packet.writeD(_summonObjectId); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusUpdate.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusUpdate.java index c29dec61c1..9f1edddf54 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusUpdate.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusUpdate.java @@ -53,7 +53,6 @@ public class PetStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_UPDATE.writeId(packet); - packet.writeD(_summon.getSummonType()); packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getX()); @@ -70,7 +69,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket packet.writeQ(_summon.getStat().getExp()); packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value packet.writeQ(_summon.getExpForNextLevel()); // 100% absolute value - packet.writeD(0x01); // TODO: Find me! + packet.writeD(1); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java index fd8875aedd..c5a96dd099 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java @@ -34,12 +34,12 @@ public class ExPledgeBonusList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_BONUS_LIST.writeId(packet); - packet.writeC(0x00); // 140 + packet.writeC(0); // 140 ClanRewardData.getInstance().getClanRewardBonuses(ClanRewardType.MEMBERS_ONLINE).stream().sorted(Comparator.comparingInt(ClanRewardBonus::getLevel)).forEach(bonus -> { packet.writeD(bonus.getSkillReward().getSkillId()); }); - packet.writeC(0x01); // 140 + packet.writeC(1); // 140 ClanRewardData.getInstance().getClanRewardBonuses(ClanRewardType.HUNTING_MONSTERS).stream().sorted(Comparator.comparingInt(ClanRewardBonus::getLevel)).forEach(bonus -> { packet.writeD(bonus.getItemReward().getId()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java index 81fd4fe6aa..ac4f03e25c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java @@ -50,7 +50,6 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Player: " + _player + " attempting to write to a null clan!"); return false; } - final ClanRewardBonus highestMembersOnlineBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.MEMBERS_ONLINE); final ClanRewardBonus highestHuntingBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.HUNTING_MONSTERS); final ClanRewardBonus membersOnlineBonus = ClanRewardType.MEMBERS_ONLINE.getAvailableBonus(clan); @@ -75,25 +74,22 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Couldn't find item reward for highest available hunting bonus!!"); return false; } - // General OP Code OutgoingPackets.EX_PLEDGE_BONUS_OPEN.writeId(packet); - // Members online bonus packet.writeD(highestMembersOnlineBonus.getRequiredAmount()); packet.writeD(clan.getMaxOnlineMembers()); - packet.writeC(0x00); // 140 - packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0x00); - packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 0x01 : 0x00); - + packet.writeC(0); // 140 + packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0); + packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 1 : 0); // Hunting bonus packet.writeD(highestHuntingBonus.getRequiredAmount()); packet.writeD(clan.getHuntingPoints()); - packet.writeC(0x00); // 140 - packet.writeD(huntingBonus != null ? highestHuntingBonus.getItemReward().getId() : 0x00); - packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 0x01 : 0x00); + packet.writeC(0); // 140 + packet.writeD(huntingBonus != null ? highestHuntingBonus.getItemReward().getId() : 0); + packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index fb735b8925..e75426e598 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -69,7 +69,6 @@ public class ExBRBuyProduct implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUY_PRODUCT.writeId(packet); - packet.writeD(_reply); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java index 742b3eba9d..91a186b81d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java @@ -39,10 +39,9 @@ public class ExBRGamePoint implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_GAME_POINT.writeId(packet); - packet.writeD(_charId); packet.writeQ(_charPoints); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java index 50f21df46a..e36f2ff502 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java @@ -45,7 +45,6 @@ public class ExBRProductInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_INFO.writeId(packet); - packet.writeD(_item.getBrId()); packet.writeD(_item.getPrice()); packet.writeD(_item.getItems().size()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java index dc851ffd43..0f042ba043 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java @@ -45,9 +45,8 @@ public class ExBRProductList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); // Adena - packet.writeQ(0x00); // Hero coins + packet.writeQ(0); // Hero coins packet.writeC(_type); // Type 0 - Home, 1 - History, 2 - Favorites packet.writeD(_primeList.size()); for (PrimeShopGroup brItem : _primeList) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java index 320140ace6..bf67164bfe 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java @@ -39,7 +39,6 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RAID_BOSS_SPAWN_INFO.writeId(packet); - packet.writeD(_statuses.size()); // count for (Entry entry : _statuses.entrySet()) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftExtract.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftExtract.java index 5d082bad06..0ec53792ce 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftExtract.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftExtract.java @@ -33,7 +33,7 @@ public class ExCraftExtract implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CRAFT_EXTRACT.writeId(packet); - packet.writeC(0x00); + packet.writeC(0); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftInfo.java index 24b3008866..b9dc4c096c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftInfo.java @@ -38,12 +38,10 @@ public class ExCraftInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CRAFT_INFO.writeId(packet); - final PlayerRandomCraft rc = _player.getRandomCraft(); packet.writeD(rc.getFullCraftPoints()); // Full points owned packet.writeD(rc.getCraftPoints()); // Craft Points (10k = 1%) - packet.writeC(rc.isSayhaRoll() ? 0x01 : 0x00); // Will get sayha? - + packet.writeC(rc.isSayhaRoll() ? 1 : 0); // Will get sayha? return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomInfo.java index 4d0da6f059..638956b1c5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomInfo.java @@ -40,7 +40,6 @@ public class ExCraftRandomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CRAFT_RANDOM_INFO.writeId(packet); - final List rewards = _player.getRandomCraft().getRewards(); int size = 5; packet.writeD(size); // size @@ -49,30 +48,28 @@ public class ExCraftRandomInfo implements IClientOutgoingPacket final RandomCraftRewardItemHolder holder = rewards.get(i); if ((holder != null) && (holder.getItemId() != 0)) { - packet.writeC(holder.isLocked() ? 0x01 : 0x00); // Locked + packet.writeC(holder.isLocked() ? 1 : 0); // Locked packet.writeD(holder.getLockLeft()); // Rolls it will stay locked packet.writeD(holder.getItemId()); // Item id packet.writeQ(holder.getItemCount()); // Item count } else { - packet.writeC(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeQ(0x00); + packet.writeC(0); + packet.writeD(0); + packet.writeD(0); + packet.writeQ(0); } size--; } - // Write missing for (int i = size; i > 0; i--) { - packet.writeC(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeQ(0x00); + packet.writeC(0); + packet.writeD(0); + packet.writeD(0); + packet.writeQ(0); } - return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomLockSlot.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomLockSlot.java index d4f6f05a0c..206d10c5f1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomLockSlot.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomLockSlot.java @@ -33,7 +33,7 @@ public class ExCraftRandomLockSlot implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CRAFT_RANDOM_LOCK_SLOT.writeId(packet); - packet.writeC(0x00); + packet.writeC(0); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomMake.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomMake.java index 9b82b3d21e..1da2dae3c9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomMake.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomMake.java @@ -38,11 +38,11 @@ public class ExCraftRandomMake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CRAFT_RANDOM_MAKE.writeId(packet); - packet.writeC(0x00); // Close window + packet.writeC(0); // Close window packet.writeH(0x0F); // Unknown packet.writeD(_itemId); packet.writeQ(_itemCount); - packet.writeC(0x00); // Enchantment level + packet.writeC(0); // Enchantment level return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomRefresh.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomRefresh.java index 8ffe0f4ede..084eeb46d3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomRefresh.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomRefresh.java @@ -33,7 +33,7 @@ public class ExCraftRandomRefresh implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CRAFT_RANDOM_REFRESH.writeId(packet); - packet.writeC(0x00); + packet.writeC(0); return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java index d1896f32a7..5c835c1dea 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java @@ -47,7 +47,6 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_HERO_AND_LEGEND_INFO.writeId(packet); - if (!Hero.getInstance().getHeroes().isEmpty()) { try (Connection con = DatabaseFactory.getConnection(); @@ -63,7 +62,6 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket { packet.writeC(1); // ?? shows 78 on JP packet.writeC(1); // ?? shows 0 on JP - packet.writeString(rset.getString("char_name")); final int clanId = rset.getInt("clanid"); if (clanId > 0) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java index b7395dee4e..3e7261542a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java @@ -55,7 +55,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MY_RANKING_INFO.writeId(packet); - final Date date = new Date(); final Calendar calendar = new GregorianCalendar(); calendar.setTime(date); @@ -99,7 +98,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket { PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } - int previousPlace = 0; int previousWins = 0; int previousLoses = 0; @@ -128,7 +126,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket { PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } - int heroCount = 0; int legendCount = 0; if (Hero.getInstance().getCompleteHeroes().containsKey(_player.getObjectId())) @@ -137,7 +134,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket heroCount = hero.getInt("count", 0); legendCount = hero.getInt("legend_count", 0); } - packet.writeD(year); // Year packet.writeD(month); // Month packet.writeD(Math.min(Olympiad.getInstance().getCurrentCycle() - 1, 0)); // cycle ? diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java index bad88659b0..db5efac89a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java @@ -64,20 +64,17 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_RANKING_INFO.writeId(packet); - packet.writeC(_tabId); // Tab id packet.writeC(_rankingType); // ranking type packet.writeC(_unk); // unk, shows 1 all time packet.writeD(_classId); // class id (default 148) or caller class id for personal rank packet.writeD(_serverId); // 0 - all servers, server id - for caller server packet.writeD(933); // unk, 933 all time - if (!_playerList.isEmpty()) { final RankingOlympiadCategory category = RankingOlympiadCategory.values()[_tabId]; writeFilteredRankingData(packet, category, category.getScopeByGroup(_rankingType), ClassId.getClassId(_classId)); } - return true; } @@ -100,10 +97,8 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket private void writeScopeData(PacketWriter packet, RankingOlympiadScope scope, List> list, List> snapshot) { - Entry playerData = list.stream().filter(it -> it.getValue().getInt("charId", 0) == _player.getObjectId()).findFirst().orElse(null); final int indexOf = list.indexOf(playerData); - final List> limited; switch (scope) { @@ -132,9 +127,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket limited = Collections.emptyList(); } } - packet.writeD(limited.size()); - int rank = 1; for (Entry data : limited.stream().sorted(Entry.comparingByKey()).collect(Collectors.toList())) { @@ -143,7 +136,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket packet.writeString(player.getString("name")); // name packet.writeString(player.getString("clanName")); // clan name packet.writeD(scope == RankingOlympiadScope.SELF ? data.getKey() : curRank); // rank - if (!snapshot.isEmpty()) { int snapshotRank = 1; @@ -160,7 +152,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket { packet.writeD(scope == RankingOlympiadScope.SELF ? data.getKey() : curRank); } - packet.writeD(Config.SERVER_ID); // server id packet.writeD(player.getInt("level")); // level packet.writeD(player.getInt("classId")); // class id diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingList.java index ad8f5d0034..164286d6f1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingList.java @@ -114,10 +114,8 @@ public class ExPvpRankingList implements IClientOutgoingPacket private void writeScopeData(PacketWriter packet, RankingScope scope, List> list, List> snapshot) { - Entry playerData = list.stream().filter(it -> it.getValue().getInt("charId", 0) == _player.getObjectId()).findFirst().orElse(null); final int indexOf = list.indexOf(playerData); - final List> limited; switch (scope) { @@ -146,9 +144,7 @@ public class ExPvpRankingList implements IClientOutgoingPacket limited = Collections.emptyList(); } } - packet.writeD(limited.size()); - int rank = 1; for (Entry data : limited.stream().sorted(Entry.comparingByKey()).collect(Collectors.toList())) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java index 3b3728f090..f2e96db6b1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java @@ -48,7 +48,6 @@ public class ExRankingCharInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RANKING_CHAR_INFO.writeId(packet); - if (!_playerList.isEmpty()) { for (Integer id : _playerList.keySet()) @@ -59,7 +58,6 @@ public class ExRankingCharInfo implements IClientOutgoingPacket packet.writeD(id); // server rank packet.writeD(player.getInt("raceRank")); // race rank packet.writeD(player.getInt("classRank")); // class rank - for (Integer id2 : _snapshotList.keySet()) { final StatSet snapshot = _snapshotList.get(id2); @@ -68,7 +66,7 @@ public class ExRankingCharInfo implements IClientOutgoingPacket packet.writeD(id2); // server rank snapshot packet.writeD(snapshot.getInt("raceRank")); // race rank snapshot packet.writeD(snapshot.getInt("classRank")); // class rank snapshot - packet.writeD(0); + packet.writeD(0); packet.writeD(0); packet.writeD(0); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java index f89d104f27..54de929cd5 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java @@ -55,12 +55,10 @@ public class ExRankingCharRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RANKING_CHAR_RANKERS.writeId(packet); - packet.writeC(_group); packet.writeC(_scope); packet.writeD(_race); packet.writeD(_player.getClassId().getId()); - if (!_playerList.isEmpty()) { switch (_group) @@ -71,7 +69,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket { final int count = _playerList.size() > 150 ? 150 : _playerList.size(); packet.writeD(count); - for (Integer id : _playerList.keySet()) { final StatSet player = _playerList.get(id); @@ -130,7 +127,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket packet.writeD(plr.getInt("classId")); packet.writeD(plr.getInt("race")); packet.writeD(id2); // server rank - if (!_snapshotList.isEmpty()) { for (Integer id3 : _snapshotList.keySet()) @@ -168,7 +164,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } } packet.writeD(count > 100 ? 100 : count); - int i = 1; for (Integer id : _playerList.keySet()) { @@ -218,7 +213,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket else { boolean found = false; - final Map raceList = new ConcurrentHashMap<>(); int i = 1; for (Integer id : _playerList.keySet()) @@ -230,7 +224,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket i++; } } - for (Integer id : raceList.keySet()) { final StatSet player = raceList.get(id); @@ -284,9 +277,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket i++; } } - packet.writeD(clanList.size()); - for (Integer id : clanList.keySet()) { final StatSet player = clanList.get(id); @@ -342,9 +333,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } } friendList.add(_player.getObjectId()); - packet.writeD(count); - for (int id : _playerList.keySet()) { final StatSet player = _playerList.get(id); @@ -381,7 +370,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket else { packet.writeD(1); - packet.writeString(_player.getName()); if (_player.getClan() != null) { @@ -431,7 +419,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } } packet.writeD(count > 100 ? 100 : count); - int i = 1; for (Integer id : _playerList.keySet()) { @@ -481,7 +468,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket else { boolean found = false; - final Map raceList = new ConcurrentHashMap<>(); int i = 1; for (Integer id : _playerList.keySet()) @@ -493,7 +479,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket i++; } } - for (Integer id : raceList.keySet()) { final StatSet player = raceList.get(id); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java index 2463589c81..c09b3e899d 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java @@ -47,18 +47,15 @@ public class ExFlyMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_mapId); - packet.writeD(_locations.size()); for (SayuneEntry loc : _locations) { packet.writeD(loc.getId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(loc.getX()); packet.writeD(loc.getY()); packet.writeD(loc.getZ()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java index 03fc6b580d..70b3fb25d2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java @@ -47,16 +47,13 @@ public class ExFlyMoveBroadcast implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE_BROADCAST.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); packet.writeD(_mapId); - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD(_currentLoc.getX()); packet.writeD(_currentLoc.getY()); packet.writeD(_currentLoc.getZ()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java index cfe11a27e0..49e5d86910 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java @@ -35,7 +35,6 @@ public class ExNotifyFlyMoveStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_FLY_MOVE_START.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java index d5640a47ef..0efa37ae8c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java @@ -51,7 +51,6 @@ public class ExMoveToLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_SUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_targetX); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java index 0cbe2c3e02..a0314c39aa 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java @@ -46,7 +46,6 @@ public class ExShuttleGetOff implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_OFF.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_x); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java index 5211bef5ba..061bcafed9 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java @@ -43,7 +43,6 @@ public class ExShuttleGetOn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_ON.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java index 97d54a9019..c8aee1fde7 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java @@ -43,7 +43,6 @@ public class ExShuttleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHUTTLE_INFO.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD(_shuttle.getX()); packet.writeD(_shuttle.getY()); @@ -60,8 +59,8 @@ public class ExShuttleInfo implements IClientOutgoingPacket packet.writeD(loc.getY()); packet.writeD(loc.getZ()); } - packet.writeD(stop.isDoorOpen() ? 0x01 : 0x00); - packet.writeD(stop.hasDoorChanged() ? 0x01 : 0x00); + packet.writeD(stop.isDoorOpen() ? 1 : 0); + packet.writeD(stop.hasDoorChanged() ? 1 : 0); } return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java index 6ba38f29a1..28b33b998e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java @@ -43,7 +43,6 @@ public class ExShuttleMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_MOVE.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD((int) _shuttle.getStat().getMoveSpeed()); packet.writeD((int) _shuttle.getStat().getRotationSpeed()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java index bf2b6ea6eb..6c31189d6a 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java @@ -44,7 +44,6 @@ public class ExStopMoveInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_SHUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java index f7f6849732..8492f42a6e 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java @@ -44,7 +44,6 @@ public class ExValidateLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_SHUTTLE.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExShowSharingLocationUi.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExShowSharingLocationUi.java index ace3c3deeb..4f9698963c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExShowSharingLocationUi.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExShowSharingLocationUi.java @@ -35,7 +35,6 @@ public class ExShowSharingLocationUi implements IClientOutgoingPacket @Override public boolean write(PacketWriter packet) { - OutgoingPackets.EX_SHARED_POSITION_SHARING_UI.writeId(packet); packet.writeQ(Config.SHARING_LOCATION_COST); return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExTeleportFavoritesList.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExTeleportFavoritesList.java index 0f68a71088..6bd6a492d2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExTeleportFavoritesList.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExTeleportFavoritesList.java @@ -42,14 +42,12 @@ public class ExTeleportFavoritesList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_FAVORITES_LIST.writeId(packet); - - packet.writeC(_enable ? 0x01 : 0x00); + packet.writeC(_enable ? 1 : 0); packet.writeD(_teleports.size()); for (int id : _teleports) { packet.writeD(id); } - return true; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java index 1d59c6d002..e7654ed911 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java @@ -60,7 +60,7 @@ public class AccountKicked implements IOutgoingPacket { OutgoingPackets.ACCOUNT_KICKED.writeId(packet); packet.writeD(_reason.getCode()); - return true; } } + diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 2e3a1f6163..1fe813e393 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: response + * Format: d d: response */ public class GGAuth implements IOutgoingPacket { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/network/serverpackets/Init.java index 4b3f71f30e..d725f45ca2 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/network/serverpackets/Init.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/network/serverpackets/Init.java @@ -52,7 +52,6 @@ public class Init implements IOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.INIT.writeId(packet); - packet.writeD(_sessionId); // session id packet.writeD(0x0000c621); // protocol revision diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index 8c534554a8..f4dcd22b00 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: the failure reason + * Format: d d: the failure reason */ public class LoginFail implements IOutgoingPacket { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/BaseRecievePacket.java index c682cb741d..a6ed15ce32 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/BaseRecievePacket.java @@ -73,7 +73,7 @@ public abstract class BaseRecievePacket try { result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE); - result = result.substring(0, result.indexOf(0x00)); + result = result.substring(0, result.indexOf(0)); _off += (result.length() * 2) + 2; } catch (Exception e) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/BaseSendablePacket.java index a9d918de4c..8fa8491cbf 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/commons/network/BaseSendablePacket.java @@ -117,16 +117,16 @@ public abstract class BaseSendablePacket public byte[] getBytes() { // if (this instanceof Init) - // writeD(0x00); // reserve for XOR initial key + // writeD(0); // reserve for XOR initial key - writeD(0x00); // reserve for checksum + writeD(0); // reserve for checksum final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++) { - writeC(0x00); + writeC(0); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/AttackType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/AttackType.java index 6064b10ed7..e9983f15e3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/AttackType.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/AttackType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum AttackType { - MISSED(0x01), - BLOCKED(0x02), - CRITICAL(0x04), - SHOT_USED(0x08); + MISSED(1), + BLOCKED(2), + CRITICAL(4), + SHOT_USED(8); private final int _mask; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/GroupType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/GroupType.java index 954aaace8b..916a14fd05 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/GroupType.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/GroupType.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum GroupType implements IUpdateTypeComponent { - NONE(0x01), - PARTY(0x02), - COMMAND_CHANNEL(0x04); + NONE(1), + PARTY(2), + COMMAND_CHANNEL(4); private int _mask; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/ItemListType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/ItemListType.java index 35ad11dd07..9dd765e702 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/ItemListType.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/ItemListType.java @@ -23,13 +23,13 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum ItemListType implements IUpdateTypeComponent { - AUGMENT_BONUS(0x01), - ELEMENTAL_ATTRIBUTE(0x02), - ENCHANT_EFFECT(0x04), - VISUAL_ID(0x08), - SOUL_CRYSTAL(0x10), - EVOLVE(0x80), - BLESSED(0x100); + AUGMENT_BONUS(1), + ELEMENTAL_ATTRIBUTE(2), + ENCHANT_EFFECT(4), + VISUAL_ID(8), + SOUL_CRYSTAL(16), + EVOLVE(128), + BLESSED(256); private final int _mask; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java index b3d08596c6..29403b783d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum MacroUpdateType { - ADD(0x01), - LIST(0x01), - MODIFY(0x02), - DELETE(0x00); + ADD(1), + LIST(1), + MODIFY(2), + DELETE(0); private final int _id; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java index 86c6159869..7776721c0f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java @@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum PartySmallWindowUpdateType implements IUpdateTypeComponent { - CURRENT_CP(0x01), - MAX_CP(0x02), - CURRENT_HP(0x04), - MAX_HP(0x08), - CURRENT_MP(0x10), - MAX_MP(0x20), - LEVEL(0x40), - CLASS_ID(0x80), - PARTY_SUBSTITUTE(0x100), - VITALITY_POINTS(0x200); + CURRENT_CP(1), + MAX_CP(2), + CURRENT_HP(4), + MAX_HP(8), + CURRENT_MP(16), + MAX_MP(32), + LEVEL(64), + CLASS_ID(128), + PARTY_SUBSTITUTE(256), + VITALITY_POINTS(512); private final int _mask; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 00bb331778..667ce7f17c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.Broadcast; import org.l2jmobius.gameserver.util.Util; /** - * Fromat:(ch) dddddc + * Format:(ch) dddddc * @author -Wooden- */ public class RequestExMagicSkillUseGround implements IClientIncomingPacket diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java index 8744393432..033095e74d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java @@ -39,7 +39,6 @@ public class AbnormalStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ABNORMAL_STATUS_UPDATE.writeId(packet); - packet.writeH(_effects.size()); for (BuffInfo info : _effects) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 1b8ddb2042..bec794bef3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -44,7 +44,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; } @@ -60,7 +59,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; setHtml(html); } @@ -77,13 +75,11 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } - if (!html.contains(""; return; } - _html = html; } @@ -96,7 +92,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } - setHtml(content); return true; } @@ -138,12 +133,10 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { player.clearHtmlActions(getScope()); } - if (_disabledValidation) { return; } - if (player != null) { Util.buildHtmlActionCache(player, getScope(), _npcObjId, _html); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index c1843be93c..e70fd93427 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -72,7 +72,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket= 0) || (item.getAttributeDefence(AttributeType.FIRE) > 0) || (item.getAttributeDefence(AttributeType.WATER) > 0) || (item.getAttributeDefence(AttributeType.WIND) > 0) || (item.getAttributeDefence(AttributeType.EARTH) > 0) || (item.getAttributeDefence(AttributeType.HOLY) > 0) || (item.getAttributeDefence(AttributeType.DARK) > 0)) { mask |= ItemListType.ELEMENTAL_ATTRIBUTE.getMask(); } - if (item.getEnchantOptions() != null) { for (int id : item.getEnchantOptions()) @@ -205,27 +199,22 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket 0) { mask |= ItemListType.VISUAL_ID.getMask(); } - if (((item.getSoulCrystalOptions() != null) && !item.getSoulCrystalOptions().isEmpty()) || ((item.getSoulCrystalSpecialOptions() != null) && !item.getSoulCrystalSpecialOptions().isEmpty())) { mask |= ItemListType.SOUL_CRYSTAL.getMask(); } - if (item.getPetData() != null) { mask |= ItemListType.EVOLVE.getMask(); } - if (item.isBlessed()) { mask |= ItemListType.BLESSED.getMask(); } - return mask; } @@ -293,7 +282,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); packet.writeC(removeSkills.size()); for (Skill removed : removeSkills) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java index 8fa6259f64..6451dffd02 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ActionFailed implements IClientOutgoingPacket { public static final ActionFailed STATIC_PACKET = new ActionFailed(); - private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); + private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); static { for (SkillCastingType castingType : SkillCastingType.values()) @@ -57,7 +57,6 @@ public class ActionFailed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ACTION_FAIL.writeId(packet); - packet.writeD(_castingType); // MagicSkillUse castingType return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java index 6e868368c9..30ce58da60 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java @@ -44,9 +44,8 @@ public class AgitDecoInfo implements IClientOutgoingPacket { continue; } - packet.writeC(_residense.hasFunction(type) ? 0x01 : 0x00); + packet.writeC(_residense.hasFunction(type) ? 1 : 0); } - // Unknown packet.writeD(0); // TODO: Find me! packet.writeD(0); // TODO: Find me! diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java index 6cb71fc985..4683fb30f0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java @@ -44,7 +44,6 @@ public class AllianceInfo implements IClientOutgoingPacket _name = leader.getAllyName(); _leaderC = leader.getName(); _leaderP = leader.getLeaderName(); - final Collection allies = ClanTable.getInstance().getClanAllies(allianceId); _allies = new ClanInfo[allies.size()]; int idx = 0; @@ -57,7 +56,6 @@ public class AllianceInfo implements IClientOutgoingPacket total += ci.getTotal(); online += ci.getOnline(); } - _total = total; _online = online; } @@ -66,18 +64,16 @@ public class AllianceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_INFO.writeId(packet); - packet.writeS(_name); packet.writeD(_total); packet.writeD(_online); packet.writeS(_leaderC); packet.writeS(_leaderP); - packet.writeD(_allies.length); for (ClanInfo aci : _allies) { packet.writeS(aci.getClan().getName()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(aci.getClan().getLevel()); packet.writeS(aci.getClan().getLeaderName()); packet.writeD(aci.getTotal()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java index f9d08f6600..186fd12e81 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AllyCrest.java @@ -44,7 +44,6 @@ public class AllyCrest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_CREST.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_crestId); if (_data != null) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java index 6218f1717f..1ae4653f91 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java @@ -38,7 +38,6 @@ public class AskJoinAlly implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_ALLIANCE.writeId(packet); - packet.writeD(_requestorObjId); packet.writeS(null); // Ally Name ? packet.writeS(null); // TODO: Find me! diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java index a66bb3cd33..b9cfbe81b9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java @@ -39,7 +39,6 @@ public class AskJoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_PARTY.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 05c420ff59..227ab571be 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -45,7 +45,6 @@ public class Attack implements IClientOutgoingPacket _attackerObjId = attacker.getObjectId(); _attackerLoc = new Location(attacker); _targetLoc = new Location(target); - final Player player = attacker.getActingPlayer(); if (player == null) { @@ -111,7 +110,6 @@ public class Attack implements IClientOutgoingPacket final Iterator it = _hits.iterator(); final Hit firstHit = it.next(); OutgoingPackets.ATTACK.writeId(packet); - packet.writeD(_attackerObjId); packet.writeD(firstHit.getTargetId()); packet.writeD(_soulshotVisualSubstitute); // Ertheia @@ -121,13 +119,11 @@ public class Attack implements IClientOutgoingPacket packet.writeD(_attackerLoc.getX()); packet.writeD(_attackerLoc.getY()); packet.writeD(_attackerLoc.getZ()); - packet.writeH(_hits.size() - 1); while (it.hasNext()) { writeHit(packet, it.next()); } - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java index bd6878eb42..8b85fe85e3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java @@ -35,7 +35,6 @@ public class AutoAttackStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_START.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java index e767d1877a..a294b1e212 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java @@ -35,7 +35,6 @@ public class AutoAttackStop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_STOP.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java index 3f329415df..0c79677eae 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java @@ -38,7 +38,6 @@ public class BlockListPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BLOCK_LIST.writeId(packet); - packet.writeD(_playersId.size()); for (int playerId : _playersId) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index f610cdc6aa..d95f0543b9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -45,8 +45,7 @@ public class BuyList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x00); // Type BUY + packet.writeD(0); // Type BUY packet.writeQ(_money); // current money packet.writeD(_listId); packet.writeD(_inventorySlots); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index cd25af908d..7cb2bf4425 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -50,36 +50,34 @@ public class BuyListSeed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BUY_LIST_SEED.writeId(packet); - packet.writeQ(_money); // current money - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeD(_manorId); // manor id - if (!_list.isEmpty()) { packet.writeH(_list.size()); // list length for (SeedProduction s : _list) { - packet.writeC(0x00); // mask item 0 to print minimal item information + packet.writeC(0); // mask item 0 to print minimal item information packet.writeD(s.getId()); // ObjectId packet.writeD(s.getId()); // ItemId packet.writeC(0xFF); // T1 packet.writeQ(s.getAmount()); // Quantity - packet.writeC(0x05); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item - packet.writeC(0x00); // Filler (always 0) - packet.writeH(0x00); // Equipped : 00-No, 01-yes - packet.writeQ(0x00); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand - packet.writeH(0x00); // Enchant level (pet level shown in control item) + packet.writeC(5); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item + packet.writeC(0); // Filler (always 0) + packet.writeH(0); // Equipped : 00-No, 01-yes + packet.writeQ(0); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand + packet.writeH(0); // Enchant level (pet level shown in control item) packet.writeD(-1); packet.writeD(-9999); - packet.writeC(0x01); // GOD Item enabled = 1 disabled (red) = 0 + packet.writeC(1); // GOD Item enabled = 1 disabled (red) = 0 packet.writeQ(s.getPrice()); // price } _list.clear(); } else { - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java index 3a7b67af23..f3dc872dca 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java @@ -32,8 +32,7 @@ public class CSShowComBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - - packet.writeC(0x01); // c4 1 to show community 00 to hide + packet.writeC(1); // c4 1 to show community 00 to hide packet.writeB(_html); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java index eacc27aa07..b18dac4cc3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java @@ -36,7 +36,6 @@ public class CameraMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CAMERA_MODE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java index 1682f5bc62..adea754676 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java @@ -39,7 +39,6 @@ public class ChairSit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAIR_SIT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_staticObjectId); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java index 2bc31a285a..de141fa067 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java @@ -38,7 +38,6 @@ public class ChangeMoveType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_MOVE_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_running ? RUN : WALK); packet.writeD(0); // c2 diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index 73277d923d..fbe5e39e2e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -22,17 +22,17 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ChangeWaitType implements IClientOutgoingPacket { + public static final int WT_SITTING = 0; + public static final int WT_STANDING = 1; + public static final int WT_START_FAKEDEATH = 2; + public static final int WT_STOP_FAKEDEATH = 3; + private final int _objectId; private final int _moveType; private final int _x; private final int _y; private final int _z; - public static final int WT_SITTING = 0; - public static final int WT_STANDING = 1; - public static final int WT_START_FAKEDEATH = 2; - public static final int WT_STOP_FAKEDEATH = 3; - public ChangeWaitType(Creature creature, int newMoveType) { _objectId = creature.getObjectId(); @@ -46,7 +46,6 @@ public class ChangeWaitType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_WAIT_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_moveType); packet.writeD(_x); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index 41180bac50..aa2e7b2eaa 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -30,7 +30,6 @@ public class CharCreateFail implements IClientOutgoingPacket public static final int REASON_CREATE_NOT_ALLOWED = 0x05; // "Characters cannot be created from this server." public static final int REASON_CHOOSE_ANOTHER_SVR = 0x06; // "Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please // choose another server." - private final int _error; public CharCreateFail(int errorCode) @@ -42,7 +41,6 @@ public class CharCreateFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index f0e99885ad..768617e558 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -31,8 +31,7 @@ public class CharCreateOk implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_SUCCESS.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index bed289ca0a..1674eef343 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -33,7 +33,6 @@ public class CharDeleteFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_DELETE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 7a68746f74..422aa15700 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -35,6 +35,22 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { + private static final int[] PAPERDOLL_ORDER = new int[] + { + Inventory.PAPERDOLL_UNDER, + Inventory.PAPERDOLL_HEAD, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_LHAND, + Inventory.PAPERDOLL_GLOVES, + Inventory.PAPERDOLL_CHEST, + Inventory.PAPERDOLL_LEGS, + Inventory.PAPERDOLL_FEET, + Inventory.PAPERDOLL_CLOAK, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_HAIR, + Inventory.PAPERDOLL_HAIR2 + }; + private final Player _player; private final Clan _clan; private int _objId; @@ -57,22 +73,6 @@ public class CharInfo implements IClientOutgoingPacket private int _vehicleId = 0; private final boolean _gmSeeInvis; - private static final int[] PAPERDOLL_ORDER = new int[] - { - Inventory.PAPERDOLL_UNDER, - Inventory.PAPERDOLL_HEAD, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_LHAND, - Inventory.PAPERDOLL_GLOVES, - Inventory.PAPERDOLL_CHEST, - Inventory.PAPERDOLL_LEGS, - Inventory.PAPERDOLL_FEET, - Inventory.PAPERDOLL_CLOAK, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_HAIR, - Inventory.PAPERDOLL_HAIR2 - }; - public CharInfo(Player player, boolean gmSeeInvis) { _player = player; @@ -121,17 +121,15 @@ public class CharInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); // Confirmed packet.writeD(_y); // Confirmed packet.writeD(_z); // Confirmed packet.writeD(_vehicleId); // Confirmed packet.writeD(_objId); // Confirmed packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed - packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) @@ -155,10 +153,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.getPvpFlag()); packet.writeD(_player.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -169,53 +165,40 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); - packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeS(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle()); - packet.writeD(_player.getAppearance().getVisibleClanId()); packet.writeD(_player.getAppearance().getVisibleClanCrestId()); packet.writeD(_player.getAppearance().getVisibleAllyId()); packet.writeD(_player.getAppearance().getVisibleAllyCrestId()); - - packet.writeC(_player.isSitting() ? 0x00 : 0x01); // Confirmed - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // Confirmed - packet.writeC(_player.isInCombat() ? 0x01 : 0x00); // Confirmed - - packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 0x01 : 0x00); // Confirmed - - packet.writeC(_player.isInvisible() ? 0x01 : 0x00); - + packet.writeC(_player.isSitting() ? 0 : 1); // Confirmed + packet.writeC(_player.isRunning() ? 1 : 0); // Confirmed + packet.writeC(_player.isInCombat() ? 1 : 0); // Confirmed + packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 1 : 0); // Confirmed + packet.writeC(_player.isInvisible() ? 1 : 0); packet.writeC(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount packet.writeC(_player.getPrivateStoreType().getId()); // Confirmed packet.writeH(_player.getCubics().size()); // Confirmed _player.getCubics().keySet().forEach(packet::writeH); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); // Confirmed packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); packet.writeH(_player.getRecomHave()); // Confirmed packet.writeD(_player.getMountNpcId() == 0 ? 0 : _player.getMountNpcId() + 1000000); - packet.writeD(_player.getClassId().getId()); // Confirmed - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeC(_player.isMounted() ? 0 : _enchantLevel); // Confirmed - packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeD(_player.getClanCrestLargeId()); packet.writeC(_player.isNoble() ? 1 : 0); // Confirmed packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 2 : 0); // 152 - Value for enabled changed to 2? packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed - final ILocational baitLocation = _player.getFishing().getBaitLocation(); if (baitLocation != null) { @@ -231,29 +214,21 @@ public class CharInfo implements IClientOutgoingPacket } packet.writeD(_player.getAppearance().getNameColor()); // Confirmed - packet.writeD(_heading); // Confirmed - packet.writeC(_player.getPledgeClass()); packet.writeH(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); // Confirmed - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - - packet.writeC(0x00); // nPvPRestrainStatus - + packet.writeC(0); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentHp())); // Confirmed packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - - packet.writeC(0x00); // cBRLectureMark + packet.writeC(0); // cBRLectureMark final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed @@ -265,11 +240,11 @@ public class CharInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(_player.isTrueHero() ? 100 : 0); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); // Hair accessory - packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points - packet.writeD(0x00); // nCursedWeaponClassId + packet.writeC(_player.isTrueHero() ? 100 : 0); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); // Hair accessory + packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points + packet.writeD(0); // nCursedWeaponClassId // AFK animation. if ((_player.getClan() != null) && (CastleManager.getInstance().getCastleByOwner(_player.getClan()) != null)) @@ -278,17 +253,15 @@ public class CharInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); + packet.writeD(0); } // Rank. packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : RankManager.getInstance().getPlayerClassRank(_player) == 1 ? 4 : 0); - - packet.writeH(0x00); - packet.writeC(0x00); + packet.writeH(0); + packet.writeC(0); packet.writeD(_player.getClassId().getId()); - packet.writeC(0x00); - + packet.writeC(0); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 7187b73184..11f5f4df52 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -40,17 +40,16 @@ public class CharSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTED.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getTitle()); packet.writeD(_sessionId); packet.writeD(_player.getClanId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x01); // active ?? + packet.writeD(1); // active ?? packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -62,25 +61,20 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_player.getReputation()); packet.writeD(_player.getPkKills()); packet.writeD(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_player.getClassId().getId()); - packet.writeB(new byte[16]); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeB(new byte[28]); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index df11ac60d8..22fb03de1b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -44,10 +44,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { private static final Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); - private final String _loginName; - private final int _sessionId; - private int _activeId; - private final List _characterPackages; private static final int[] PAPERDOLL_ORDER = new int[] { @@ -112,7 +108,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_ARTIFACT20, // 152 Inventory.PAPERDOLL_ARTIFACT21 // 152 }; - private static final int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, @@ -126,6 +121,11 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_HAIR2, }; + private final String _loginName; + private final int _sessionId; + private int _activeId; + private final List _characterPackages; + /** * Constructor for CharSelectionInfo. * @param loginName @@ -156,17 +156,14 @@ public class CharSelectionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.size(); packet.writeD(size); // Created character count - packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) - packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 0x01 : 0x00); // if 1 can't create new char - packet.writeC(0x01); // 0=can't play, 1=can play free until level 85, 2=100% free play - packet.writeD(0x02); // if 1, Korean client - packet.writeC(0x00); // Gift message for inactive accounts // 152 - packet.writeC(0x00); // Balthus Knights, if 1 suggests premium account - + packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 1 : 0); // if 1 can't create new char + packet.writeC(1); // 0=can't play, 1=can play free until level 85, 2=100% free play + packet.writeD(2); // if 1, Korean client + packet.writeC(0); // Gift message for inactive accounts // 152 + packet.writeC(0); // Balthus Knights, if 1 suggests premium account long lastAccess = 0; if (_activeId == -1) { @@ -179,7 +176,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - for (int i = 0; i < size; i++) { final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); @@ -187,91 +183,73 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name packet.writeD(_sessionId); // Account ID - packet.writeD(0x00); // Clan ID - packet.writeD(0x00); // Builder level - + packet.writeD(0); // Clan ID + packet.writeD(0); // Builder level packet.writeD(charInfoPackage.getSex()); // Sex packet.writeD(charInfoPackage.getRace()); // Race packet.writeD(charInfoPackage.getBaseClassId()); - packet.writeD(Config.SERVER_ID); - packet.writeD(charInfoPackage.getX()); packet.writeD(charInfoPackage.getY()); packet.writeD(charInfoPackage.getZ()); packet.writeF(charInfoPackage.getCurrentHp()); packet.writeF(charInfoPackage.getCurrentMp()); - packet.writeQ(charInfoPackage.getSp()); packet.writeQ(charInfoPackage.getExp()); packet.writeF((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel()))); packet.writeD(charInfoPackage.getLevel()); - packet.writeD(charInfoPackage.getReputation()); packet.writeD(charInfoPackage.getPkKills()); packet.writeD(charInfoPackage.getPvPKills()); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); // Ertheia - packet.writeD(0x00); // Ertheia - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); // Ertheia + packet.writeD(0); // Ertheia for (int slot : getPaperdollOrder()) { packet.writeD(charInfoPackage.getPaperdollItemId(slot)); } - for (int slot : getPaperdollOrderVisualId()) { packet.writeD(charInfoPackage.getPaperdollItemVisualId(slot)); } - packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_CHEST)); // Upper Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_LEGS)); // Lower Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_HEAD)); // Headgear enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_GLOVES)); // Gloves enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_FEET)); // Boots enchant level - packet.writeD(charInfoPackage.getHairStyle()); packet.writeD(charInfoPackage.getHairColor()); packet.writeD(charInfoPackage.getFace()); - packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); - packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption1Id() : 0); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption2Id() : 0); - // packet.writeD(charInfoPackage.getTransformId()); // Used to display Transformations - packet.writeD(0x00); // Currently on retail when you are on character select you don't see your transformation. - - packet.writeD(0x00); // Pet NpcId - packet.writeD(0x00); // Pet level - packet.writeD(0x00); // Pet Food - packet.writeD(0x00); // Pet Food Level - packet.writeF(0x00); // Current pet HP - packet.writeF(0x00); // Current pet MP - + packet.writeD(0); // Currently on retail when you are on character select you don't see your transformation. + packet.writeD(0); // Pet NpcId + packet.writeD(0); // Pet level + packet.writeD(0); // Pet Food + packet.writeD(0); // Pet Food Level + packet.writeF(0); // Current pet HP + packet.writeF(0); // Current pet MP packet.writeD(charInfoPackage.getVitalityPoints()); // Vitality packet.writeD((int) Config.RATE_VITALITY_EXP_MULTIPLIER * 100); // Vitality Percent packet.writeD(charInfoPackage.getVitalityItemsUsed()); // Remaining vitality item uses - packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0x00 : 0x01); // Char is active or not - packet.writeC(charInfoPackage.isNoble() ? 0x01 : 0x00); - packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 0x02 : 0x00); // Hero glow - packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 0x01 : 0x00); // Show hair accessory if enabled - - packet.writeD(0x00); // 235 - ban time left + packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0 : 1); // Char is active or not + packet.writeC(charInfoPackage.isNoble() ? 1 : 0); + packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 2 : 0); // Hero glow + packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 1 : 0); // Show hair accessory if enabled + packet.writeD(0); // 235 - ban time left packet.writeD((int) (charInfoPackage.getLastAccess() / 1000)); // 235 - last play time } return true; @@ -281,7 +259,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); - try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate")) { @@ -294,7 +271,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (charInfopackage != null) { characterList.add(charInfopackage); - final Player player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { @@ -308,7 +284,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return characterList; } @@ -350,7 +325,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { clan.removeClanMember(objectId, 0); } - GameClient.deleteCharByObjId(objectId); return null; } @@ -369,20 +343,16 @@ public class CharSelectionInfo implements IClientOutgoingPacket charInfopackage.setHairStyle(chardata.getInt("hairstyle")); charInfopackage.setHairColor(chardata.getInt("haircolor")); charInfopackage.setSex(chardata.getInt("sex")); - charInfopackage.setExp(chardata.getLong("exp")); charInfopackage.setSp(chardata.getLong("sp")); charInfopackage.setVitalityPoints(chardata.getInt("vitality_points")); charInfopackage.setClanId(chardata.getInt("clanid")); - charInfopackage.setRace(chardata.getInt("race")); - final int baseClassId = chardata.getInt("base_class"); final int activeClassId = chardata.getInt("classid"); charInfopackage.setX(chardata.getInt("x")); charInfopackage.setY(chardata.getInt("y")); charInfopackage.setZ(chardata.getInt("z")); - final int faction = chardata.getInt("faction"); if (faction == 1) { @@ -392,7 +362,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setEvil(); } - if (Config.MULTILANG_ENABLE) { String lang = chardata.getString("language"); @@ -402,22 +371,18 @@ public class CharSelectionInfo implements IClientOutgoingPacket } charInfopackage.setHtmlPrefix("data/lang/" + lang + "/"); } - // if is in subclass, load subclass exp, sp, level info if (baseClassId != activeClassId) { loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId); } - charInfopackage.setClassId(activeClassId); - // Get the augmentation id for equipped weapon int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); if (weaponObjId < 1) { weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); } - if (weaponObjId > 0) { try (Connection con = DatabaseFactory.getConnection(); @@ -443,7 +408,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } - // Check if the base class is set to zero and also doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly. if ((baseClassId == 0) && (activeClassId > 0)) { @@ -453,7 +417,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setBaseClassId(baseClassId); } - charInfopackage.setDeleteTimer(deletetime); charInfopackage.setLastAccess(chardata.getLong("lastAccess")); charInfopackage.setNoble(chardata.getInt("nobless") == 1); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java index 847e24db87..d59df7911a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java @@ -32,7 +32,6 @@ public class ChooseInventoryItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHOOSE_INVENTORY_ITEM.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java index 12a3940521..ac66c2fa0f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java @@ -32,7 +32,6 @@ public class ClientSetTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CLIENT_SET_TIME.writeId(packet); - packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // time in client minutes packet.writeD(6); // constant to match the server time( this determines the speed of the client clock) return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java index 43732f74fa..66a1f5e20d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java @@ -68,7 +68,6 @@ public class ConfirmDlg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CONFIRM_DLG.writeId(packet); - final SMParam[] params = _systemMessage.getParams(); packet.writeD(_systemMessage.getId()); packet.writeD(params.length); @@ -131,7 +130,6 @@ public class ConfirmDlg implements IClientOutgoingPacket } } } - packet.writeD(_time); packet.writeD(_requesterId); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index e11807bdba..63acd728ea 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -73,7 +73,6 @@ public class CreatureSay implements IClientOutgoingPacket _mask |= 0x08; } } - // Does not shows level if (sender.isGM()) { @@ -125,7 +124,6 @@ public class CreatureSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_sender == null ? 0 : _sender.getObjectId()); packet.writeD(_chatType.getClientId()); if (_senderName != null) @@ -156,7 +154,6 @@ public class CreatureSay implements IClientOutgoingPacket packet.writeS(s); } } - // Rank if ((_sender != null) && _sender.isPlayer()) { @@ -165,7 +162,6 @@ public class CreatureSay implements IClientOutgoingPacket { packet.writeC(0); // unknown clan byte } - final int rank = RankManager.getInstance().getPlayerGlobalRank(_sender.getActingPlayer()); if ((rank == 0) || (rank > 100)) { @@ -183,7 +179,6 @@ public class CreatureSay implements IClientOutgoingPacket { packet.writeC(3); } - if (clan != null) { packet.writeC(clan.getCastleId()); @@ -197,7 +192,6 @@ public class CreatureSay implements IClientOutgoingPacket { packet.writeC(0); } - return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index dfc40d995f..a307b06e4b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -38,9 +38,8 @@ public class DeleteObject implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DELETE_OBJECT.writeId(packet); - packet.writeD(_objectId); - packet.writeC(0x00); // c2 + packet.writeC(0); // c2 return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java index 982c8f3311..3b5917e55b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java @@ -50,7 +50,6 @@ public class Dice implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DICE.writeId(packet); - packet.writeD(_objectId); // object id of player packet.writeD(_itemId); // item id of dice (spade) 4625,4626,4627,4628 packet.writeD(_number); // number rolled diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 52daec99cc..609b485b51 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -57,7 +57,6 @@ public class Die implements IClientOutgoingPacket siegeClan = fort.getSiege().getAttackerClan(clan); isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan); } - // ClanHall check. if ((clan != null) && (clan.getHideoutId() > 0)) { @@ -92,12 +91,12 @@ public class Die implements IClientOutgoingPacket OutgoingPackets.DIE.writeId(packet); packet.writeD(_objectId); packet.writeQ(_flags); - packet.writeD(_isSweepable ? 0x01 : 0x00); - packet.writeD(0x00); // Feather item time. - packet.writeC(0x00); // Hide die animation. - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(_isSweepable ? 1 : 0); + packet.writeD(0); // Feather item time. + packet.writeC(0); // Hide die animation. + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java index 15404f9dee..5837faec19 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java @@ -33,7 +33,6 @@ public class DoorInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_INFO.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.getId()); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java index 54f8742a73..14d41afee7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java @@ -33,7 +33,6 @@ public class DoorStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_STATUS_UPDATE.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.isOpen() ? 0 : 1); packet.writeD(_door.getDamage()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index b12458e719..3035890956 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -40,20 +40,17 @@ public class DropItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DROP_ITEM.writeId(packet); - packet.writeD(_objectId); packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeC(_item.isStackable() ? 0x01 : 0x00); + packet.writeC(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - - packet.writeC(0x00); - // packet.writeD(0x01); if above C == true (1) then packet.readD() + packet.writeC(0); + // packet.writeD(1); if above C == true (1) then packet.readD() packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java index 631c43ba0c..99bd80d97e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java @@ -62,13 +62,12 @@ public class Earthquake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EARTHQUAKE.writeId(packet); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_intensity); packet.writeD(_duration); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 6063a54535..1a8b8ddfbb 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -59,25 +59,20 @@ public class EnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_crystal); packet.writeQ(_count); - // Guessing. // With 166 options became 3x write integers instead of shorts and enchant level moved bellow. - // Commenting until actually knowing. // for (int option : _enchantOptions) // { // packet.writeD(option); // } - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_enchantLevel); // Confirmed. - return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java index d7be9824ff..ef78a83f25 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java @@ -42,7 +42,6 @@ public class EtcStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ETC_STATUS_UPDATE.writeId(packet); - packet.writeC(_player.getCharges()); // 1-7 increase force, level packet.writeD(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%) packet.writeC(0); // Weapon Grade Penalty [1-4] diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java index 5dca90f960..9f8d576148 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java @@ -24,13 +24,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class Ex2ndPasswordAck implements IClientOutgoingPacket { + // TODO: Enum + public static final int SUCCESS = 0; + public static final int WRONG_PATTERN = 1; + private final int _status; private final int _response; - // TODO: Enum - public static final int SUCCESS = 0x00; - public static final int WRONG_PATTERN = 0x01; - public Ex2ndPasswordAck(int status, int response) { _status = status; @@ -41,10 +41,9 @@ public class Ex2ndPasswordAck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_ACK.writeId(packet); - packet.writeC(_status); - packet.writeD(_response == WRONG_PATTERN ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(_response == WRONG_PATTERN ? 1 : 0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java index 48bde5161d..c86b5185d0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordCheck implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_NEW = 0x00; - public static final int PASSWORD_PROMPT = 0x01; - public static final int PASSWORD_OK = 0x02; + public static final int PASSWORD_NEW = 0; + public static final int PASSWORD_PROMPT = 1; + public static final int PASSWORD_OK = 2; private final int _windowType; @@ -40,9 +40,8 @@ public class Ex2ndPasswordCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_CHECK.writeId(packet); - packet.writeD(_windowType); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java index 1abf50ab01..f6731bf18f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordVerify implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_OK = 0x00; - public static final int PASSWORD_WRONG = 0x01; - public static final int PASSWORD_BAN = 0x02; + public static final int PASSWORD_OK = 0; + public static final int PASSWORD_WRONG = 1; + public static final int PASSWORD_BAN = 2; private final int _wrongTentatives; private final int _mode; @@ -42,7 +42,6 @@ public class Ex2ndPasswordVerify implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_VERIFY.writeId(packet); - packet.writeD(_mode); packet.writeD(_wrongTentatives); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java index 55abf718c5..db551344ef 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java @@ -45,10 +45,8 @@ public class ExAbnormalStatusUpdateFromTarget implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ABNORMAL_STATUS_UPDATE_FROM_TARGET.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeH(_effects.size()); - for (BuffInfo info : _effects) { packet.writeD(info.getSkill().getDisplayId()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java index c4b9cd8356..f3abd6ec5c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java @@ -41,7 +41,6 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRABLE_SKILL_LIST_BY_CLASS.writeId(packet); - packet.writeH(_type.getId()); packet.writeH(_learnable.size()); for (SkillLearn skill : _learnable) @@ -54,7 +53,7 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket packet.writeC(skill.getRequiredItems().size()); if (_type == AcquireSkillType.SUBPLEDGE) { - packet.writeH(0x00); + packet.writeH(0); } } return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java index fd0e2fc97c..8555bb6e86 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java @@ -61,7 +61,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_SKILL_INFO.writeId(packet); - packet.writeD(_id); packet.writeD(_level); packet.writeQ(_spCost); @@ -73,7 +72,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket packet.writeD(holder.getId()); packet.writeQ(holder.getCount()); } - packet.writeD(_skillRem.size()); for (Skill skill : _skillRem) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java index 29793f4d6c..ff8c526ec4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java @@ -36,7 +36,6 @@ public class ExAdenaInvenCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ADENA_INVEN_COUNT.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeH(_player.getInventory().getSize()); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java index 2aa2d85bc5..5ef11e0f1e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java @@ -50,13 +50,11 @@ public class ExAirShipInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_INFO.writeId(packet); - packet.writeD(_ship.getObjectId()); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(_captain); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); @@ -73,14 +71,13 @@ public class ExAirShipInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - packet.writeD(_ship.getFuel()); packet.writeD(_ship.getMaxFuel()); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java index 4cfc76bfba..8b37f4fc0a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java @@ -42,7 +42,6 @@ public class ExAirShipStopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_airShipId); packet.writeD(_playerId); packet.writeD(_x); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java index 33c57712da..52958f931b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java @@ -37,12 +37,10 @@ public class ExAirShipTeleportList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_TELEPORT_LIST.writeId(packet); - packet.writeD(_dockId); if (_teleports != null) { packet.writeD(_teleports.length); - for (int i = 0; i < _teleports.length; i++) { packet.writeD(i - 1); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java index 392b228f0d..7918022c72 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java @@ -50,13 +50,12 @@ public class ExAlchemySkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_SKILL_LIST.writeId(packet); - packet.writeD(_skills.size()); for (Skill skill : _skills) { packet.writeD(skill.getId()); packet.writeD(skill.getLevel()); - packet.writeQ(0x00); // Always 0 on Naia, SP i guess? + packet.writeQ(0); // Always 0 on Naia, SP i guess? packet.writeC(skill.getId() == CommonSkill.ALCHEMY_CUBE.getId() ? 0 : 1); // This is type in flash, visible or not } return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java index 3d7ee12a81..1990e1e701 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java @@ -37,7 +37,6 @@ public class ExAskCoupleAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_COUPLE_ACTION.writeId(packet); - packet.writeD(_actionId); packet.writeD(_objectId); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java index 61cabedd98..45615daf5a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java @@ -39,9 +39,8 @@ public class ExAskJoinMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_MPCC.writeId(packet); - packet.writeS(_requestorName); // name of CCLeader - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java index 17fa9d028f..908022ff7e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java @@ -38,7 +38,6 @@ public class ExAskJoinPartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_PARTY_ROOM.writeId(packet); - packet.writeS(_charName); packet.writeS(_roomName); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java index 2a6b958dc9..1551840013 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java @@ -38,7 +38,6 @@ public class ExAskModifyPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_MODIFY_PARTY_LOOTING.writeId(packet); - packet.writeS(_requestor); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java index 958e7c3d06..fa62c8a207 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java @@ -45,7 +45,6 @@ public class ExAttributeEnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ATTRIBUTE_ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeC(_isWeapon); packet.writeH(_type); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java index 1a3a1ef3fe..3d65055b3c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java @@ -41,9 +41,8 @@ public class ExAutoSoulShot implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AUTO_SOUL_SHOT.writeId(packet); - packet.writeD(_itemId); - packet.writeD(_enable ? 0x01 : 0x00); + packet.writeD(_enable ? 1 : 0); packet.writeD(_type); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java index 8680c6bd7a..a8137347ec 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java @@ -37,8 +37,7 @@ public class ExBaseAttributeCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASE_ATTRIBUTE_CANCEL_RESULT.writeId(packet); - - packet.writeD(0x01); // result + packet.writeD(1); // result packet.writeD(_objId); packet.writeD(_attribute); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java index 755fbc66c8..a454d136c6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java @@ -75,7 +75,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 1149, 1150, 1151, 1152, 1153, 1154, 1155 }; - public static final int[] DEFAULT_ACTION_LIST = { 0, 1, 2, 3, @@ -147,7 +146,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 5012, 5013, 5014, 5015 }; //@formatter:on - public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST); private final int[] _actionIds; @@ -161,7 +159,6 @@ public class ExBasicActionList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASIC_ACTION_LIST.writeId(packet); - packet.writeD(_actionIds.length); for (int _actionId : _actionIds) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java index 4c4fac8c91..d32dca4d21 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java @@ -34,13 +34,14 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBeautyItemList implements IClientOutgoingPacket { - private int _colorCount; - private final BeautyData _beautyData; - private final Map> _colorData = new HashMap<>(); private static final int HAIR_TYPE = 0; private static final int FACE_TYPE = 1; private static final int COLOR_TYPE = 2; + private int _colorCount; + private final BeautyData _beautyData; + private final Map> _colorData = new HashMap<>(); + public ExBeautyItemList(Player player) { _beautyData = BeautyShopData.getInstance().getBeautyData(player.getRace(), player.getAppearance().getSexType()); @@ -60,7 +61,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BEAUTY_ITEM_LIST.writeId(packet); - packet.writeD(HAIR_TYPE); packet.writeD(_beautyData.getHairList().size()); for (BeautyItem hair : _beautyData.getHairList().values()) @@ -72,7 +72,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(hair.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(FACE_TYPE); packet.writeD(_beautyData.getFaceList().size()); for (BeautyItem face : _beautyData.getFaceList().values()) @@ -84,7 +83,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(face.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(COLOR_TYPE); packet.writeD(_colorCount); for (Entry> entry : _colorData.entrySet()) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java index 1825236886..6d4c45cb2b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java @@ -34,7 +34,6 @@ public class ExBirthdayPopup implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_BIRTH_DAY.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java index 7d2f17e697..43e525f05f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java @@ -26,6 +26,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBrBroadcastEventState implements IClientOutgoingPacket { + public static final int APRIL_FOOLS = 20090401; + public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) + public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) + public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) + public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) + private final int _eventId; private final int _eventState; private int _param0; @@ -36,12 +42,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket private String _param5; private String _param6; - public static final int APRIL_FOOLS = 20090401; - public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) - public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) - public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) - public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) - public ExBrBroadcastEventState(int eventId, int eventState) { _eventId = eventId; @@ -65,7 +65,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BROADCAST_EVENT_STATE.writeId(packet); - packet.writeD(_eventId); packet.writeD(_eventState); packet.writeD(_param0); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java index 1fd7ec663a..c0683c8797 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java @@ -44,7 +44,6 @@ public class ExBrBuffEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUFF_EVENT_STATE.writeId(packet); - packet.writeD(_type); packet.writeD(_value); packet.writeD(_state); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java index 943aae8a62..8e009d7b09 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java @@ -43,7 +43,6 @@ public class ExBrLoadEventTopRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_LOAD_EVENT_TOP_RANKERS.writeId(packet); - packet.writeD(_eventId); packet.writeD(_day); packet.writeD(_count); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java index 0a0ddf31b8..291f7a6b55 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java @@ -36,9 +36,8 @@ public class ExBrPremiumState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PREMIUM_STATE.writeId(packet); - packet.writeD(_player.getObjectId()); - packet.writeC(_player.hasPremiumStatus() || (_player.getVipTier() > 0) ? 0x01 : 0x00); + packet.writeC(_player.hasPremiumStatus() || (_player.getVipTier() > 0) ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 381dd859ad..567cfc70f9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -59,10 +59,8 @@ public class ExBuySellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x01); // Type SELL + packet.writeD(1); // Type SELL packet.writeD(_inventorySlots); - if ((_sellList != null)) { packet.writeH(_sellList.size()); @@ -74,9 +72,8 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - if ((_refundList != null) && !_refundList.isEmpty()) { packet.writeH(_refundList.size()); @@ -90,10 +87,9 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - - packet.writeC(_done ? 0x01 : 0x00); + packet.writeC(_done ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java index 2b43c0ce4b..e0ec81e0e7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java @@ -39,7 +39,6 @@ public class ExCastleState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CASTLE_STATE.writeId(packet); - packet.writeD(_castleId); packet.writeD(_castleSide.ordinal()); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java index b7f90d261b..a8196c7a83 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java @@ -52,7 +52,6 @@ public class ExChangeClientEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_CLIENT_EFFECT_INFO.writeId(packet); - packet.writeD(_type); packet.writeD(_key); packet.writeD(_value); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java index 472abc88df..eea59162ee 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java @@ -37,7 +37,6 @@ public class ExChangeNpcState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NPC_STATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java index 8cdcb4460d..45f2805517 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java @@ -49,7 +49,6 @@ public class ExChangePostState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_POST_STATE.writeId(packet); - packet.writeD(_receivedBoard ? 1 : 0); packet.writeD(_changedMsgIds.length); for (int postId : _changedMsgIds) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java index fc58ec9a2e..d765ab54e0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java @@ -35,7 +35,6 @@ public class ExChangeToAwakenedClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_TO_AWAKENED_CLASS.writeId(packet); - packet.writeD(_classId); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index f51a3eb3ae..1e9b8e9dc8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -47,7 +47,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket throw new IllegalArgumentException("Undefined Atribute item: " + stone); } _level = ElementalAttributeData.getInstance().getMaxElementLevel(_itemId); - // Register only items that can be put an attribute stone/crystal for (Item item : player.getInventory().getItems()) { @@ -62,7 +61,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_INVENTORY_ATTRIBUTE_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeQ(_count); packet.writeD(_atribute == AttributeType.FIRE ? 1 : 0); // Fire diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java index a272d85469..238882cd11 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java @@ -35,7 +35,6 @@ public class ExCloseMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java index d2ecd70952..877bca760a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java @@ -34,7 +34,6 @@ public class ExClosePartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_PARTY_ROOM.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java index 27c112776b..1d02c972b5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java @@ -54,7 +54,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLOSSEUM_FENCE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_clientState); packet.writeD(_x); @@ -62,7 +61,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_width); packet.writeD(_length); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java index 766d3619ad..b72bef93e8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java @@ -37,9 +37,8 @@ public class ExConfirmAddingContact implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AGIT_AUCTION_CMD.writeId(packet); - packet.writeS(_charName); - packet.writeD(_added ? 0x01 : 0x00); + packet.writeD(_added ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java index beded32254..c832d507ed 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameAddPlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x01); - + packet.writeD(1); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java index 5f36f730d0..847ea93e6a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java @@ -45,9 +45,7 @@ public class ExCubeGameChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java index 66abbf4b75..a2f2e61ded 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java @@ -43,12 +43,10 @@ public class ExCubeGameChangeTeam implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x05); - + packet.writeD(5); packet.writeD(_player.getObjectId()); - packet.writeD(_fromRedTeam ? 0x01 : 0x00); - packet.writeD(_fromRedTeam ? 0x00 : 0x01); + packet.writeD(_fromRedTeam ? 1 : 0); + packet.writeD(_fromRedTeam ? 0 : 1); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java index 5273b2099a..136b439283 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java @@ -39,9 +39,7 @@ public class ExCubeGameChangeTimeToStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x03); - + packet.writeD(3); packet.writeD(_seconds); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java index f81a302941..9bdba49029 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java @@ -35,7 +35,6 @@ public class ExCubeGameCloseUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0xffffffff); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java index 259a0e9407..3177e7a488 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java @@ -40,11 +40,9 @@ public class ExCubeGameEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x01); - - packet.writeD(_isRedTeamWin ? 0x01 : 0x00); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(1); + packet.writeD(_isRedTeamWin ? 1 : 0); + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java index 4d89e621ce..8b96bb545f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java @@ -55,14 +55,11 @@ public class ExCubeGameExtendedChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeD(_playerPoints); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java index e5a00f1ab7..c084789f13 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameRemovePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java index 00be884d2f..35a3f289d1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java @@ -35,8 +35,7 @@ public class ExCubeGameRequestReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x04); + packet.writeD(4); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java index 1bc89e0c32..8b755dd3cc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java @@ -30,7 +30,6 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket // Players Lists private final List _bluePlayers; private final List _redPlayers; - // Common Values private final int _roomNumber; @@ -51,12 +50,9 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_roomNumber); packet.writeD(0xffffffff); - packet.writeD(_bluePlayers.size()); for (Player player : _bluePlayers) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java index 2f2c092c08..d000112787 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java @@ -31,7 +31,6 @@ public class ExCursedWeaponList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet); - final Set ids = CursedWeaponsManager.getInstance().getCursedWeaponsIds(); packet.writeD(ids.size()); ids.forEach(packet::writeD); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java index 2f60a1b80c..5bc7ff3238 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java @@ -39,7 +39,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet); - if (!_cursedWeaponInfo.isEmpty()) { packet.writeD(_cursedWeaponInfo.size()); @@ -47,7 +46,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { packet.writeD(w.id); packet.writeD(w.activated); - packet.writeD(w.pos.getX()); packet.writeD(w.pos.getY()); packet.writeD(w.pos.getZ()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java index a0ba15da9f..8bee464fb0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java @@ -41,7 +41,6 @@ public class ExDieInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIE_INFO.writeId(packet); - packet.writeH(_droppedItems.size()); for (Item item : _droppedItems) { @@ -49,17 +48,15 @@ public class ExDieInfo implements IClientOutgoingPacket packet.writeD(item.getEnchantLevel()); packet.writeD((int) item.getCount()); } - packet.writeD(_lastDamageTaken.size()); for (DamageTakenHolder damageHolder : _lastDamageTaken) { packet.writeS(damageHolder.getCreature().getName()); - packet.writeH(0x00); + packet.writeH(0); packet.writeD(damageHolder.getSkillId()); packet.writeF(damageHolder.getDamage()); - packet.writeD(0x00); + packet.writeD(0); } - return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java index f475a02b28..0456fb9dae 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java @@ -34,7 +34,6 @@ public class ExDissmissMPCCRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DISSMISS_MPCC_ROOM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java index 258010f717..c731b7c7a9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java @@ -37,7 +37,6 @@ public class ExDuelAskStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_ASK_START.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDuel); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java index 043c82c0db..e9a31bee57 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java @@ -38,7 +38,6 @@ public class ExDuelEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_END.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java index 264409b3d6..e1fa1cea88 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java @@ -38,7 +38,6 @@ public class ExDuelReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_READY.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java index 488aafcb7d..ecdd528a16 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java @@ -38,7 +38,6 @@ public class ExDuelStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_START.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java index 7df040c5e7..5ed0c09675 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java @@ -36,7 +36,6 @@ public class ExDuelUpdateUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_UPDATE_USER_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeD(_player.getClassId().getId()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 7ab055a3d8..f58c0573a8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExEnchantSkillInfo implements IClientOutgoingPacket { private final Set _routes; - private final int _skillId; private final int _skillLevel; private final int _skillSubLevel; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 41368a8efb..e4ee350e64 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -50,7 +50,6 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_INFO_DETAIL.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java index 5cedcd6284..1d32f0d725 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java @@ -43,7 +43,6 @@ public class ExEnchantSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_LIST.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skills.size()); for (Skill skill : _skills) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java index 6ab5e869f2..853d74039f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java @@ -38,7 +38,6 @@ public class ExEnchantSkillResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_RESULT.writeId(packet); - packet.writeD(_enchanted ? 1 : 0); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java index 7b7d2d008d..410bf16510 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java @@ -42,7 +42,6 @@ public class ExEventMatchMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_EVENT_MATCH_MESSAGE.writeId(packet); - packet.writeC(_type); packet.writeS(_message); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java index 7264e90233..1946758bf5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java @@ -37,11 +37,9 @@ public class ExGetBookMarkInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOOK_MARK_INFO.writeId(packet); - - packet.writeD(0x00); // Dummy + packet.writeD(0); // Dummy packet.writeD(_player.getBookMarkSlot()); packet.writeD(_player.getTeleportBookmarks().size()); - for (TeleportBookmark tpbm : _player.getTeleportBookmarks()) { packet.writeD(tpbm.getId()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java index 36e7bb81af..201e8eb49b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java @@ -42,15 +42,14 @@ public class ExGetBossRecord implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOSS_RECORD.writeId(packet); - packet.writeD(_ranking); packet.writeD(_totalPoints); if (_bossRecordInfo == null) { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } else { @@ -59,7 +58,7 @@ public class ExGetBossRecord implements IClientOutgoingPacket { packet.writeD(entry.getKey()); packet.writeD(entry.getValue()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? } } return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java index ea0a5f8b18..85ccad0758 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java @@ -41,7 +41,6 @@ public class ExGetOffAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_OFF_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_x); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java index f8e16a4191..9a02e49223 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java @@ -39,7 +39,6 @@ public class ExGetOnAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_ON_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java index 51197344a5..704b3212a1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExGetPremiumItemList implements IClientOutgoingPacket { private final Player _player; - private final Map _map; public ExGetPremiumItemList(Player player) @@ -43,7 +42,6 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_PREMIUM_ITEM_LIST.writeId(packet); - packet.writeD(_map.size()); for (Entry entry : _map.entrySet()) { @@ -51,7 +49,7 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket packet.writeQ(entry.getKey()); packet.writeD(item.getItemId()); packet.writeQ(item.getCount()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeS(item.getSender()); } return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index 5f4810be42..34ef181b22 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -40,19 +40,18 @@ public class ExHeroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HERO_LIST.writeId(packet); - packet.writeD(_heroList.size()); for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); packet.writeD(hero.getInt(Olympiad.CLASS_ID)); packet.writeS(hero.getString(Hero.CLAN_NAME, "")); - packet.writeD(0x00); // hero.getInt(Hero.CLAN_CREST, 0) + packet.writeD(0); // hero.getInt(Hero.CLAN_CREST, 0) packet.writeS(hero.getString(Hero.ALLY_NAME, "")); - packet.writeD(0x00); // hero.getInt(Hero.ALLY_CREST, 0) + packet.writeD(0); // hero.getInt(Hero.ALLY_CREST, 0) packet.writeD(hero.getInt(Hero.COUNT)); - packet.writeD(0x00); - packet.writeC(0x00); // 272 + packet.writeD(0); + packet.writeC(0); // 272 } return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index d5b5430142..0baca7cd86 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -48,8 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); - - packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade + packet.writeC(_hide ? 0 : 1); // Grand Crusade packet.writeD(_currentTemplateId); packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java index 81db66b88f..323c0cdf1e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java @@ -35,7 +35,6 @@ public class ExIsCharNameCreatable implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_IS_CHAR_NAME_CREATABLE.writeId(packet); - packet.writeD(_allowed); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java index 6f00d41989..132003d4d8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExItemAnnounce implements IClientOutgoingPacket { - public static final int ENCHANT = 0x00; - public static final int RANDOM_CRAFT = 0x02; + public static final int ENCHANT = 0; + public static final int RANDOM_CRAFT = 2; private final Item _item; private final Player _player; @@ -48,7 +48,7 @@ public class ExItemAnnounce implements IClientOutgoingPacket packet.writeString(_player.getName()); // name of player packet.writeD(_item.getId()); // item id packet.writeD(_item.getEnchantLevel()); // enchant level - packet.writeC(0x00); // name of item + packet.writeC(0); // name of item return true; } } \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java index ecc751eab3..45def9e0be 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java @@ -38,7 +38,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { throw new NullPointerException(); } - if (currentAuction.getAuctionState() != ItemAuctionState.STARTED) { _timeRemaining = 0; @@ -47,7 +46,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { _timeRemaining = (int) (currentAuction.getFinishingTimeRemaining() / 1000); // in seconds } - _refresh = refresh; _currentAuction = currentAuction; _nextAuction = nextAuction; @@ -57,16 +55,12 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_AUCTION_INFO.writeId(packet); - - packet.writeC(_refresh ? 0x00 : 0x01); + packet.writeC(_refresh ? 0 : 1); packet.writeD(_currentAuction.getInstanceId()); - final ItemAuctionBid highestBid = _currentAuction.getHighestBid(); packet.writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid()); - packet.writeD(_timeRemaining); writeItem(packet, _currentAuction.getItemInfo()); - if (_nextAuction != null) { packet.writeQ(_nextAuction.getAuctionInitBid()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExLetterCollectorUI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExLetterCollectorUI.java index 1f6701e6dc..61e987edef 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExLetterCollectorUI.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExLetterCollectorUI.java @@ -36,7 +36,7 @@ public class ExLetterCollectorUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LETTER_COLLECTOR_UI_LAUNCHER.writeId(packet); - packet.writeC(0x01); // enabled (0x00 - no, 0x01 -yes) + packet.writeC(1); // enabled (0x00 - no, 0x01 -yes) packet.writeD(LETTER_COLLECTOR_MIN_LEVEL); // Minimum Level return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java index 53ad8abd58..1c5e38cbab 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListMpccWaiting implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _rooms = new LinkedList<>(); @@ -53,7 +54,6 @@ public class ExListMpccWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_MPCC_WAITING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 78f2fec636..eafea24fa6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _players = new LinkedList<>(); @@ -60,7 +61,6 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(packet); - packet.writeD(_size); packet.writeD(_players.size()); for (Player player : _players) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java index 786c616875..c8723a9fc0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java @@ -46,7 +46,6 @@ public class ExMPCCPartyInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCPARTY_INFO_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_LeaderOID); packet.writeD(_memberCount); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java index 4bf07f0133..08259e4e6c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java @@ -37,7 +37,6 @@ public class ExMPCCPartymasterList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_PARTYMASTER_LIST.writeId(packet); - packet.writeD(_leadersName.size()); _leadersName.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java index abbdc8fe76..f021ef5f1f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java @@ -36,7 +36,6 @@ public class ExMPCCRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java index 154e156270..2eec590cb4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java @@ -41,7 +41,6 @@ public class ExMPCCRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java index 06e3027bfc..a0e9d0a4b0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java @@ -37,7 +37,6 @@ public class ExMPCCShowPartyMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCSHOW_PARTY_MEMBER_INFO.writeId(packet); - packet.writeD(_party.getMemberCount()); for (Player pc : _party.getMembers()) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java index e454a746f3..771b2f22cb 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java @@ -49,7 +49,6 @@ public class ExMagicAttackInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAGIC_ATTACK_INFO.writeId(packet); - packet.writeD(_caster); packet.writeD(_target); packet.writeD(_type); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java index 9cfbeb5aee..1aaa5b6520 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java @@ -35,7 +35,6 @@ public class ExMailArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAIL_ARRIVED.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java index 983ff22b92..48156c0600 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java @@ -44,7 +44,6 @@ public class ExManageMpccRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MANAGE_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java index f710c006e8..9d7d14211e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java @@ -45,7 +45,6 @@ public class ExMoveToLocationAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_objId); packet.writeD(_tx); packet.writeD(_ty); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java index 3e3bdc9fed..87e44b51cd 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java @@ -43,7 +43,6 @@ public class ExMoveToLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java index 7ab0d1c7da..3c1902892a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java @@ -40,11 +40,9 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet); - packet.writeS(_channel.getLeader().getName()); - packet.writeD(0x00); // Channel loot 0 or 1 + packet.writeD(0); // Channel loot 0 or 1 packet.writeD(_channel.getMemberCount()); - packet.writeD(_channel.getParties().size()); for (Party p : _channel.getParties()) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java index 1536bd5f9b..f2a32bb6e8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java @@ -43,7 +43,6 @@ public class ExNeedToChangeName implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEED_TO_CHANGE_NAME.writeId(packet); - packet.writeD(_type); packet.writeD(_subType); packet.writeS(_name); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java index be9bec8559..d18b4606b3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java @@ -35,7 +35,6 @@ public class ExNevitAdventEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CHANNELING_EFFECT.writeId(packet); - packet.writeD(_timeLeft); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java index 3a0367c178..09f6250f51 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java @@ -35,7 +35,6 @@ public class ExNevitAdventPointInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_AGATHION_ENERGY_INFO.writeId(packet); - packet.writeD(_points); // 72 = 1%, max 7200 = 100% return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java index 88fdaae499..ef220d86de 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java @@ -37,9 +37,8 @@ public class ExNevitAdventTimeChange implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - // state 0 - pause 1 - started - packet.writeC(_paused ? 0x00 : 0x01); + packet.writeC(_paused ? 0 : 1); // left time in ms max is 16000 its 4m and state is automatically changed to quit packet.writeD(_time); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java index fccdf510cc..4025bf78fa 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java @@ -34,7 +34,6 @@ public class ExNewSkillToLearnByLevelUp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEW_SKILL_TO_LEARN_BY_LEVEL_UP.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java index 324c18a517..f2ce8614dc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java @@ -43,8 +43,7 @@ public class ExNoticePostArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTICE_POST_ARRIVED.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java index afe3719d9b..050c7ccea5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java @@ -43,8 +43,7 @@ public class ExNoticePostSent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_WRITE_POST.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java index 5d98c20b09..e0bd08d39a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java @@ -30,7 +30,6 @@ public class ExNotifyPremiumItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_PREMIUM_ITEM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java index 6cb3724448..ba3c0cfeaa 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java @@ -34,7 +34,6 @@ public class ExOlympiadMatchEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MATCH_END.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java index 264d5aa484..7ffd5ed3bd 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java @@ -55,19 +55,15 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x00); // Type 0 = Match List, 1 = Match Result - + packet.writeD(0); // Type 0 = Match List, 1 = Match Result packet.writeD(_games.size()); - packet.writeD(0x00); - + packet.writeD(0); for (OlympiadGameTask curGame : _games) { final AbstractOlympiadGame game = curGame.getGame(); if (game != null) { packet.writeD(game.getStadiumId()); // Stadium Id (Arena 1 = 0) - if (game instanceof OlympiadGameNonClassed) { packet.writeD(1); @@ -80,8 +76,7 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket { packet.writeD(0); } - - packet.writeD(curGame.isRunning() ? 0x02 : 0x01); // (1 = Standby, 2 = Playing) + packet.writeD(curGame.isRunning() ? 2 : 1); // (1 = Standby, 2 = Playing) packet.writeS(game.getPlayerNames()[0]); // Player 1 Name packet.writeS(game.getPlayerNames()[1]); // Player 2 Name } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java index 712651603d..b387271fba 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java @@ -53,9 +53,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x01); // Type 0 = Match List, 1 = Match Result - + packet.writeD(1); // Type 0 = Match List, 1 = Match Result packet.writeD(_tie ? 1 : 0); // 0 - win, 1 - tie packet.writeS(_winnerList.get(0).getName()); packet.writeD(_winTeam); @@ -69,9 +67,8 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } - packet.writeD(_loseTeam); packet.writeD(_loserList.size()); for (OlympiadInfo info : _loserList) @@ -83,7 +80,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java index 34d81d1f53..712b9e06c6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java @@ -38,7 +38,6 @@ public class ExOlympiadMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MODE.writeId(packet); - packet.writeC(_mode); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java index ebea6c56f3..5b4f2c2523 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java @@ -53,7 +53,6 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_SPELLED_INFO.writeId(packet); - packet.writeD(_playerId); packet.writeD(_effects.size() + _effects2.size()); for (BuffInfo info : _effects) @@ -62,7 +61,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(info.getSkill().getDisplayId()); packet.writeH(info.getSkill().getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(info.getSkill().getAbnormalType().getClientId()); writeOptionalD(packet, info.getSkill().isAura() ? -1 : info.getTime()); } @@ -73,7 +72,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(skill.getDisplayId()); packet.writeH(skill.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(skill.getAbnormalType().getClientId()); packet.writeH(-1); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java index 18c34fe9de..ca473edfcf 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java @@ -76,7 +76,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_USER_INFO.writeId(packet); - if (_player != null) { packet.writeC(_player.getOlympiadSide()); @@ -91,7 +90,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket packet.writeS(_par.getName()); packet.writeD(_par.getBaseClass()); } - packet.writeD(_curHp); packet.writeD(_maxHp); packet.writeD(_curCp); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java index e84d0251bd..7ec64cc8c3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java @@ -35,7 +35,6 @@ public class ExOpenMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OPEN_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java index 90349cc1a2..5661dc9f57 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java @@ -56,7 +56,6 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PCCAFE_POINT_INFO.writeId(packet); - packet.writeD(_points); // num points packet.writeD(_mAddPoint); // points inc display packet.writeC(_mPeriodType); // period(0=don't show window,1=acquisition,2=use points) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java index f7e8b4a99a..248a2f7d98 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_ADD.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java index 832bee0012..1f452f4bae 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_DELETE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_summon.getSummonType()); packet.writeD(_summon.getOwner().getObjectId()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java index 0646a67001..703694fa2f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_UPDATE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 0e3edb3ea7..e4c6b79ae0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -47,7 +47,6 @@ public class ExPartyRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java index 082f4c7662..0f72c05a3a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java @@ -34,7 +34,6 @@ public class ExPlayScene implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLAY_SCENE.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java index e98d317e14..7e3803bdaa 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java @@ -36,7 +36,6 @@ public class ExPledgeCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_COUNT.writeId(packet); - packet.writeD(_count); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java index 838029e284..4084de3481 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java @@ -38,7 +38,6 @@ public class ExPledgeDraftListSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_DRAFT_LIST_SEARCH.writeId(packet); - packet.writeD(_pledgeRecruitList.size()); for (PledgeWaitingInfo prl : _pledgeRecruitList) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java index fb956e9996..44e34004ea 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java @@ -25,11 +25,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExPledgeEmblem implements IClientOutgoingPacket { + private static final int TOTAL_SIZE = 65664; + private final int _crestId; private final int _clanId; private final byte[] _data; private final int _chunkId; - private static final int TOTAL_SIZE = 65664; public ExPledgeEmblem(int crestId, byte[] chunkedData, int clanId, int chunkId) { @@ -43,7 +44,6 @@ public class ExPledgeEmblem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clanId); packet.writeD(_crestId); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java index ed19bf976b..b32f8c0645 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitApplyInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_APPLY_INFO.writeId(packet); - packet.writeD(_status.ordinal()); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java index fc98b7b6f7..af4af9c9c1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitBoardDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_DETAIL.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClanId()); packet.writeD(_pledgeRecruitInfo.getKarma()); packet.writeS(_pledgeRecruitInfo.getInformation()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index b4d48373a6..eda808e754 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -34,7 +34,6 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket private final int _clanOnCurrentPage; private final int _startIndex; private final int _endIndex; - static final int CLAN_PER_PAGE = 12; public ExPledgeRecruitBoardSearch(List clanList, int currentPage) @@ -51,11 +50,9 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_SEARCH.writeId(packet); - packet.writeD(_currentPage); packet.writeD(_totalNumberOfPage); packet.writeD(_clanOnCurrentPage); - for (int i = _startIndex; i < _endIndex; i++) { packet.writeD(_clanList.get(i).getClanId()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 4ae5ffe316..b1f139226d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -40,7 +40,6 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java index 77080a3820..5844f220ec 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java @@ -39,7 +39,6 @@ public class ExPledgeWaitingList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST.writeId(packet); - packet.writeD(pledgePlayerRecruitInfos.size()); for (PledgeApplicantInfo recruitInfo : pledgePlayerRecruitInfos.values()) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java index a9245c1309..6b88572057 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java @@ -30,7 +30,6 @@ public class ExPledgeWaitingListAlarm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_ALARM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java index 60997b3da0..28c3967119 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java @@ -40,7 +40,6 @@ public class ExPledgeWaitingListApplied implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_APPLIED.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClan().getId()); packet.writeS(_pledgeRecruitInfo.getClan().getName()); packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java index 66a06892c2..1f53d1bb38 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java @@ -36,7 +36,6 @@ public class ExPledgeWaitingUser implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_USER.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getPlayerId()); packet.writeS(_pledgeRecruitInfo.getMessage()); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java index 49bc9b0995..5f404779f5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java @@ -43,7 +43,6 @@ public class ExPrivateStoreSetWholeMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_objectId); packet.writeS(_msg); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java index cb5e8fbce9..ff996b5d0c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutCommissionResultForVariationMake implements IClientOutgoingPac public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_COMMISSION_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_gemstoneObjId); packet.writeD(_itemId); packet.writeQ(_gemstoneCount); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java index 81721e921f..098472b7ae 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantScrollItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SCROLL_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java index 871f377db2..ffea182a49 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java index c47a4bcff4..8016e128f4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java index c8b46be499..95c0c0e4e1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_INTENSIVE_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_refinerItemObjId); packet.writeD(_lifestoneItemId); packet.writeD(_gemstoneItemId); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 2128b2b19f..2970ca00a2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -41,13 +41,12 @@ public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_CANCEL.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); packet.writeD(_itemAug1); packet.writeD(_itemAug2); packet.writeQ(_price); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java index 80541e65cd..c25dd16b01 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java @@ -34,10 +34,9 @@ public class ExPutItemResultForVariationMake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java index fe5eb74eb0..bc8896164d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java @@ -56,13 +56,12 @@ public class ExQuestNpcLogList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_NPC_LOG_LIST.writeId(packet); - packet.writeD(_questId); packet.writeC(_npcLogList.size()); for (NpcLogListHolder holder : _npcLogList) { packet.writeD(holder.isNpcString() ? holder.getId() : holder.getId() + 1000000); - packet.writeC(holder.isNpcString() ? 0x01 : 0x00); + packet.writeC(holder.isNpcString() ? 1 : 0); packet.writeD(holder.getCount()); } return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java index 62d622caff..60616b256d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java @@ -35,7 +35,6 @@ public class ExRedSky implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RED_SKY.writeId(packet); - packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java index ce40b1a792..163faff855 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java @@ -36,7 +36,6 @@ public class ExRegenMax implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REGEN_MAX.writeId(packet); - packet.writeD(1); packet.writeD(_time); packet.writeD(_tickInterval); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java index d864795cd6..a17525576b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java @@ -34,7 +34,6 @@ public class ExRemoveEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REMOVE_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 57ed88ac29..4e479e75a6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -56,7 +56,6 @@ public class ExReplyReceivedPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_RECEIVED_POST.writeId(packet); - packet.writeD(_msg.getMailType().ordinal()); // GOD if (_msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED) { @@ -76,11 +75,10 @@ public class ExReplyReceivedPost extends AbstractItemPacket } packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown packet.writeS(_msg.getSenderName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -92,9 +90,8 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeQ(_msg.getReqAdena()); packet.writeD(_msg.hasAttachments() ? 1 : 0); packet.writeD(_msg.isReturned() ? 1 : 0); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 75f6596194..ed490eae91 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -54,14 +54,12 @@ public class ExReplySentPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_SENT_POST.writeId(packet); - - packet.writeD(0x00); // GOD + packet.writeD(0); // GOD packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); packet.writeS(_msg.getReceiverName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -73,11 +71,11 @@ public class ExReplySentPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeQ(_msg.getReqAdena()); - packet.writeD(_msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(_msg.isReturned() ? 0x01 : 00); + packet.writeD(_msg.hasAttachments() ? 1 : 0); + packet.writeD(_msg.isReturned() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index cc4f7ce1d8..e6a3f9bca2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -35,7 +35,6 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java index 2634aa1cdd..60201b177f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java @@ -35,7 +35,6 @@ public class ExRequestHackShield implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REQUEST_HACK_SHIELD.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java index c51ff31d0b..75e3b3a945 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java @@ -29,13 +29,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyList implements IClientOutgoingPacket { + public static final int SHOW_FACESHAPE = 1; + public static final int SHOW_HAIRSTYLE = 0; + private final Player _player; private final int _type; private final Map _beautyItem; - public static final int SHOW_FACESHAPE = 1; - public static final int SHOW_HAIRSTYLE = 0; - public ExResponseBeautyList(Player player, int type) { _player = player; @@ -54,7 +54,6 @@ public class ExResponseBeautyList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java index ca2ed360ab..4b19201833 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java @@ -25,16 +25,15 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket { + public static final int FAILURE = 0; + public static final int SUCCESS = 1; + public static final int CHANGE = 0; + public static final int RESTORE = 1; + private final Player _player; private final int _type; private final int _result; - public static final int FAILURE = 0; - public static final int SUCCESS = 1; - - public static final int CHANGE = 0; - public static final int RESTORE = 1; - public ExResponseBeautyRegistReset(Player player, int type, int result) { _player = player; @@ -46,7 +45,6 @@ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_REGIST_RESET.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java index 0e313ef3b7..c0922cfb04 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java @@ -36,10 +36,8 @@ public class ExResponseResetList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_RESET_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); - packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java index 01fe1945ef..a230033d67 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java @@ -37,7 +37,6 @@ public class ExRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ROTATION.writeId(packet); - packet.writeD(_charId); packet.writeD(_heading); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index c58ccfc233..2646a71e77 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -36,7 +36,6 @@ public class ExRpItemLink extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RP_ITEM_LINK.writeId(packet); - writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java index 04556bbed2..f0c6eba8e9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java @@ -34,7 +34,6 @@ public class ExSearchOrc implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEARCH_ORC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index 1e06cc2a3f..7a4dced122 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -38,7 +38,6 @@ public class ExSendManorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_MANOR_LIST.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java index b63c69f37e..2c25cc8bfc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java @@ -124,7 +124,6 @@ public class ExSendUIEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_UIEVENT.writeId(packet); - packet.writeD(_objectId); packet.writeD(_type); // 0 = show, 1 = hide (there is 2 = pause and 3 = resume also but they don't work well you can only pause count down and you cannot resume it because resume hides the counter). packet.writeD(0); // unknown diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java index 4378479707..716a3e8623 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java @@ -385,16 +385,13 @@ public class ExServerPrimitive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SERVER_PRIMITIVE.writeId(packet); - packet.writeS(_name); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(65535); // has to do something with display range and angle packet.writeD(65535); // has to do something with display range and angle - packet.writeD(_points.size() + _lines.size()); - for (Point point : _points) { packet.writeC(1); // Its the type in this case Point @@ -408,7 +405,6 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(point.getY()); packet.writeD(point.getZ()); } - for (Line line : _lines) { packet.writeC(2); // Its the type in this case Line diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java index fb32e199b2..51fb91b643 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java @@ -46,7 +46,6 @@ public class ExSetCompassZoneCode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_COMPASS_ZONE_CODE.writeId(packet); - packet.writeD(_zoneType); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java index 1d0fbae3a4..34dee8bda0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java @@ -38,7 +38,6 @@ public class ExSetPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_PARTY_LOOTING.writeId(packet); - packet.writeD(_result); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java index 7b14ec8412..4e491af9d1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java @@ -34,7 +34,6 @@ public class ExShowAdventurerGuideBook implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_ADVENTURER_GUIDE_BOOK.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index 82554fdc5f..1f8df76083 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -39,7 +39,6 @@ public class ExShowAgitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AGIT_INFO.writeId(packet); - final Collection clanHalls = ClanHallData.getInstance().getClanHalls(); packet.writeD(clanHalls.size()); clanHalls.forEach(clanHall -> diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index dd11ee0150..51e6646ff5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -44,7 +44,6 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BASE_ATTRIBUTE_CANCEL_WINDOW.writeId(packet); - packet.writeD(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java index 14e55d39f3..e22345c4fd 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java @@ -25,13 +25,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExShowBeautyMenu implements IClientOutgoingPacket { - private final Player _player; - private final int _type; - // TODO: Enum public static final int MODIFY_APPEARANCE = 0; public static final int RESTORE_APPEARANCE = 1; + private final Player _player; + private final int _type; + public ExShowBeautyMenu(Player player, int type) { _player = player; @@ -42,7 +42,6 @@ public class ExShowBeautyMenu implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BEAUTY_MENU.writeId(packet); - packet.writeD(_type); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 15d011befc..b0d2b90494 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -41,7 +41,6 @@ public class ExShowCastleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CASTLE_INFO.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) @@ -65,8 +64,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } packet.writeD(castle.getTaxPercent(TaxType.BUY)); packet.writeD((int) (castle.getSiege().getSiegeDate().getTimeInMillis() / 1000)); - - packet.writeC(castle.getSiege().isInProgress() ? 0x01 : 0x00); // Grand Crusade + packet.writeC(castle.getSiege().isInProgress() ? 1 : 0); // Grand Crusade packet.writeC(castle.getSide().ordinal()); // Grand Crusade } return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java index aeb4079f3a..f9a6ebe0e7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java @@ -38,7 +38,6 @@ public class ExShowContactList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_SHOW_POST_FRIEND.writeId(packet); - packet.writeD(_contacts.size()); _contacts.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index a079ea3129..94b989b583 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -37,7 +37,6 @@ public class ExShowCropInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _crops = (nextPeriod && !manor.isManorApproved()) ? null : manor.getCropProcure(manorId, nextPeriod); } @@ -46,10 +45,9 @@ public class ExShowCropInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Crop Sales" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Crop Sales" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); + packet.writeD(0); if (_crops != null) { packet.writeD(_crops.size()); @@ -64,17 +62,17 @@ public class ExShowCropInfo implements IClientOutgoingPacket if (seed == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(seed.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(seed.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(seed.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index ebffd775d8..1f01ee7b87 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -62,10 +62,8 @@ public class ExShowCropSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getCropId()); // crop id diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index ee9fa9fd37..b625a1e4e7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -39,7 +39,6 @@ public class ExShowFortressInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_INFO.writeId(packet); - final Collection forts = FortManager.getInstance().getForts(); packet.writeD(forts.size()); for (Fort fort : forts) @@ -47,7 +46,7 @@ public class ExShowFortressInfo implements IClientOutgoingPacket final Clan clan = fort.getOwnerClan(); packet.writeD(fort.getResidenceId()); packet.writeS(clan != null ? clan.getName() : ""); - packet.writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00); + packet.writeD(fort.getSiege().isInProgress() ? 1 : 0); // Time of possession packet.writeD(fort.getOwnedTime()); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index f389b26ed5..678ab43e96 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -42,11 +42,9 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_MAP_INFO.writeId(packet); - packet.writeD(_fortress.getResidenceId()); packet.writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status packet.writeD(_fortress.getFortSize()); // barracks count - final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId()); if ((commanders != null) && !commanders.isEmpty() && _fortress.getSiege().isInProgress()) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 27da99cf41..da186103ae 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -51,7 +51,6 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_SIEGE_INFO.writeId(packet); - packet.writeD(_fortId); // Fortress Id packet.writeD(_size); // Total Barracks Count if (_csize > 0) @@ -64,22 +63,22 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { case 0: { - packet.writeD(0x03); + packet.writeD(3); break; } case 1: { - packet.writeD(0x02); + packet.writeD(2); break; } case 2: { - packet.writeD(0x01); + packet.writeD(1); break; } case 3: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -92,27 +91,27 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket // TODO: once control room supported, update packet.writeD(0x0x) to support 5th room case 0: { - packet.writeD(0x05); + packet.writeD(5); break; } case 1: { - packet.writeD(0x04); + packet.writeD(4); break; } case 2: { - packet.writeD(0x03); + packet.writeD(3); break; } case 3: { - packet.writeD(0x02); + packet.writeD(2); break; } case 4: { - packet.writeD(0x01); + packet.writeD(1); break; } } @@ -124,7 +123,7 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { for (int i = 0; i < _size; i++) { - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java index f7aca7dffd..912839e242 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java @@ -41,8 +41,7 @@ public class ExShowManorDefaultInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_MANOR_DEFAULT_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" and "Crop Sales" buttons + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" and "Crop Sales" buttons packet.writeD(_crops.size()); for (Seed crop : _crops) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 1d3312d668..d03ce2a5fd 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -52,10 +52,8 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet); - packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java index cf38d18c1c..f41999329f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java @@ -34,7 +34,6 @@ public class ExShowQuestInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_INFO.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java index 70f31e318f..0fa64c401d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java @@ -37,7 +37,6 @@ public class ExShowQuestMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_MARK.writeId(packet); - packet.writeD(_questId); packet.writeD(_questState); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index ab85228caf..1a6ee00a10 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ExShowReceivedPostList implements IClientOutgoingPacket { - private final List _inbox; - private static final int MESSAGE_FEE = 100; private static final int MESSAGE_FEE_PER_SLOT = 1000; + private final List _inbox; + public ExShowReceivedPostList(int objectId) { _inbox = MailManager.getInstance().getInbox(objectId); @@ -45,7 +45,6 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { @@ -64,18 +63,18 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getSenderName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); + packet.writeD(msg.isUnread() ? 1 : 0); packet.writeD(((msg.getMailType() == MailType.COMMISSION_ITEM_SOLD) || (msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED)) ? 0 : 1); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(msg.isReturned() ? 0x01 : 0x00); - packet.writeD(0x00); // SysString in some case it seems + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(msg.isReturned() ? 1 : 0); + packet.writeD(0); // SysString in some case it seems } } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(MESSAGE_FEE); packet.writeD(MESSAGE_FEE_PER_SLOT); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java index 9679468789..deebb99c8f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java @@ -33,6 +33,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; */ public class ExShowScreenMessage implements IClientOutgoingPacket { + // Positions + public static final byte TOP_LEFT = 1; + public static final byte TOP_CENTER = 2; + public static final byte TOP_RIGHT = 3; + public static final byte MIDDLE_LEFT = 4; + public static final byte MIDDLE_CENTER = 5; + public static final byte MIDDLE_RIGHT = 6; + public static final byte BOTTOM_CENTER = 7; + public static final byte BOTTOM_RIGHT = 8; + private final int _type; private final int _sysMessageId; private final int _unk1; @@ -48,15 +58,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket private List _parameters; // Localisation related. private String _lang; - // Positions - public static final byte TOP_LEFT = 0x01; - public static final byte TOP_CENTER = 0x02; - public static final byte TOP_RIGHT = 0x03; - public static final byte MIDDLE_LEFT = 0x04; - public static final byte MIDDLE_CENTER = 0x05; - public static final byte MIDDLE_RIGHT = 0x06; - public static final byte BOTTOM_CENTER = 0x07; - public static final byte BOTTOM_RIGHT = 0x08; public void setLang(String lang) { @@ -265,7 +266,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SCREEN_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -284,9 +284,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(sml.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -308,9 +308,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -318,7 +318,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket } } } - packet.writeD(_type); packet.writeD(_sysMessageId); packet.writeD(_position); @@ -326,9 +325,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java index 29ab5d355f..6123b08991 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java @@ -37,7 +37,6 @@ public class ExShowSeedInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _seeds = (nextPeriod && !manor.isManorApproved()) ? null : manor.getSeedProduction(manorId, nextPeriod); } @@ -46,16 +45,14 @@ public class ExShowSeedInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown if (_seeds == null) { packet.writeD(0); return true; } - packet.writeD(_seeds.size()); for (SeedProduction seed : _seeds) { @@ -67,17 +64,17 @@ public class ExShowSeedInfo implements IClientOutgoingPacket if (s == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(s.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(s.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(s.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java index e628099700..eb6e686e10 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java @@ -32,13 +32,10 @@ public class ExShowSeedMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_MAP_INFO.writeId(packet); - packet.writeD(2); // seed count - // Seed of Destruction packet.writeD(1); // id 1? Grand Crusade packet.writeD(2770 + GraciaSeedsManager.getInstance().getSoDState()); // sys msg id - // Seed of Infinity packet.writeD(2); // id 2? Grand Crusade // Manager not implemented yet diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index 4fd891a466..373c314eba 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -62,10 +62,8 @@ public class ExShowSeedSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getSeedId()); // seed id diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 1994402da2..269bec5b97 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -47,7 +47,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _cropsItems.put(cropId, item); } } - for (CropProcure crop : CastleManorManager.getInstance().getCropProcure(_manorId, false)) { if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) @@ -61,7 +60,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_cropsItems.size()); // size for (Item item : _cropsItems.values()) @@ -70,9 +68,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket packet.writeD(item.getObjectId()); // Object id packet.writeD(item.getId()); // crop id packet.writeD(seed.getLevel()); // seed level - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(1)); // reward 1 id - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(2)); // reward 2 id if (_castleCrops.containsKey(item.getId())) { @@ -85,9 +83,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket else { packet.writeD(0xFFFFFFFF); // manor - packet.writeQ(0x00); // buy residual - packet.writeQ(0x00); // buy price - packet.writeC(0x00); // reward + packet.writeQ(0); // buy residual + packet.writeQ(0); // buy price + packet.writeC(0); // reward } packet.writeQ(item.getCount()); // my crops } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index db4bccc928..b61d5b2301 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -40,7 +40,6 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { @@ -50,17 +49,17 @@ public class ExShowSentPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getReceiverName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); - packet.writeD(0x01); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(msg.isUnread() ? 1 : 0); + packet.writeD(1); + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(0); } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java index 0e4e9fd2ef..0dca57f2f8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java @@ -48,7 +48,6 @@ public class ExShowTerritory implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TERRITORY.writeId(packet); - packet.writeD(_vertices.size()); packet.writeD(_minZ); packet.writeD(_maxZ); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java index 4e284f82c5..86e1009bbf 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java @@ -46,7 +46,6 @@ public class ExShowTrace implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TRACE.writeId(packet); - packet.writeH(0); // type broken in H5 packet.writeD(0); // time broken in H5 packet.writeH(_locations.size()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java index 3245767ed7..836a5c9624 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java @@ -44,7 +44,6 @@ public class ExShowUsm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_USM.writeId(packet); - packet.writeD(_videoId); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java index 4acdffa842..1f1a14c31b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java @@ -34,7 +34,6 @@ public class ExShowVariationCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_CANCEL_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java index 3a2298019e..9870424e26 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java @@ -35,7 +35,6 @@ public class ExShowVariationMakeWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_MAKE_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java index 169827bab3..86211c8d97 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java @@ -44,10 +44,9 @@ public class ExSpawnEmitter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SPAWN_EMITTER.writeId(packet); - packet.writeD(_npcObjectId); packet.writeD(_playerObjectId); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java index 620800c1c4..534549b4fe 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java @@ -36,7 +36,6 @@ public class ExStartScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_START_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java index 0bd990cf34..babac59129 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java index 0e2689d598..d3e67afe99 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipObjId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java index 44b064113f..f5b3e1340f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java @@ -36,7 +36,6 @@ public class ExStopScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index 8029930c9a..367ac79be4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -66,7 +66,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket } OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet); - packet.writeD(_inventory); packet.writeD(_warehouse); // packet.writeD(_freight); // Removed with 152. diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java index 3293a5b557..57563ca2f9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java @@ -39,7 +39,6 @@ public class ExSubPledgeSkillAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUB_PLEDGET_SKILL_ADD.writeId(packet); - packet.writeD(_type); packet.writeD(_skillId); packet.writeD(_skillLevel); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java index d61dfa20ab..816d6f16a6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java @@ -97,7 +97,6 @@ public class ExSubjobInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUBJOB_INFO.writeId(packet); - packet.writeC(_type); packet.writeD(_currClassId); packet.writeD(_currRace); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java index 85616016c7..b7a152629d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java @@ -38,7 +38,6 @@ public class ExTacticalSign implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TACTICAL_SIGN.writeId(packet); - packet.writeD(_target.getObjectId()); packet.writeD(_tokenId); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java index 3486e6281d..9e03a8bd0a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java @@ -39,7 +39,6 @@ public class ExTeleportToLocationActivate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_TO_LOCATION_ACTIVATE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java index a214c53a0f..7bcddd964d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java @@ -27,6 +27,7 @@ public class ExUISetting implements IClientOutgoingPacket { public static final String UI_KEY_MAPPING_VAR = "UI_KEY_MAPPING"; public static final String SPLIT_VAR = " "; + private final byte[] _uiKeyMapping; public ExUISetting(Player player) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java index 187770cfc8..eff4285a8b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java @@ -37,7 +37,6 @@ public class ExUnReadMailCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_UN_READ_MAIL_COUNT.writeId(packet); - packet.writeD(_mailUnreadCount); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java index f992b3c937..e59c651371 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java @@ -41,7 +41,6 @@ public class ExUseSharedGroupItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USE_SHARED_GROUP_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeD(_grpId); packet.writeD(_remainingTime); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java index 2b35f4fed1..53f6aa83de 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java @@ -40,7 +40,6 @@ public class ExUserBoostStat implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_BOOST_STAT.writeId(packet); - int count = 0; int bonus = 0; switch (_type) @@ -68,11 +67,9 @@ public class ExUserBoostStat implements IClientOutgoingPacket break; } } - packet.writeC(_type.getId()); packet.writeC(count); packet.writeH(bonus); - return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java index 474fcc5208..f49d451587 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class ExUserInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getTransformationId()); - final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); final boolean isInvisible = _player.isInvisible(); packet.writeD(abnormalVisualEffects.size() + (isInvisible ? 1 : 0)); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java index b841449ab3..1069a64e3e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java @@ -36,12 +36,9 @@ public class ExUserInfoCubic implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_CUBIC.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(_player.getCubics().size()); - _player.getCubics().keySet().forEach(packet::writeH); - packet.writeD(_player.getAgathionId()); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java index 3e4afb995b..6ef31d6117 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java @@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExUserInfoEquipSlot extends AbstractMaskPacket { private final Player _player; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -66,11 +65,9 @@ public class ExUserInfoEquipSlot extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_EQUIP_SLOT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(InventorySlot.values().length); // 152 packet.writeB(_masks); - final PlayerInventory inventory = _player.getInventory(); for (InventorySlot slot : InventorySlot.values()) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java index 3eb1cf9578..d655e48843 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java @@ -36,7 +36,6 @@ public class ExUserInfoInvenWeight implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_INVEN_WEIGHT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java index 91e0e92338..16aa81e9c0 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java @@ -44,7 +44,6 @@ public class ExValidateLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java index 727267c9d5..50cb4025e4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java @@ -35,7 +35,6 @@ public class ExVariationCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_CANCEL_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java index 5cdc1b8d0e..4fde190ae2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java @@ -32,14 +32,13 @@ public class ExVariationResult implements IClientOutgoingPacket { _option1 = option1; _option2 = option2; - _success = success ? 0x01 : 0x00; + _success = success ? 1 : 0; } @Override public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_RESULT.writeId(packet); - packet.writeD(_option1); packet.writeD(_option2); packet.writeD(_success); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java index db0acfd5ff..60fb57c0b3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java @@ -41,10 +41,9 @@ public class ExVitalityEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_EFFECT_INFO.writeId(packet); - packet.writeD(_points); packet.writeD(_vitalityBonus); // Vitality Bonus - packet.writeH(0x00); // Vitality additional bonus in % + packet.writeH(0); // Vitality additional bonus in % packet.writeH(_vitalityItemsRemaining); // How much vitality items remaining for use packet.writeH(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java index 71baff96ea..c4c5539ca4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java @@ -45,7 +45,6 @@ public class ExVoteSystemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VOTE_SYSTEM_INFO.writeId(packet); - packet.writeD(_recomLeft); packet.writeD(_recomHave); packet.writeD(_bonusTime); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java index bc41adf7f2..8abcfc022e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java @@ -37,7 +37,6 @@ public class ExWorldChatCnt implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_WORLD_CHAT_CNT.writeId(packet); - packet.writeD(_points); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java index 5f935fe0dc..dc9c2288f8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java @@ -79,19 +79,17 @@ public class FakePlayerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // vehicleId + packet.writeD(0); // vehicleId packet.writeD(_objId); packet.writeS(_npc.getName()); - packet.writeH(_npc.getRace().ordinal()); - packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 0x01 : 0x00); + packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 1 : 0); packet.writeD(_fpcHolder.getClassId()); - - packet.writeD(0x00); // Inventory.PAPERDOLL_UNDER + packet.writeD(0); // Inventory.PAPERDOLL_UNDER packet.writeD(_fpcHolder.getEquipHead()); packet.writeD(_fpcHolder.getEquipRHand()); packet.writeD(_fpcHolder.getEquipLHand()); @@ -103,28 +101,22 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_fpcHolder.getEquipRHand()); // dual hand packet.writeD(_fpcHolder.getEquipHair()); packet.writeD(_fpcHolder.getEquipHair2()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderAugument()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } - packet.writeC(_fpcHolder.getArmorEnchantLevel()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderVisualId()) { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeC(_npc.getScriptValue()); // getPvpFlag() packet.writeD(_npc.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -135,16 +127,12 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_npc.getCollisionRadius()); packet.writeF(_npc.getCollisionHeight()); - packet.writeD(_fpcHolder.getHair()); packet.writeD(_fpcHolder.getHairColor()); packet.writeD(_fpcHolder.getFace()); - packet.writeS(_npc.getTemplate().getTitle()); - if (_clan != null) { packet.writeD(_clan.getId()); @@ -154,71 +142,51 @@ public class FakePlayerInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - - packet.writeC(0x01); // isSitting() ? 0x00 : 0x01 (at some initial tests it worked) - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); - packet.writeC(_npc.isInCombat() ? 0x01 : 0x00); - - packet.writeC(_npc.isAlikeDead() ? 0x01 : 0x00); - - packet.writeC(_npc.isInvisible() ? 0x01 : 0x00); - - packet.writeC(0x00); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount - packet.writeC(0x00); // getPrivateStoreType().getId() - - packet.writeH(0x00); // getCubics().size() + packet.writeC(1); // isSitting() ? 0 : 1 (at some initial tests it worked) + packet.writeC(_npc.isRunning() ? 1 : 0); + packet.writeC(_npc.isInCombat() ? 1 : 0); + packet.writeC(_npc.isAlikeDead() ? 1 : 0); + packet.writeC(_npc.isInvisible() ? 1 : 0); + packet.writeC(0); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount + packet.writeC(0); // getPrivateStoreType().getId() + packet.writeH(0); // getCubics().size() // getCubics().keySet().forEach(packet::writeH); - packet.writeC(0x00); - + packet.writeC(0); packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : 0); packet.writeH(_fpcHolder.getRecommends()); - packet.writeD(0x00); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 - + packet.writeD(0); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 packet.writeD(_fpcHolder.getClassId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(_fpcHolder.getWeaponEnchantLevel()); // isMounted() ? 0 : _enchantLevel - packet.writeC(_npc.getTeam().getId()); - - packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0x00); + packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0); packet.writeC(_fpcHolder.getNobleLevel()); - packet.writeC(_fpcHolder.isHero() ? 0x01 : 0x00); - - packet.writeC(_fpcHolder.isFishing() ? 0x01 : 0x00); - + packet.writeC(_fpcHolder.isHero() ? 1 : 0); + packet.writeC(_fpcHolder.isFishing() ? 1 : 0); packet.writeD(_fpcHolder.getBaitLocationX()); packet.writeD(_fpcHolder.getBaitLocationY()); packet.writeD(_fpcHolder.getBaitLocationZ()); - packet.writeD(_fpcHolder.getNameColor()); - packet.writeD(_heading); - packet.writeC(_fpcHolder.getPledgeStatus()); - packet.writeH(0x00); // getPledgeType() - + packet.writeH(0); // getPledgeType() packet.writeD(_fpcHolder.getTitleColor()); - - packet.writeC(0x00); // isCursedWeaponEquipped - - packet.writeD(0x00); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 - packet.writeD(0x00); // getTransformationDisplayId() + packet.writeC(0); // isCursedWeaponEquipped + packet.writeD(0); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 + packet.writeD(0); // getTransformationDisplayId() packet.writeD(_fpcHolder.getAgathionId()); - - packet.writeC(0x00); - - packet.writeD(0x00); // getCurrentCp() + packet.writeC(0); + packet.writeD(0); // getCurrentCp() packet.writeD(_npc.getMaxHp()); packet.writeD((int) Math.round(_npc.getCurrentHp())); packet.writeD(_npc.getMaxMp()); packet.writeD((int) Math.round(_npc.getCurrentMp())); - - packet.writeC(0x00); + packet.writeC(0); final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) @@ -229,9 +197,9 @@ public class FakePlayerInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(0x00); // cocPlayer.getPosition() - packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 0x01 : 0x00); - packet.writeC(0x00); // Used Ability Points + packet.writeC(0); // cocPlayer.getPosition() + packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 1 : 0); + packet.writeC(0); // Used Ability Points return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java index ae088538da..03223c8a3e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java @@ -62,7 +62,6 @@ public class FlyToLocation implements IClientOutgoingPacket _destY = destY; _destZ = destZ; _type = type; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -82,7 +81,6 @@ public class FlyToLocation implements IClientOutgoingPacket _flySpeed = flySpeed; _flyDelay = flyDelay; _animationSpeed = animationSpeed; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -103,7 +101,6 @@ public class FlyToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FLY_TO_LOCATION.writeId(packet); - packet.writeD(_chaObjId); packet.writeD(_destX); packet.writeD(_destY); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java index 1e52b0ef72..471d70f791 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java @@ -35,8 +35,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x01); + packet.writeC(1); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index ef1d37297e..2ee6ffbcd9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -50,25 +50,24 @@ public class GMHennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GMHENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON packet.writeH(_player.getHennaValue(BaseStat.MEN)); // equip MEN packet.writeH(_player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeH(_player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeH(0x00); // equip LUC - packet.writeH(0x00); // equip CHA + packet.writeH(0); // equip LUC + packet.writeH(0); // equip CHA packet.writeD(3); // Slots packet.writeD(_hennas.size()); // Size for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java index 38ca4c7be0..59bf0d9d93 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java @@ -38,7 +38,6 @@ public class GMHide implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_HIDE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index cd876896af..c2f0803303 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -50,7 +50,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -69,8 +68,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getINT()); packet.writeD(_player.getWIT()); packet.writeD(_player.getMEN()); - packet.writeD(0x00); // LUC - packet.writeD(0x00); // CHA + packet.writeD(0); // LUC + packet.writeD(0); // CHA packet.writeD(_player.getMaxHp()); packet.writeD((int) _player.getCurrentHp()); packet.writeD(_player.getMaxMp()); @@ -79,28 +78,24 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); packet.writeD(_player.getPkKills()); - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollObjectId(slot)); } - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); } - for (int slot = 0; slot < 11; slot++) { final VariationInstance augment = _player.getInventory().getPaperdollAugmentation(slot); packet.writeD(augment != null ? augment.getOption1Id() : 0); // Confirmed packet.writeD(augment != null ? augment.getOption2Id() : 0); // Confirmed } - packet.writeC(_player.getInventory().getTalismanSlots()); // CT2.3 packet.writeC(_player.getInventory().canEquipCloak() ? 1 : 0); // CT2.3 - packet.writeD(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeH(0); packet.writeD(_player.getPAtk()); packet.writeD(_player.getPAtkSpd()); packet.writeD(_player.getPDef()); @@ -108,18 +103,14 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAccuracy()); packet.writeD(_player.getCriticalHit()); packet.writeD(_player.getMAtk()); - packet.writeD(_player.getMAtkSpd()); packet.writeD(_player.getPAtkSpd()); - packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicEvasionRate()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name packet.writeD(_player.getReputation()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -135,8 +126,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeD(_player.isGM() ? 0x01 : 0x00); // builder level - + packet.writeD(_player.isGM() ? 1 : 0); // builder level packet.writeS(_player.getTitle()); packet.writeD(_player.getClanId()); // pledge id packet.writeD(_player.getClanCrestId()); // pledge crest id @@ -146,26 +136,19 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeC(_player.hasDwarvenCraft() ? 1 : 0); packet.writeD(_player.getPkKills()); packet.writeD(_player.getPvpKills()); - packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); - - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeC(321); - packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window - - packet.writeC(_player.isNoble() ? 0x01 : 0x00); - packet.writeC(_player.isHero() ? 0x01 : 0x00); - + packet.writeC(_player.isNoble() ? 1 : 0); + packet.writeC(_player.isHero() ? 1 : 0); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); - final AttributeType attackAttribute = _player.getAttackElement(); packet.writeH(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); @@ -175,8 +158,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket } packet.writeD(_player.getFame()); packet.writeD(_player.getVitalityPoints()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index 1d88596096..552b6e6168 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -37,14 +37,12 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_player.getName()); packet.writeD(_clan.getId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); @@ -52,15 +50,14 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 packet.writeD(_clan.getAllyCrestId()); // c2 packet.writeD(_clan.isAtWar() ? 1 : 0); // c3 - packet.writeD(0x00); // T3 Unknown - + packet.writeD(0); // T3 Unknown packet.writeD(_clan.getMembers().size()); for (ClanMember member : _clan.getMembers()) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java index 93af10e254..3c155ff816 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -38,10 +38,8 @@ public class GMViewSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_SKILL_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_skills.size()); - final boolean isDisabled = (_player.getClan() != null) && (_player.getClan().getReputationScore() < 0); for (Skill skill : _skills) { @@ -49,7 +47,7 @@ public class GMViewSkillInfo implements IClientOutgoingPacket packet.writeH(skill.getDisplayLevel()); packet.writeH(skill.getSubLevel()); packet.writeD(skill.getDisplayId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(isDisabled && skill.isClanSkill() ? 1 : 0); packet.writeC(skill.isEnchantable() ? 1 : 0); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index f49138fafe..c909d5e6e1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -51,7 +51,6 @@ public class GMViewWarehouseWithdrawList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_WAREHOUSE_WITHDRAW_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java index d8c273f914..449271993b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java @@ -35,7 +35,6 @@ public class GameGuardQuery implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GAME_GUARD_QUERY.writeId(packet); - packet.writeD(0x27533DD9); packet.writeD(0x2E72A51D); packet.writeD(0x2017038B); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index b0c011b696..037b2e6b6b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -35,10 +35,8 @@ public class GetItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ITEM.writeId(packet); - packet.writeD(_playerId); packet.writeD(_item.getObjectId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java index f8c6126c87..5f4d7bf3ca 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java @@ -50,7 +50,6 @@ public class GetOffVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_OFF_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_x); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java index ffa8d5f310..77d1e6ba28 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java @@ -45,7 +45,6 @@ public class GetOnVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ON_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java index e5dcb9ded6..b1f5b588f9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java @@ -44,14 +44,13 @@ public class GmViewQuestInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_QUEST_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeH(_questList.size()); // quest count - for (Quest quest : _questList) { final QuestState qs = _player.getQuestState(quest.getName()); packet.writeD(quest.getId()); packet.writeD(qs == null ? 0 : qs.getCond()); } - packet.writeH(0x00); // some size + packet.writeH(0); // some size // for size; ddQQ return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 7e0614b359..3283ac802a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -51,7 +51,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeQ(_player.getAdena()); // activeChar current amount of Adena packet.writeD(3); // available equip slot packet.writeD(_hennaEquipList.size()); - for (Henna henna : _hennaEquipList) { // Player must have at least one dye in inventory @@ -62,8 +61,8 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); // item Id of the dye packet.writeQ(henna.getWearCount()); // amount of dyes required packet.writeQ(henna.getWearFee()); // amount of Adena required - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not - // packet.writeD(0x00); // Does not exist in Classic. + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // meet the requirement or not + // packet.writeD(0); // Does not exist in Classic. } } return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 0e6e64c7b2..23364ad722 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -50,25 +50,24 @@ public class HennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON packet.writeH(_player.getHennaValue(BaseStat.MEN)); // equip MEN packet.writeH(_player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeH(_player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeH(0x00); // equip LUC - packet.writeH(0x00); // equip CHA + packet.writeH(0); // equip LUC + packet.writeH(0); // equip CHA packet.writeD(3 - _player.getHennaEmptySlots()); // Slots packet.writeD(_hennas.size()); // Size for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); } - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 658087380a..9a22f0a564 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -40,12 +40,11 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_ITEM_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getWearCount()); // total amount of dye require packet.writeQ(_henna.getWearFee()); // total amount of Adena require to draw symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to draw or not 0 is false and 1 is true + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to draw or not 0 is false and 1 is true packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() + _player.getHennaValue(BaseStat.INT)); // equip INT @@ -59,7 +58,7 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket packet.writeH(_player.getDEX() + _player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeD(_player.getWIT()); // current WIT packet.writeH(_player.getWIT() + _player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 3800940bac..162812f30b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -40,12 +40,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getCancelCount()); // total amount of dye require packet.writeQ(_henna.getCancelFee()); // total amount of Adena require to remove symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to remove or not + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to remove or not packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() - _player.getHennaValue(BaseStat.INT)); // equip INT @@ -59,11 +58,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket packet.writeH(_player.getDEX() - _player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeD(_player.getWIT()); // current WIT packet.writeH(_player.getWIT() - _player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeD(0x00); // current LUC - packet.writeH(0x00); // equip LUC - packet.writeD(0x00); // current CHA - packet.writeH(0x00); // equip CHA - packet.writeD(0x00); + packet.writeD(0); // current LUC + packet.writeH(0); // equip LUC + packet.writeD(0); // current CHA + packet.writeH(0); // equip CHA + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 3a780986a0..d9f092b327 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -37,11 +37,9 @@ public class HennaRemoveList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); - packet.writeD(0x03); // seems to be max size + packet.writeD(3); // seems to be max size packet.writeD(3 - _player.getHennaEmptySlots()); - for (Henna henna : _player.getHennaList()) { if (henna != null) @@ -50,7 +48,7 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); packet.writeQ(henna.getCancelCount()); packet.writeQ(henna.getCancelFee()); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index b5c8628b50..f2a9cf1822 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -89,14 +89,12 @@ public interface IClientOutgoingPacket extends IOutgoingPacket Inventory.PAPERDOLL_ARTIFACT20, Inventory.PAPERDOLL_ARTIFACT21, }; - int[] PAPERDOLL_ORDER_AUGMENT = new int[] { Inventory.PAPERDOLL_RHAND, Inventory.PAPERDOLL_LHAND, Inventory.PAPERDOLL_RHAND }; - int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 0c54e810f0..3378827f34 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -46,7 +46,6 @@ public class InventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index c4598a72e6..cef69ecb6f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -59,8 +59,8 @@ public class ItemList extends AbstractItemPacket } else { - packet.writeC(0x01); // _showWindow ? 0x01 : 0x00 - packet.writeD(0x00); + packet.writeC(1); // _showWindow ? 1 : 0 + packet.writeD(0); packet.writeD(_items.size()); } writeInventoryBlock(packet, _player.getInventory()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java index b32b4df4a3..c3b9918230 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java @@ -32,9 +32,8 @@ public class JoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PARTY.writeId(packet); - packet.writeD(_response); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java index 65e06efeb7..f347f7efcd 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java @@ -32,7 +32,6 @@ public class JoinPledge implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PLEDGE.writeId(packet); - packet.writeD(_pledgeId); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index ae9fff536d..407e46a895 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -35,17 +35,16 @@ public class KeyPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VERSION_CHECK.writeId(packet); - packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok for (int i = 0; i < 8; i++) { packet.writeC(_key[i]); // key } - packet.writeD(0x01); + packet.writeD(1); packet.writeD(Config.SERVER_ID); // server id - packet.writeC(0x01); - packet.writeD(0x00); // obfuscation key - packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 0x04 : 0x00); // isClassic + packet.writeC(1); + packet.writeD(0); // obfuscation key + packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 4 : 0); // isClassic return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java index 484c10f0c4..62424fd03a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java @@ -40,7 +40,6 @@ public class L2FriendSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_SAY.writeId(packet); - packet.writeD(0); // ?? packet.writeS(_receiver); packet.writeS(_sender); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java index b875edb772..790d599b5b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java @@ -32,11 +32,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ListPartyWaiting implements IClientOutgoingPacket { + private static final int NUM_PER_PAGE = 64; + private final List _rooms = new LinkedList<>(); private final int _size; - private static final int NUM_PER_PAGE = 64; - public ListPartyWaiting(PartyMatchingRoomLevelType type, int location, int page, int requestorLevel) { final List rooms = MatchingRoomManager.getInstance().getPartyMathchingRooms(location, type, requestorLevel); @@ -57,7 +57,6 @@ public class ListPartyWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_PARTY_WATING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java index 4f8f9adc64..bb0ac61dbd 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java @@ -54,7 +54,6 @@ public class LoginFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LOGIN_FAIL.writeId(packet); - packet.writeD(_success); packet.writeD(_reason); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java index 18a522c315..6743e3e66f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java @@ -32,7 +32,6 @@ public class MagicSkillCanceld implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_CANCELED.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java index d56de10079..7ab29cc1a8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java @@ -66,7 +66,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // MagicSkillUse castingType packet.writeD(_objectId); packet.writeD(_skillId); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java index 1dbf929e1c..37ad6bd5cc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java @@ -84,7 +84,6 @@ public class MagicSkillUse implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_USE.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // Casting bar type: 0 - default, 1 - default up, 2 - blue, 3 - green, 4 - red. packet.writeD(_creature.getObjectId()); packet.writeD(_target.getObjectId()); @@ -111,7 +110,7 @@ public class MagicSkillUse implements IClientOutgoingPacket packet.writeD(_target.getX()); packet.writeD(_target.getY()); packet.writeD(_target.getZ()); - packet.writeD(_actionId >= 0 ? 0x01 : 0x00); // 1 when ID from RequestActionUse is used + packet.writeD(_actionId >= 0 ? 1 : 0); // 1 when ID from RequestActionUse is used packet.writeD(_actionId >= 0 ? _actionId : 0); // ID from RequestActionUse. Used to set cooldown on summon skills. packet.writeD(-1); // 306 return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java index 6b710c692e..12e2488f24 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java @@ -37,11 +37,9 @@ public class ManagePledgePower implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet); - packet.writeD(_rank); packet.writeD(_action); packet.writeD(_clan.getRankPrivs(_rank).getBitmask()); - return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 95f4b6f201..4e2ab3f00b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -42,11 +42,9 @@ public class MonRaceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MON_RACE_INFO.writeId(packet); - packet.writeD(_unknown1); packet.writeD(_unknown2); - packet.writeD(0x08); - + packet.writeD(8); for (int i = 0; i < 8; i++) { packet.writeD(_monsters[i].getObjectId()); // npcObjectID @@ -68,7 +66,7 @@ public class MonRaceInfo implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java index 0093b3edc9..e6386921ff 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java @@ -45,13 +45,10 @@ public class MoveToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_xDst); packet.writeD(_yDst); packet.writeD(_zDst); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java index b1fb3ea003..59103c6c4c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java @@ -48,7 +48,6 @@ public class MoveToLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java index 30ff3c96af..aa261f924f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java @@ -50,11 +50,9 @@ public class MoveToPawn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_PAWN.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetId); packet.writeD(_distance); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index 00d7618d34..f94917d93d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -58,18 +58,16 @@ public class MultiSellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.MULTI_SELL_LIST.writeId(packet); - - packet.writeC(0x00); // Helios + packet.writeC(0); // Helios packet.writeD(_list.getId()); // list id - packet.writeC(0x00); // GOD Unknown + packet.writeC(0); // GOD Unknown packet.writeD(1 + (_index / PAGE_SIZE)); // page started from 1 - packet.writeD(_finished ? 0x01 : 0x00); // finished + packet.writeD(_finished ? 1 : 0); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - packet.writeC(0x00); // Grand Crusade - packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window - packet.writeD(0x20); // Helios - Always 32 - + packet.writeC(0); // Grand Crusade + packet.writeC(_list.isChanceMultisell() ? 1 : 0); // new multisell window + packet.writeD(32); // Helios - Always 32 while (_size-- > 0) { ItemInfo itemEnchantment = _list.getItemEnchantment(_index); @@ -86,20 +84,16 @@ public class MultiSellList extends AbstractItemPacket } } } - packet.writeD(_index); // Entry ID. Start from 1. packet.writeC(entry.isStackable() ? 1 : 0); - // Those values will be passed down to MultiSellChoose packet. packet.writeH(itemEnchantment != null ? itemEnchantment.getEnchantLevel() : 0); // enchant level writeItemAugment(packet, itemEnchantment); writeItemElemental(packet, itemEnchantment); writeItemEnsoulOptions(packet, itemEnchantment); - packet.writeC(0x00); // 286 - + packet.writeC(0); // 286 packet.writeH(entry.getProducts().size()); packet.writeH(entry.getIngredients().size()); - for (ItemChanceHolder product : entry.getProducts()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(product.getId()); @@ -122,9 +116,8 @@ public class MultiSellList extends AbstractItemPacket writeItemAugment(packet, displayItemEnchantment); writeItemElemental(packet, displayItemEnchantment); writeItemEnsoulOptions(packet, displayItemEnchantment); - packet.writeC(0x00); // 286 + packet.writeC(0); // 286 } - for (ItemChanceHolder ingredient : entry.getIngredients()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(ingredient.getId()); @@ -144,7 +137,7 @@ public class MultiSellList extends AbstractItemPacket writeItemAugment(packet, displayItemEnchantment); writeItemElemental(packet, displayItemEnchantment); writeItemEnsoulOptions(packet, displayItemEnchantment); - packet.writeC(0x00); // 286 + packet.writeC(0); // 286 } } return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java index 6e85f5348c..cd46aac3aa 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java @@ -45,11 +45,10 @@ public class MyTargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MY_TARGET_SELECTED.writeId(packet); - - packet.writeD(0x01); // Grand Crusade + packet.writeD(1); // Grand Crusade packet.writeD(_objectId); packet.writeH(_color); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java index 1901ad1297..166c5c1e00 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java @@ -36,7 +36,6 @@ public class NewCharacterSuccess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NEW_CHARACTER_SUCCESS.writeId(packet); - packet.writeD(_chars.size()); for (PlayerTemplate chr : _chars) { @@ -44,31 +43,24 @@ public class NewCharacterSuccess implements IClientOutgoingPacket { continue; } - // TODO: Unhardcode these packet.writeD(chr.getRace().ordinal()); packet.writeD(chr.getClassId().getId()); - packet.writeD(99); packet.writeD(chr.getBaseSTR()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseDEX()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseCON()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseINT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseWIT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseMEN()); packet.writeD(1); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java index be1605f679..6061ea26ef 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java @@ -38,7 +38,6 @@ public class NicknameChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NICK_NAME_CHANGED.writeId(packet); - packet.writeD(_objectId); packet.writeS(_title); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index f9cd107e2c..3e4837b4a4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -54,24 +54,20 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public NpcHtmlMessage(int npcObjId, int itemId) { super(npcObjId); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } public NpcHtmlMessage(int npcObjId, int itemId, String html) { super(npcObjId, html); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } @@ -79,11 +75,10 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java index 2b296c3d8e..ce56e727f2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java @@ -47,10 +47,8 @@ public class NpcInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -58,7 +56,6 @@ public class NpcInfo extends AbstractMaskPacket private int _clanId = 0; private int _statusMask = 0; private final Set _abnormalVisualEffects; - private String[] _localisation; public void setLang(String lang) @@ -101,112 +98,90 @@ public class NpcInfo extends AbstractMaskPacket { addComponentType(NpcInfoType.HEADING); } - if ((npc.getStat().getPAtkSpd() > 0) || (npc.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (npc.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((npc.getLeftHandItem() > 0) || (npc.getRightHandItem() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (npc.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (npc.getDisplayEffect() > 0) { addComponentType(NpcInfoType.DISPLAY_EFFECT); } - if (npc.isInsideZone(ZoneId.WATER) || npc.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (npc.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (npc.getCloneObjId() > 0) { addComponentType(NpcInfoType.CLONE); } - if (npc.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (npc.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (npc.getCurrentHp() <= npc.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (npc.getCurrentMp() <= npc.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (npc.getTemplate().isUsingServerSideName()) { addComponentType(NpcInfoType.NAME); } - if (npc.getTemplate().isUsingServerSideTitle() || (npc.isMonster() && (Config.SHOW_NPC_LEVEL || Config.SHOW_NPC_AGGRESSION)) || npc.isChampion() || npc.isTrap()) { addComponentType(NpcInfoType.TITLE); } - if (npc.getNameString() != null) { addComponentType(NpcInfoType.NAME_NPCSTRINGID); } - if (npc.getTitleString() != null) { addComponentType(NpcInfoType.TITLE_NPCSTRINGID); } - if (_npc.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (!_abnormalVisualEffects.isEmpty() || npc.isInvisible()) { addComponentType(NpcInfoType.ABNORMALS); } - if (npc.getEnchantEffect() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (npc.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (npc.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (npc.getClanId() > 0) { final Clan clan = ClanTable.getInstance().getClan(npc.getClanId()); @@ -220,14 +195,11 @@ public class NpcInfo extends AbstractMaskPacket addComponentType(NpcInfoType.CLAN); } } - addComponentType(NpcInfoType.COLOR_EFFECT); - if (npc.getPvpFlag() > 0) { addComponentType(NpcInfoType.PVP_FLAG); } - // TODO: Confirm me if (npc.isInCombat()) { @@ -245,8 +217,7 @@ public class NpcInfo extends AbstractMaskPacket { _statusMask |= 0x08; } - - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -296,27 +267,23 @@ public class NpcInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO.writeId(packet); - packet.writeD(_npc.getObjectId()); - packet.writeC(_npc.isShowSummonAnimation() ? 0x02 : 0x00); // // 0=teleported 1=default 2=summoned + packet.writeC(_npc.isShowSummonAnimation() ? 2 : 0); // // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 0x01 : 0x00); + packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0x00); + packet.writeQ(0); } if (containsMask(NpcInfoType.TITLE)) { String title = _npc.getTitle(); - // Localisation related. if ((_localisation != null) && !_localisation[1].equals("")) { @@ -329,10 +296,8 @@ public class NpcInfo extends AbstractMaskPacket title = title.replace(NpcData.getInstance().getTemplate(_npc.getId()).getTitle(), _localisation[1]); } } - packet.writeS(title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -351,7 +316,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -366,20 +331,20 @@ public class NpcInfo extends AbstractMaskPacket if (containsMask(NpcInfoType.EQUIPPED)) { packet.writeD(_npc.getRightHandItem()); - packet.writeD(0x00); // Armor id? + packet.writeD(0); // Armor id? packet.writeD(_npc.getLeftHandItem()); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_npc.isDead() ? 0x00 : 0x01); + packet.writeC(_npc.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); + packet.writeC(_npc.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 0x01 : _npc.isFlying() ? 0x02 : 0x00); + packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -391,7 +356,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_npc.isFlying() ? 0x01 : 0x00); + packet.writeD(_npc.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { @@ -427,12 +392,12 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(0x00); // 2 - do some animation on spawn + packet.writeC(0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -464,12 +429,10 @@ public class NpcInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java index c95a8e5274..923e9cebad 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class NpcInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_npc.getObjectId()); packet.writeD(_npc.getTransformationDisplayId()); - final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size()); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java index a294edc57a..2a0ba41eeb 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java @@ -38,7 +38,6 @@ public class NpcQuestHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NPC_QUEST_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_questId); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java index d3328ade97..fc6d0d4a3a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java @@ -106,7 +106,6 @@ public class NpcSay implements IClientOutgoingPacket { _parameters = new ArrayList<>(); } - for (String item : params) { if ((item != null) && (item.length() > 0)) @@ -127,11 +126,9 @@ public class NpcSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_SAY.writeId(packet); - packet.writeD(_objectId); packet.writeD(_textType.getClientId()); packet.writeD(_npcId); - // Localisation related. if (_lang != null) { @@ -147,7 +144,6 @@ public class NpcSay implements IClientOutgoingPacket } } } - packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java index 356e3f48a9..ac61f9d247 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java @@ -33,11 +33,10 @@ public class ObservationMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_START.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me packet.writeD(0xc0); // TODO: Find me return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java index 5c0a0766b3..896ccea02b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java @@ -33,7 +33,6 @@ public class ObservationReturn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_END.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java index c2f7ab404f..173772c870 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java @@ -37,7 +37,6 @@ public class OnEventTrigger implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EVENT_TRIGGER.writeId(packet); - packet.writeD(_emitterId); packet.writeC(_enabled); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index fbb5c84dfe..37d4fea9cf 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -45,7 +45,6 @@ public class PackageSendableList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java index a53f589386..e24d63f717 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java @@ -39,7 +39,6 @@ public class PackageToList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_TO_LIST.writeId(packet); - packet.writeD(_players.size()); for (Entry entry : _players.entrySet()) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 655c7abcd1..44b23b37f4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -55,7 +55,6 @@ public class PartyMemberPosition implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); - packet.writeD(locations.size()); for (Entry entry : locations.entrySet()) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java index 9e275ec246..c9d3595037 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java @@ -36,7 +36,6 @@ public class PartyRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java index 2233054c14..76c4555d3b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java @@ -36,12 +36,10 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ADD.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); // c3 packet.writeD(_party.getDistributionType().getId()); // c3 packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); - packet.writeD((int) _member.getCurrentCp()); // c4 packet.writeD(_member.getMaxCp()); // c4 packet.writeD((int) _member.getCurrentHp()); @@ -51,9 +49,9 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket packet.writeD(_member.getVitalityPoints()); packet.writeC(_member.getLevel()); packet.writeH(_member.getClassId().getId()); - packet.writeC(0x00); + packet.writeC(0); packet.writeH(_member.getRace().ordinal()); - packet.writeD(0x00); // 228 + packet.writeD(0); // 228 return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java index e806018375..3a47801de1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java @@ -37,21 +37,17 @@ public class PartySmallWindowAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ALL.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); packet.writeC(_party.getDistributionType().getId()); packet.writeC(_party.getMemberCount() - 1); - for (Player member : _party.getMembers()) { if ((member != null) && (member != _exclude)) { packet.writeD(member.getObjectId()); packet.writeS(member.getName()); - packet.writeD((int) member.getCurrentCp()); // c4 packet.writeD(member.getMaxCp()); // c4 - packet.writeD((int) member.getCurrentHp()); packet.writeD(member.getMaxHp()); packet.writeD((int) member.getCurrentMp()); @@ -59,10 +55,9 @@ public class PartySmallWindowAll implements IClientOutgoingPacket packet.writeD(member.getVitalityPoints()); packet.writeC(member.getLevel()); packet.writeH(member.getClassId().getId()); - packet.writeC(0x01); // Unk + packet.writeC(1); // Unk packet.writeH(member.getRace().ordinal()); - packet.writeD(0x00); // 228 - + packet.writeD(0); // 228 final Summon pet = member.getPet(); packet.writeD(member.getServitors().size() + (pet != null ? 1 : 0)); // Summon size, one only atm if (pet != null) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java index 94a8a5a2ce..09ce132af4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java @@ -33,7 +33,6 @@ public class PartySmallWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_DELETE.writeId(packet); - packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java index c53c6c7779..e9ea2efbbe 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java @@ -42,7 +42,6 @@ public class PartySmallWindowUpdate extends AbstractMaskPacket * c = ca
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Attackers Clans?
* d = Number of Attackers Clans
* { //repeats
@@ -58,11 +58,10 @@ public class SiegeAttackerList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _castle.getSiege().getAttackerClans().size(); if (size > 0) { @@ -76,12 +75,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -90,8 +88,8 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index 5d5c831f14..8afd1f38ce 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -29,9 +29,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = 0xcb
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Defending Clans?
* d = Number of Defending Clans
* { //repeats
@@ -60,16 +60,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // Unknown - packet.writeD(0x01); // Unknown - packet.writeD(0x00); // Unknown - + packet.writeD(0); // Unknown + packet.writeD(1); // Unknown + packet.writeD(0); // Unknown final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0); packet.writeD(size); packet.writeD(size); - // Add owners final Clan ownerClan = _castle.getOwner(); if (ownerClan != null) @@ -78,14 +75,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket packet.writeS(ownerClan.getName()); packet.writeS(ownerClan.getLeaderName()); packet.writeD(ownerClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.OWNER.ordinal()); packet.writeD(ownerClan.getAllyId()); packet.writeS(ownerClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(ownerClan.getAllyCrestId()); } - // List of confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans()) { @@ -94,19 +90,17 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(defendingClan.getAllyCrestId()); } - // List of not confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans()) { @@ -115,12 +109,11 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER_PENDING.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 0a3fe46cb7..dfeefdaecf 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -59,13 +59,11 @@ public class SiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_INFO.writeId(packet); - if (_castle != null) { packet.writeD(_castle.getResidenceId()); - final int ownerId = _castle.getOwnerId(); - packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 0x01 : 0x00); + packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0); packet.writeD(ownerId); if (ownerId > 0) { @@ -89,7 +87,6 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { @@ -97,7 +94,7 @@ public class SiegeInfo implements IClientOutgoingPacket cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis()); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(Config.SIEGE_HOUR_LIST.size()); for (int hour : Config.SIEGE_HOUR_LIST) { @@ -108,7 +105,7 @@ public class SiegeInfo implements IClientOutgoingPacket else { packet.writeD((int) (_castle.getSiegeDate().getTimeInMillis() / 1000)); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index d11b3817c0..3c4c475339 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -51,12 +51,11 @@ public class SkillCoolTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SKILL_COOL_TIME.writeId(packet); - packet.writeD(_skillReuseTimeStamps.size()); for (TimeStamp ts : _skillReuseTimeStamps) { packet.writeD(ts.getSkillId()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD((int) ts.getReuse() / 1000); packet.writeD((int) Math.max(ts.getStamp() - _currentTime, 0) / 1000); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index de54232b51..ed4615c403 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -41,10 +41,9 @@ public class Snoop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SNOOP.writeId(packet); - packet.writeD(_convoId); packet.writeS(_name); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_type.getClientId()); packet.writeS(_speaker); packet.writeS(_msg); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java index 37827bdf6c..52f15519a5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java @@ -37,10 +37,9 @@ public class SocialAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SOCIAL_ACTION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_actionId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index fd7e43a153..19066f5f85 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -33,16 +33,15 @@ public class SpawnItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPAWN_ITEM.writeId(packet); - packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeD(_item.isStackable() ? 0x01 : 0x00); + packet.writeD(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java index ccae75b850..04f3ad716c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java @@ -110,7 +110,6 @@ public class SpecialCamera implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPECIAL_CAMERA.writeId(packet); - packet.writeD(_id); packet.writeD(_force); packet.writeD(_angle1); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java index cdd3821740..281756e793 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java @@ -34,7 +34,6 @@ public class StartPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_PLEDGE_WAR.writeId(packet); - packet.writeS(_playerName); packet.writeS(_pledgeName); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java index 48b4238eea..27fb4f606b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java @@ -38,7 +38,6 @@ public class StartRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_side); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java index b4f421df36..067bdeb082 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java @@ -72,7 +72,6 @@ public class StaticObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATIC_OBJECT.writeId(packet); - packet.writeD(_staticObjectId); packet.writeD(_objectId); packet.writeD(_type); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index c1a90dbcf0..0f99a19cd2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -46,7 +46,6 @@ public class StatusUpdate implements IClientOutgoingPacket public void addUpdate(StatusUpdateType type, int level) { _updates.put(type, level); - if (_isPlayable) { switch (type) @@ -76,10 +75,9 @@ public class StatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATUS_UPDATE.writeId(packet); - packet.writeD(_objectId); // casterId - packet.writeD(_isVisible ? _casterObjectId : 0x00); - packet.writeC(_isVisible ? 0x01 : 0x00); + packet.writeD(_isVisible ? _casterObjectId : 0); + packet.writeC(_isVisible ? 1 : 0); packet.writeC(_updates.size()); for (Entry entry : _updates.entrySet()) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java index 9919307366..cf2b71df5a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java @@ -53,7 +53,6 @@ public class StopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java index 50fdc3fe4c..78fdb5d70c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java @@ -43,7 +43,6 @@ public class StopMoveInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java index 9c828c3962..b254cad8b1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java @@ -34,7 +34,6 @@ public class StopPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java index b0392de226..ca69cd5346 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java @@ -36,7 +36,6 @@ public class StopRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FINISH_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_speed); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index 4b332d0467..377301825d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -43,10 +43,8 @@ public class SummonInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class SummonInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class SummonInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,11 +154,9 @@ public class SummonInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - // Show red aura? - // if (_statusMask != 0) + // if (_statusMask != 0x00) // { // addComponentType(NpcInfoType.VISUAL_STATE); // } @@ -229,28 +206,24 @@ public class SummonInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.SUMMON_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0x00); + packet.writeQ(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -269,7 +242,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -285,19 +258,19 @@ public class SummonInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -309,20 +282,20 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -346,12 +319,12 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -381,12 +354,10 @@ public class SummonInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java index 864462f76f..6f88551204 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java @@ -34,7 +34,6 @@ public class SurrenderPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SURRENDER_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 55902e07e1..bbd7706dbe 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -162,7 +162,6 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } - _params[_paramIndex++] = param; } @@ -268,7 +267,6 @@ public class SystemMessage implements IClientOutgoingPacket { return addString(item.getName()); } - append(new SMParam(TYPE_ITEM_NAME, id)); return this; } @@ -396,7 +394,6 @@ public class SystemMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SYSTEM_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -409,13 +406,12 @@ public class SystemMessage implements IClientOutgoingPacket params[i] = _params[i].getValue(); } packet.writeH(SystemMessageId.S1_2.getId()); - packet.writeC(0x01); + packet.writeC(1); packet.writeC(TYPE_TEXT); packet.writeS(sml.getLocalisation(params)); return true; } } - packet.writeH(getId()); packet.writeC(_params.length); for (SMParam param : _params) @@ -425,9 +421,7 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } - packet.writeC(param.getType()); - switch (param.getType()) { case TYPE_ELEMENT_NAME: diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java index a91da07e77..d357efbb0e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java @@ -47,13 +47,12 @@ public class TargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_SELECTED.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java index 3dadd249f6..3d7208c06f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java @@ -42,12 +42,11 @@ public class TargetUnselected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_UNSELECTED.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index 943b5078b6..13f9b9565a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -41,14 +41,13 @@ public class TeleportToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TELEPORT_TO_LOCATION.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // Fade 0, Instant 1. + packet.writeD(0); // Fade 0, Instant 1. packet.writeD(_heading); - packet.writeD(0x00); // Unknown. + packet.writeD(0); // Unknown. return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java index cb82f2da59..8d09576d9d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java @@ -32,7 +32,6 @@ public class TradeDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_DONE.writeId(packet); - packet.writeD(_num); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java index 716ed2a099..6a94d2463f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java @@ -41,9 +41,9 @@ public class TradeOtherAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java index 3d0ef0b501..7907f3d498 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java @@ -41,9 +41,9 @@ public class TradeOwnAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c59568bf1d..3822108c5a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -58,7 +58,6 @@ public class TradeStart extends AbstractItemPacket { _mask |= 0x08; } - // Does not shows level if (_partner.isGM()) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java index f8e2a191de..e5ec2376cc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java @@ -44,10 +44,10 @@ public class TradeUpdate extends AbstractItemPacket { OutgoingPackets.TRADE_UPDATE.writeId(packet); packet.writeC(_sendType); - packet.writeD(0x01); + packet.writeD(1); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2); writeItem(packet, _item, _count); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java index c7102ca385..728020c0b1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java @@ -32,7 +32,6 @@ public class TutorialEnableClientEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_ENABLE_CLIENT_EVENT.writeId(packet); - packet.writeD(_eventId); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java index 92ac75afcf..7cc33a0f80 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java @@ -48,7 +48,6 @@ public class TutorialShowHtml extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_HTML.writeId(packet); - packet.writeD(_type); packet.writeS(getHtml()); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java index 75a57be38b..2ee62835db 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java @@ -37,7 +37,6 @@ public class TutorialShowQuestionMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_QUESTION_MARK.writeId(packet); - packet.writeC(_markType); packet.writeD(_markId); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 4545110d5f..0b68d76ee1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class UserInfo extends AbstractMaskPacket { private Player _player; - private int _relation; private int _runSpd; private int _walkSpd; @@ -51,7 +50,6 @@ public class UserInfo extends AbstractMaskPacket private int _enchantLevel; private int _armorEnchant; private String _title; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -59,7 +57,6 @@ public class UserInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 5; public UserInfo(Player player) @@ -83,6 +80,7 @@ public class UserInfo extends AbstractMaskPacket _enchantLevel = player.getInventory().getWeaponEnchant(); _armorEnchant = player.getInventory().getArmorMinEnchant(); _title = player.getTitle(); + if (player.isGM() && player.isInvisible()) { _title = "[Invisible]"; @@ -138,30 +136,26 @@ public class UserInfo extends AbstractMaskPacket } OutgoingPackets.USER_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_initSize); packet.writeH(28); // 286 - 28 packet.writeB(_masks); - if (containsMask(UserInfoType.RELATION)) { packet.writeD(_relation); } - if (containsMask(UserInfoType.BASIC_INFO)) { packet.writeH(23 + (_player.getAppearance().getVisibleName().length() * 2)); packet.writeString(_player.getName()); - packet.writeC(_player.isGM() ? 0x01 : 0x00); + packet.writeC(_player.isGM() ? 1 : 0); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeD(_player.getLevel()); // 270 packet.writeD(_player.getClassId().getId()); // 286 } - if (containsMask(UserInfoType.BASE_STATS)) { packet.writeH(18); @@ -171,10 +165,9 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getINT()); packet.writeH(_player.getWIT()); packet.writeH(_player.getMEN()); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); } - if (containsMask(UserInfoType.MAX_HPCPMP)) { packet.writeH(14); @@ -182,7 +175,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMaxMp()); packet.writeD(_player.getMaxCp()); } - if (containsMask(UserInfoType.CURRENT_HPMPCP_EXP_SP)) { packet.writeH(38); @@ -193,32 +185,28 @@ public class UserInfo extends AbstractMaskPacket packet.writeQ(_player.getExp()); packet.writeF((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel()))); } - if (containsMask(UserInfoType.ENCHANTLEVEL)) { packet.writeH(4); packet.writeC(_enchantLevel); packet.writeC(_armorEnchant); } - if (containsMask(UserInfoType.APPAREANCE)) { packet.writeH(15); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); } - if (containsMask(UserInfoType.STATUS)) { packet.writeH(6); packet.writeC(_player.getMountType().ordinal()); packet.writeC(_player.getPrivateStoreType().getId()); packet.writeC(_player.hasDwarvenCraft() || (_player.getSkillLevel(248) > 0) ? 1 : 0); - packet.writeC(0x00); + packet.writeC(0); } - if (containsMask(UserInfoType.STATS)) { packet.writeH(64); // 270 @@ -236,21 +224,19 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(0x00); // 270 - packet.writeD(0x00); // 270 + packet.writeD(0); // 270 + packet.writeD(0); // 270 } - if (containsMask(UserInfoType.ELEMENTALS)) { packet.writeH(14); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); } - if (containsMask(UserInfoType.POSITION)) { packet.writeH(18); @@ -259,7 +245,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getZ()); packet.writeD(_player.isInVehicle() ? _player.getVehicle().getObjectId() : 0); } - if (containsMask(UserInfoType.SPEED)) { packet.writeH(18); @@ -272,28 +257,24 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_flyRunSpd); packet.writeH(_flyWalkSpd); } - if (containsMask(UserInfoType.MULTIPLIER)) { packet.writeH(18); packet.writeF(_moveMultiplier); packet.writeF(_player.getAttackSpeedMultiplier()); } - if (containsMask(UserInfoType.COL_RADIUS_HEIGHT)) { packet.writeH(18); packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); } - if (containsMask(UserInfoType.ATK_ELEMENTAL)) { packet.writeH(5); - packet.writeC(0x00); - packet.writeH(0x00); + packet.writeC(0); + packet.writeH(0); } - if (containsMask(UserInfoType.CLAN)) { packet.writeH(32 + (_title.length() * 2)); @@ -303,12 +284,11 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getClanCrestLargeId()); packet.writeD(_player.getClanCrestId()); packet.writeD(_player.getClanPrivileges().getBitmask()); - packet.writeC(_player.isClanLeader() ? 0x01 : 0x00); + packet.writeC(_player.isClanLeader() ? 1 : 0); packet.writeD(_player.getAllyId()); packet.writeD(_player.getAllyCrestId()); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); } - if (containsMask(UserInfoType.SOCIAL)) { packet.writeH(30); // 228 @@ -328,82 +308,72 @@ public class UserInfo extends AbstractMaskPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeD(0x00); // 228 + packet.writeD(0); // 228 } - if (containsMask(UserInfoType.VITA_FAME)) { packet.writeH(19); // 196 packet.writeD(_player.getVitalityPoints()); - packet.writeC(0x00); // Vita Bonus - packet.writeD(0x00); // _player.getFame() - packet.writeD(0x00); // _player.getRaidbossPoints() - packet.writeC(0x00); // 196 - packet.writeH(0x00); // Henna Seal Engraving Gauge - packet.writeC(0x00); // 196 + packet.writeC(0); // Vita Bonus + packet.writeD(0); // _player.getFame() + packet.writeD(0); // _player.getRaidbossPoints() + packet.writeC(0); // 196 + packet.writeH(0); // Henna Seal Engraving Gauge + packet.writeC(0); // 196 } - if (containsMask(UserInfoType.SLOTS)) { packet.writeH(12); // 152 packet.writeC(_player.getInventory().getTalismanSlots()); packet.writeC(_player.getInventory().getBroochJewelSlots()); packet.writeC(_player.getTeam().getId()); - packet.writeD(0x00); - + packet.writeD(0); if (_player.getInventory().getAgathionSlots() > 0) { - packet.writeC(0x01); // Charm slots + packet.writeC(1); // Charm slots packet.writeC(_player.getInventory().getAgathionSlots() - 1); packet.writeC(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152 } else { - packet.writeC(0x00); // Charm slots - packet.writeC(0x00); + packet.writeC(0); // Charm slots + packet.writeC(0); packet.writeC(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152 } } - if (containsMask(UserInfoType.MOVEMENTS)) { packet.writeH(4); packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); - packet.writeC(_player.isRunning() ? 0x01 : 0x00); + packet.writeC(_player.isRunning() ? 1 : 0); } - if (containsMask(UserInfoType.COLOR)) { packet.writeH(10); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); } - if (containsMask(UserInfoType.INVENTORY_LIMIT)) { packet.writeH(13); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); packet.writeH(_player.getInventoryLimit()); - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 } - if (containsMask(UserInfoType.TRUE_HERO)) { packet.writeH(9); - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeC(_player.isTrueHero() ? 100 : 0x00); + packet.writeD(0); + packet.writeH(0); + packet.writeC(_player.isTrueHero() ? 100 : 0); } - if (containsMask(UserInfoType.ATT_SPIRITS)) // 152 { packet.writeH(26); @@ -414,13 +384,11 @@ public class UserInfo extends AbstractMaskPacket packet.writeD((int) _player.getEarthSpiritDefense()); packet.writeD(_player.getActiveElementalSpiritType()); } - if (containsMask(UserInfoType.RANKING)) // 196 { packet.writeH(6); packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : RankManager.getInstance().getPlayerClassRank(_player) == 1 ? 4 : 0); } - if (containsMask(UserInfoType.STAT_POINTS)) // 235 { packet.writeH(16); @@ -432,7 +400,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getVariables().getInt(PlayerVariables.STAT_WIT, 0)); packet.writeH(_player.getVariables().getInt(PlayerVariables.STAT_MEN, 0)); } - if (containsMask(UserInfoType.STAT_ABILITIES)) // 235 { packet.writeH(18); @@ -442,10 +409,9 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getINT() - _player.getTemplate().getBaseINT() - _player.getVariables().getInt(PlayerVariables.STAT_INT, 0)); // additional INT packet.writeH(_player.getWIT() - _player.getTemplate().getBaseWIT() - _player.getVariables().getInt(PlayerVariables.STAT_WIT, 0)); // additional WIT packet.writeH(_player.getMEN() - _player.getTemplate().getBaseMEN() - _player.getVariables().getInt(PlayerVariables.STAT_MEN, 0)); // additional MEN - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); } - if (containsMask(UserInfoType.ELIXIR_USED)) // 286 { packet.writeD(_player.getVariables().getInt(PlayerVariables.ELIXIRS_USED, 0)); // count @@ -480,7 +446,6 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x10; // Party leader } } - if (clan != null) { relation |= 0x20; // Clan member @@ -489,12 +454,10 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x40; // Clan leader } } - if (player.isInSiege()) { relation |= 0x80; // In siege } - return relation; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java index 283bcf1614..90c416726a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java @@ -36,7 +36,6 @@ public class ValidateLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java index 4d8f9683d0..83f72bf981 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java @@ -40,7 +40,6 @@ public class ValidateLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java index b684e70bdc..71367cd26d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java @@ -36,7 +36,6 @@ public class VehicleCheckLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_CHECK_LOCATION.writeId(packet); - packet.writeD(_boat.getObjectId()); packet.writeD(_boat.getX()); packet.writeD(_boat.getY()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java index a4a5780f30..5b565c08b7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java @@ -46,7 +46,6 @@ public class VehicleDeparture implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_DEPARTURE.writeId(packet); - packet.writeD(_objId); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java index ec611028bf..4a995a6352 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java @@ -44,7 +44,6 @@ public class VehicleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java index 207a6fd899..bf629dcbbc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java @@ -42,7 +42,6 @@ public class VehicleStarted implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_START.writeId(packet); - packet.writeD(_objectId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 35ca986d35..5eb9eb7ab9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -30,6 +30,7 @@ public class WareHouseDepositList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; public static final int FREIGHT = 1; + private final int _sendType; private final long _playerAdena; private final List _items = new ArrayList<>(); @@ -49,7 +50,6 @@ public class WareHouseDepositList extends AbstractItemPacket _sendType = sendType; _whType = type; _playerAdena = player.getAdena(); - final boolean isPrivate = _whType == PRIVATE; for (Item temp : player.getInventory().getAvailableItems(true, isPrivate, false)) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 7af1cd273c..5ece99310a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -32,6 +32,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private final int _sendType; private Player _player; private long _playerAdena; @@ -60,7 +61,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } - _items = _player.getActiveWarehouse().getItems(); for (Item item : _items) { @@ -78,15 +78,15 @@ public class WareHouseWithdrawalList extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeH(0x00); + packet.writeH(0); packet.writeD(_invSize); packet.writeD(_items.size()); for (Item item : _items) { writeItem(packet, item); packet.writeD(item.getObjectId()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } else diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java index 5f2dd05f3b..aea1476fb2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java @@ -35,8 +35,7 @@ public class ExDivideAdenaCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_CANCEL.writeId(packet); - - packet.writeC(0x00); // TODO: Find me + packet.writeC(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java index 6af912cebf..de4e955aba 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java @@ -46,9 +46,8 @@ public class ExDivideAdenaDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_DONE.writeId(packet); - - packet.writeC(_isPartyLeader ? 0x01 : 0x00); - packet.writeC(_isCCLeader ? 0x01 : 0x00); + packet.writeC(_isPartyLeader ? 1 : 0); + packet.writeC(_isCCLeader ? 1 : 0); packet.writeD(_memberCount); packet.writeQ(_distributedAdenaCount); packet.writeQ(_adenaCount); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index 549def456e..84b5fead76 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -43,7 +43,6 @@ public class ExChooseShapeShiftingItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_SHAPE_SHIFTING_ITEM.writeId(packet); - packet.writeD(_targetType != null ? _targetType.ordinal() : 0); packet.writeD(_type != null ? _type.ordinal() : 0); packet.writeD(_itemId); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java index 33fb439aa5..ba55887a1a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java @@ -45,7 +45,6 @@ public class ExCuriousHouseMemberUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_UPDATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_maxHp); packet.writeD(_maxCp); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java index 8ad3659725..be2d29d864 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPacket { - public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0x00); - public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(0x01); + public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0); + public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(1); private final int _result; @@ -39,7 +39,6 @@ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPa public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_EXTRACTION_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java index ec82cc14f3..e84d7a7255 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; public static final ExPutShapeShiftingTargetItemResult FAILED = new ExPutShapeShiftingTargetItemResult(RESULT_FAILED, 0); @@ -43,7 +43,6 @@ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_resultId); packet.writeQ(_price); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java index f4d3118cc4..038eae0042 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExShapeShiftingResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; - public static final int RESULT_CLOSE = 0x02; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; + public static final int RESULT_CLOSE = 2; public static final ExShapeShiftingResult FAILED = new ExShapeShiftingResult(RESULT_FAILED, 0, 0); public static final ExShapeShiftingResult CLOSE = new ExShapeShiftingResult(RESULT_CLOSE, 0, 0); @@ -47,7 +47,6 @@ public class ExShapeShiftingResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHAPE_SHIFTING_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_targetItemId); packet.writeD(_extractItemId); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java index eaf0d209fd..4b48b09002 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java @@ -38,7 +38,7 @@ public class ExConfirmVipAttendanceCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CONFIRM_VIP_ATTENDANCE_CHECK.writeId(packet); - packet.writeC(_available ? 0x01 : 0x00); // can receive reward today? 1 else 0 + packet.writeC(_available ? 1 : 0); // can receive reward today? 1 else 0 packet.writeC(_index); // active reward index packet.writeD(0); packet.writeD(0); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java index 9d61fe68d6..dd94df023f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java @@ -45,10 +45,10 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket OutgoingPackets.EX_VIP_ATTENDANCE_ITEM_LIST.writeId(packet); packet.writeC(_available ? _index + 1 : _index); // index to receive? packet.writeC(_index); // last received index? - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeC(0x01); - packet.writeC(_available ? 0x01 : 0x00); // player can receive reward today? + packet.writeD(0); + packet.writeD(0); + packet.writeC(1); + packet.writeC(_available ? 1 : 0); // player can receive reward today? packet.writeC(250); packet.writeC(AttendanceRewardData.getInstance().getRewardsCount()); // reward size int rewardCounter = 0; @@ -57,11 +57,11 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket rewardCounter++; packet.writeD(reward.getId()); packet.writeQ(reward.getCount()); - packet.writeC(0x01); // is unknown? - packet.writeC((rewardCounter % 7) == 0 ? 0x01 : 0x00); // is last in row? + packet.writeC(1); // is unknown? + packet.writeC((rewardCounter % 7) == 0 ? 1 : 0); // is last in row? } - packet.writeC(0x00); - packet.writeD(0x00); + packet.writeC(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java index 0282966053..9963a080c6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java @@ -41,7 +41,7 @@ public class ExActivateAutoShortcut implements IClientOutgoingPacket { OutgoingPackets.EX_ACTIVATE_AUTO_SHORTCUT.writeId(packet); packet.writeH(_position); - packet.writeC(_active ? 0x01 : 0x00); + packet.writeC(_active ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionCloseUI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionCloseUI.java index 494a5464a2..6a9a1ae36a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionCloseUI.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionCloseUI.java @@ -29,7 +29,7 @@ public class ExCollectionCloseUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLLECTION_CLOSE_UI.writeId(packet); - packet.writeC(0x00); + packet.writeC(0); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionFavoriteList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionFavoriteList.java index 7c441b7681..92ae04b2ba 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionFavoriteList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionFavoriteList.java @@ -29,7 +29,7 @@ public class ExCollectionFavoriteList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLLECTION_FAVORITE_LIST.writeId(packet); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java index 4c3ae253ea..c79b68becc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java @@ -39,7 +39,6 @@ public class ExResponseCommissionBuyInfo extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_INFO.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java index ddfa8b6db1..c1d29735b8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java @@ -40,7 +40,6 @@ public class ExResponseCommissionBuyItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_ITEM.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java index aa4bbbde24..01e4782408 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java @@ -39,7 +39,6 @@ public class ExResponseCommissionDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_DELETE.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java index e7e3c39816..b915574175 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java @@ -55,7 +55,6 @@ public class ExResponseCommissionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_INFO.writeId(packet); - packet.writeD(_result); packet.writeD(_itemId); packet.writeQ(_presetPricePerUnit); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java index 4963393b42..a012b3ab30 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java @@ -64,7 +64,6 @@ public class ExResponseCommissionList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_LIST.writeId(packet); - packet.writeD(_replyType.getClientId()); switch (_replyType) { @@ -73,13 +72,11 @@ public class ExResponseCommissionList extends AbstractItemPacket { packet.writeD((int) Instant.now().getEpochSecond()); packet.writeD(_chunkId); - int chunkSize = _items.size() - _listIndexStart; if (chunkSize > MAX_CHUNK_SIZE) { chunkSize = MAX_CHUNK_SIZE; } - packet.writeD(chunkSize); for (int i = _listIndexStart; i < (_listIndexStart + chunkSize); i++) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java index b1b0a97d7a..183547af06 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java @@ -39,7 +39,6 @@ public class ExResponseCommissionRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_REGISTER.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java index 74d8a95587..b68386e4ed 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java @@ -35,8 +35,7 @@ public class ExShowCommission implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_COMMISSION.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java index 0c267ecf34..11b1ff1e0a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExEnchantFail implements IClientOutgoingPacket { public static final ExEnchantFail STATIC_PACKET = new ExEnchantFail(0, 0); + private final int _itemOne; private final int _itemTwo; @@ -39,7 +40,6 @@ public class ExEnchantFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_FAIL.writeId(packet); - packet.writeD(_itemOne); packet.writeD(_itemTwo); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java index 71ba811ed5..87d29a8e7c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java @@ -36,7 +36,6 @@ public class ExEnchantSucess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SUCESS.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java index eb4eb8b26c..ec67d50fb6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java @@ -39,7 +39,6 @@ public class ExGetCrystalizingEstimation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - packet.writeD(_items.size()); for (ItemChanceHolder holder : _items) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java index ac16c14f5b..ebf5b64751 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java @@ -43,18 +43,18 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket } OutgoingPackets.EX_CONNECTED_TIME_AND_GETTABLE_REWARD.writeId(packet); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_oneDayRewardAvailableCount); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index 8667d9144f..57acfedd38 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -62,7 +62,6 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket } OutgoingPackets.EX_ONE_DAY_RECEIVE_REWARD_LIST.writeId(packet); - packet.writeD(_dayRemainTime); packet.writeD(_weekRemainTime); packet.writeD(_monthRemainTime); @@ -75,7 +74,7 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket packet.writeH(reward.getId()); final int status = reward.getStatus(_player); packet.writeC(status); - packet.writeC(reward.getRequiredCompletions() > 1 ? 0x01 : 0x00); + packet.writeC(reward.getRequiredCompletions() > 1 ? 1 : 0); packet.writeD(reward.getParams().getInt("level", -1) == -1 ? (status == 1 ? 0 : reward.getProgress(_player)) : _player.getLevel()); packet.writeD(reward.getRequiredCompletions()); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java index f0d1fb0d65..03c8bc9b68 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java @@ -43,9 +43,7 @@ abstract class AbstractElementalSpiritPacket implements IClientOutgoingPacket packet.writeD(spirit.getMaxCharacteristics()); packet.writeD(spirit.getMaxCharacteristics()); packet.writeD(spirit.getMaxCharacteristics()); - packet.writeC(1); // unk - for (int j = 0; j < 1; j++) { packet.writeH(2); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java index 3a53a42a95..53c6d5b3e9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java @@ -45,16 +45,14 @@ public class ElementalSpiritAbsorbInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_ABSORB_INFO.writeId(packet); - final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type)); if (spirit == null) { - packet.writeC(0x00); - packet.writeC(0x00); + packet.writeC(0); + packet.writeC(0); return true; } - - packet.writeC(0x01); + packet.writeC(1); packet.writeC(_type); packet.writeC(spirit.getStage()); packet.writeQ(spirit.getExperience()); @@ -62,7 +60,6 @@ public class ElementalSpiritAbsorbInfo implements IClientOutgoingPacket packet.writeQ(spirit.getExperienceToNextLevel()); // MaxExp packet.writeD(spirit.getLevel()); packet.writeD(spirit.getMaxLevel()); - final List absorbItems = spirit.getAbsorbItems(); packet.writeD(absorbItems.size()); // AbsorbCount for (ElementalSpiritAbsorbItemHolder absorbItem : absorbItems) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java index 430c43f891..7012b8a7a2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java @@ -44,7 +44,6 @@ public class ElementalSpiritEvolutionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_EVOLUTION_INFO.writeId(packet); - final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type)); if (spirit == null) { @@ -52,13 +51,11 @@ public class ElementalSpiritEvolutionInfo implements IClientOutgoingPacket packet.writeD(0); return true; } - packet.writeC(_type); packet.writeD(spirit.getNpcId()); - packet.writeD(0x01); // unk + packet.writeD(1); // unk packet.writeD(spirit.getStage()); packet.writeF(100); // chance ?? - final List items = spirit.getItemsToEvolve(); packet.writeD(items.size()); for (ItemHolder item : items) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java index 83c7057dfb..030eec0eb4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java @@ -42,7 +42,6 @@ public class ElementalSpiritExtractInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_EXTRACT_INFO.writeId(packet); - final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type)); if (spirit == null) { @@ -50,15 +49,12 @@ public class ElementalSpiritExtractInfo implements IClientOutgoingPacket packet.writeC(0); return true; } - packet.writeC(_type); // active elemental spirit packet.writeC(1); // is extract ? - packet.writeC(1); // cost count // for each cost count packet.writeD(57); // item id packet.writeD(ElementalSpiritData.EXTRACT_FEES[spirit.getStage() - 1]); // item count - packet.writeD(spirit.getExtractItem()); packet.writeD(spirit.getExtractAmount()); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java index 15fa123db6..ba363bf243 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java @@ -41,7 +41,6 @@ public class ElementalSpiritInfo extends AbstractElementalSpiritPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_INFO.writeId(packet); - final ElementalSpirit[] spirits = _player.getSpirits(); if (spirits == null) { @@ -50,20 +49,16 @@ public class ElementalSpiritInfo extends AbstractElementalSpiritPacket packet.writeC(0); return true; } - packet.writeC(_type); // show spirit info window 1; Change type 2; Only update 0 packet.writeC(_spiritType); - packet.writeC(spirits.length); // spirit count - for (ElementalSpirit spirit : spirits) { packet.writeC(spirit.getType()); - packet.writeC(0x01); // spirit active ? + packet.writeC(1); // spirit active ? // if active writeSpiritInfo(packet, spirit); } - packet.writeD(1); // Reset talent items count for (int j = 0; j < 1; j++) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java index bc05ef3212..66488267d4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java @@ -38,7 +38,6 @@ public class ExElementalSpiritGetExp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_GET_EXP.writeId(packet); - packet.writeC(_type); packet.writeQ(_experience); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java index 7f380efe99..8f5cfd3c98 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java @@ -41,7 +41,6 @@ public abstract class UpdateElementalSpiritPacket extends AbstractElementalSpiri { packet.writeC(_update ? 1 : 0); packet.writeC(_type); - if (_update) { final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type)); @@ -49,7 +48,6 @@ public abstract class UpdateElementalSpiritPacket extends AbstractElementalSpiri { return; } - packet.writeC(_type); writeSpiritInfo(packet, spirit); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java index 23b770e406..ebe77fa654 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java @@ -29,7 +29,7 @@ public class ExShowUpgradeSystem extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_UPGRADE_SYSTEM.writeId(packet); - packet.writeH(0x01); + packet.writeH(1); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java index fa605b548a..a99ad7f4e3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java @@ -52,7 +52,7 @@ public class ExFishingStart implements IClientOutgoingPacket packet.writeD(_baitLocation.getX()); packet.writeD(_baitLocation.getY()); packet.writeD(_baitLocation.getZ()); - packet.writeC(0x01); // 0 = newbie, 1 = normal, 2 = night + packet.writeC(1); // 0 = newbie, 1 = normal, 2 = night return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java index 046ad04cb6..74501fe7ff 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java @@ -49,7 +49,6 @@ public class ExUserInfoFishing implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_FISHING.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_isFishing ? 1 : 0); if (_baitLocation == null) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index dc0e3e05bc..336a384bcc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -47,9 +47,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FRIEND_DETAIL_INFO.writeId(packet); - packet.writeD(_objectId); - if (_friend == null) { packet.writeS(_name); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java index 0d4bb47ff0..a90b7b6083 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java @@ -33,8 +33,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x00); + packet.writeC(0); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java index 9add9c9caa..d24139644c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java @@ -49,7 +49,6 @@ public class FriendAddRequestResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_charId); packet.writeS(_charName); @@ -57,7 +56,7 @@ public class FriendAddRequestResult implements IClientOutgoingPacket packet.writeD(_charObjectId); packet.writeD(_charLevel); packet.writeD(_charClassId); - packet.writeH(0x00); // Always 0 on retail + packet.writeH(0); // Always 0 on retail return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java index a135944662..13a7d01967 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java @@ -86,12 +86,10 @@ public class FriendList implements IClientOutgoingPacket } continue; } - if (player1.isOnline()) { online = true; } - classid = player1.getClassId().getId(); level = player1.getLevel(); _info.add(new FriendInfo(objId, name, online, classid, level)); @@ -102,14 +100,13 @@ public class FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._classid); packet.writeD(info._level); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java index 07c23f9fd2..1bb4142e34 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java @@ -38,7 +38,6 @@ public class FriendRemove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_REMOVE.writeId(packet); - packet.writeD(_responce); packet.writeS(_charName); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java index e8dbddcd63..a3990c0879 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java @@ -52,7 +52,6 @@ public class FriendStatus implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_STATUS.writeId(packet); - packet.writeD(_type); packet.writeS(_name); switch (_type) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java index 8752104e06..78da5850b8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java @@ -50,7 +50,6 @@ public class L2Friend implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND.writeId(packet); - packet.writeD(_action ? 1 : 3); // 1-add 3-remove packet.writeD(_objid); packet.writeS(_name); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java index b69a253635..e50693cb11 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java @@ -81,17 +81,16 @@ public class L2FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._level); packet.writeD(info._classId); - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java index 0d4fa5cb5d..d0b92dbd1d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java @@ -40,7 +40,7 @@ public class TimedHuntingZoneEnter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); - packet.writeC(0x01); // bEnterSuccess + packet.writeC(1); // bEnterSuccess packet.writeD(_zoneId); packet.writeD((int) ((Chronos.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) packet.writeD(_player.getTimedHuntingZoneRemainingTime(_zoneId) / 1000); // nRemainTime (zone left time) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java index 2c93f25c76..c80dbcfa6a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java @@ -35,7 +35,7 @@ public class TimedHuntingZoneExit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); - packet.writeC(0x00); // bEnterSuccess + packet.writeC(0); // bEnterSuccess return true; } } \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java index 6fc3384705..d0bf1fdfde 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java @@ -43,7 +43,6 @@ public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket { _shopType = shopType; _player = player; - switch (shopType) { case 3: // Normal Lcoin Shop @@ -72,10 +71,9 @@ public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PURCHASE_LIMIT_SHOP_ITEM_LIST_NEW.writeId(packet); - packet.writeC(_shopType); - packet.writeC(0x01); // Page. (311) - packet.writeC(0x01); // MaxPage. (311) + packet.writeC(1); // Page. (311) + packet.writeC(1); // MaxPage. (311) packet.writeD(_products.size()); for (LimitShopProductHolder product : _products) { @@ -96,7 +94,6 @@ public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket packet.writeH(product.getIngredientEnchants()[2]); packet.writeH(product.getIngredientEnchants()[3]); // 306 packet.writeH(product.getIngredientEnchants()[4]); // 306 - // Check limits. if (product.getAccountDailyLimit() > 0) // Sale period. { @@ -104,7 +101,7 @@ public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket { if ((_player.getAccountVariables().getLong(AccountVariables.LCOIN_SHOP_PRODUCT_TIME + product.getProductionId(), 0) + 86400000) > Chronos.currentTimeMillis()) { - packet.writeD(0x00); + packet.writeD(0); } else // Reset limit. { @@ -121,7 +118,7 @@ public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket { if (_player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_COUNT + product.getProductionId(), 0) >= product.getAccountBuyLimit()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -130,13 +127,12 @@ public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket } else // No account limits. { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x00); // nRemainSec - packet.writeD(0x00); // nRemainServerItemAmount - packet.writeH(0x00); // sCircleNum (311) + packet.writeD(0); // nRemainSec + packet.writeD(0); // nRemainServerItemAmount + packet.writeH(0); // sCircleNum (311) } - return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemResult.java index d2e7f33d40..fafd159bca 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemResult.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemResult.java @@ -43,7 +43,6 @@ public class ExPurchaseLimitShopItemResult implements IClientOutgoingPacket _category = category; _productId = productId; _rewards = rewards; - switch (_category) { case 3: // Normal Lcoin Shop diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampExpInfoUI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampExpInfoUI.java index 8e23bfb677..52777d85fc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampExpInfoUI.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampExpInfoUI.java @@ -38,7 +38,7 @@ public class ExMagicLampExpInfoUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAGICLAMP_EXP_INFO.writeId(packet); - packet.writeD(Config.ENABLE_MAGIC_LAMP ? 0x01 : 0x00); // IsOpen + packet.writeD(Config.ENABLE_MAGIC_LAMP ? 1 : 0); // IsOpen packet.writeD(Config.MAGIC_LAMP_MAX_LEVEL_EXP); // MaxMagicLampExp packet.writeD(_player.getLampExp()); // MagicLampExp packet.writeD(_player.getLampCount()); // MagicLampCount diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java index 677c09091f..706c179a9c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java @@ -37,7 +37,6 @@ public class ExMentorAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_ADD.writeId(packet); - packet.writeS(_mentor.getName()); packet.writeD(_mentor.getActiveClass()); packet.writeD(_mentor.getLevel()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java index b3e3dcb1e7..2f08d72ba6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java @@ -63,9 +63,8 @@ public class ExMentorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_LIST.writeId(packet); - packet.writeD(_type); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mentees.size()); for (Mentee mentee : _mentees) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java index e2a71fecd7..3f3a83b27d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ListMenteeWaiting implements IClientOutgoingPacket { private static final int PLAYERS_PER_PAGE = 64; + private final List _possibleCandiates = new ArrayList<>(); private final int _page; @@ -49,18 +50,15 @@ public class ListMenteeWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_MENTEE_WAITING.writeId(packet); - - packet.writeD(0x01); // always 1 in retail + packet.writeD(1); // always 1 in retail if (_possibleCandiates.isEmpty()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } - packet.writeD(_possibleCandiates.size()); packet.writeD(_possibleCandiates.size() % PLAYERS_PER_PAGE); - for (Player player : _possibleCandiates) { if ((1 <= (PLAYERS_PER_PAGE * _page)) && (1 > (PLAYERS_PER_PAGE * (_page - 1)))) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java index f3a98a919a..89cb697e8b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java @@ -44,10 +44,8 @@ public class ExPetInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -69,88 +67,71 @@ public class ExPetInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -160,9 +141,7 @@ public class ExPetInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -176,9 +155,8 @@ public class ExPetInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -228,28 +206,24 @@ public class ExPetInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PET_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0x00); + packet.writeQ(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -268,7 +242,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -284,19 +258,19 @@ public class ExPetInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -308,20 +282,20 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -345,12 +319,12 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -380,12 +354,10 @@ public class ExPetInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeC(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetDelete.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetDelete.java index 17dba0fec9..f9b697323e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetDelete.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetDelete.java @@ -35,7 +35,6 @@ public class PetDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_DELETE.writeId(packet); - packet.writeD(_petType); packet.writeD(_petObjId); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java index 6e26ae016c..fa9c9d8693 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java @@ -71,7 +71,6 @@ public class PetInfo implements IClientOutgoingPacket _curFed = sum.getLifeTimeRemaining(); _maxFed = sum.getLifeTime(); } - if (summon.isBetrayed()) { _statusMask |= 0x01; // Auto attackable status @@ -99,19 +98,15 @@ public class PetInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_INFO.writeId(packet); - packet.writeC(_summon.getSummonType()); packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); - packet.writeD(_summon.getX()); packet.writeD(_summon.getY()); packet.writeD(_summon.getZ()); packet.writeD(_summon.getHeading()); - packet.writeD(_summon.getStat().getMAtkSpd()); packet.writeD(_summon.getStat().getPAtkSpd()); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -120,16 +115,13 @@ public class PetInfo implements IClientOutgoingPacket packet.writeH(_flWalkSpd); packet.writeH(_flyRunSpd); packet.writeH(_flyWalkSpd); - packet.writeF(_moveMultiplier); packet.writeF(_summon.getAttackSpeedMultiplier()); // attack speed multiplier packet.writeF(_summon.getTemplate().getFCollisionRadius()); packet.writeF(_summon.getTemplate().getFCollisionHeight()); - packet.writeD(_summon.getWeapon()); // right hand weapon packet.writeD(_summon.getArmor()); // body armor - packet.writeD(0x00); // left hand weapon - + packet.writeD(0); // left hand weapon packet.writeC(_summon.isDead() ? 0 : _summon.isShowSummonAnimation() ? 2 : _value); packet.writeD(-1); // High Five NPCString ID if (_summon.isPet()) @@ -142,24 +134,19 @@ public class PetInfo implements IClientOutgoingPacket } packet.writeD(-1); // High Five NPCString ID packet.writeS(_summon.getTitle()); // owner name - packet.writeC(_summon.getPvpFlag()); // confirmed packet.writeD(_summon.getReputation()); // confirmed - packet.writeD(_curFed); // how fed it is packet.writeD(_maxFed); // max fed it can be packet.writeD((int) _summon.getCurrentHp()); // current hp packet.writeD(_summon.getMaxHp()); // max hp packet.writeD((int) _summon.getCurrentMp()); // current mp packet.writeD(_summon.getMaxMp()); // max mp - packet.writeQ(_summon.getStat().getSp()); // sp packet.writeH(_summon.getLevel()); // level packet.writeQ(_summon.getStat().getExp()); - // 0% absolute value packet.writeQ(Math.min(_summon.getExpForThisLevel(), _summon.getStat().getExp())); // 0% absolute value - packet.writeQ(_summon.getExpForNextLevel()); // 100% absoulte value packet.writeD(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight packet.writeD(_summon.getMaxLoad()); // max weight it can carry @@ -176,12 +163,10 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD((int) _summon.getStat().getMoveSpeed()); // speed packet.writeD(_summon.getPAtkSpd()); // atkspeed packet.writeD(_summon.getMAtkSpd()); // casting speed - packet.writeC(0); // TODO: Check me, might be ride status packet.writeC(_summon.getTeam().getId()); // Confirmed packet.writeC(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed packet.writeC(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed - packet.writeD(-1); packet.writeD(0); final Set aves = _summon.getEffectList().getCurrentAbnormalVisualEffects(); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java index f45d3262ac..19688209cb 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java @@ -47,7 +47,6 @@ public class PetInventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.PET_INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java index cd0744b2c4..80e9863809 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java @@ -36,7 +36,6 @@ public class PetItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusShow.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusShow.java index 68143367e8..d2e571e518 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusShow.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusShow.java @@ -39,7 +39,6 @@ public class PetStatusShow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_SHOW.writeId(packet); - packet.writeD(_summonType); packet.writeD(_summonObjectId); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusUpdate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusUpdate.java index c29dec61c1..9f1edddf54 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusUpdate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusUpdate.java @@ -53,7 +53,6 @@ public class PetStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_UPDATE.writeId(packet); - packet.writeD(_summon.getSummonType()); packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getX()); @@ -70,7 +69,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket packet.writeQ(_summon.getStat().getExp()); packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value packet.writeQ(_summon.getExpForNextLevel()); // 100% absolute value - packet.writeD(0x01); // TODO: Find me! + packet.writeD(1); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeClassicRaidInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeClassicRaidInfo.java index 36168fb35d..df5be64f25 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeClassicRaidInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeClassicRaidInfo.java @@ -39,7 +39,6 @@ public class ExPledgeClassicRaidInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_CLASSIC_RAID_INFO.writeId(packet); - if (_clan == null) { packet.writeD(0); @@ -48,7 +47,6 @@ public class ExPledgeClassicRaidInfo implements IClientOutgoingPacket { final int stage = GlobalVariablesManager.getInstance().getInt(GlobalVariablesManager.MONSTER_ARENA_VARIABLE + _clan.getId(), 0); packet.writeD(stage); - // Skill rewards. packet.writeD(5); for (int i = 1; i <= 5; i++) @@ -57,7 +55,6 @@ public class ExPledgeClassicRaidInfo implements IClientOutgoingPacket packet.writeD(i); } } - return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java index 43f7f9a362..cc69c4af1e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java @@ -34,12 +34,12 @@ public class ExPledgeBonusList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_BONUS_LIST.writeId(packet); - packet.writeC(0x00); // 140 + packet.writeC(0); // 140 ClanRewardData.getInstance().getClanRewardBonuses(ClanRewardType.MEMBERS_ONLINE).stream().sorted(Comparator.comparingInt(ClanRewardBonus::getLevel)).forEach(bonus -> { packet.writeD(bonus.getSkillReward().getSkillId()); }); - packet.writeC(0x00); // 140 + packet.writeC(0); // 140 ClanRewardData.getInstance().getClanRewardBonuses(ClanRewardType.HUNTING_MONSTERS).stream().sorted(Comparator.comparingInt(ClanRewardBonus::getLevel)).forEach(bonus -> { packet.writeD(bonus.getSkillReward().getSkillId()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java index 25fa9b94e2..3db1b1c11b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java @@ -50,7 +50,6 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Player: " + _player + " attempting to write to a null clan!"); return false; } - final ClanRewardBonus highestMembersOnlineBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.MEMBERS_ONLINE); final ClanRewardBonus highestHuntingBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.HUNTING_MONSTERS); final ClanRewardBonus membersOnlineBonus = ClanRewardType.MEMBERS_ONLINE.getAvailableBonus(clan); @@ -75,25 +74,22 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Couldn't find skill reward for highest available hunting bonus!!"); return false; } - // General OP Code OutgoingPackets.EX_PLEDGE_BONUS_OPEN.writeId(packet); - // Members online bonus packet.writeD(highestMembersOnlineBonus.getRequiredAmount()); packet.writeD(clan.getMaxOnlineMembers()); - packet.writeC(0x02); // 140 - packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0x00); - packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 0x01 : 0x00); - + packet.writeC(2); // 140 + packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0); + packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 1 : 0); // Hunting bonus packet.writeD(highestHuntingBonus.getRequiredAmount()); packet.writeD(clan.getHuntingPoints()); - packet.writeC(0x02); // 140 - packet.writeD(huntingBonus != null ? highestHuntingBonus.getSkillReward().getSkillId() : 0x00); - packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 0x01 : 0x00); + packet.writeC(2); // 140 + packet.writeD(huntingBonus != null ? highestHuntingBonus.getSkillReward().getSkillId() : 0); + packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgedonation/ExPledgeContributionList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgedonation/ExPledgeContributionList.java index d4f7953ec1..21020e8d87 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgedonation/ExPledgeContributionList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/pledgedonation/ExPledgeContributionList.java @@ -39,7 +39,6 @@ public class ExPledgeContributionList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_CONTRIBUTION_LIST.writeId(packet); - packet.writeD(_contributors.size()); for (ClanMember contributor : _contributors) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index fb735b8925..e75426e598 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -69,7 +69,6 @@ public class ExBRBuyProduct implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUY_PRODUCT.writeId(packet); - packet.writeD(_reply); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java index 742b3eba9d..91a186b81d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java @@ -39,10 +39,9 @@ public class ExBRGamePoint implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_GAME_POINT.writeId(packet); - packet.writeD(_charId); packet.writeQ(_charPoints); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java index 50f21df46a..e36f2ff502 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java @@ -45,7 +45,6 @@ public class ExBRProductInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_INFO.writeId(packet); - packet.writeD(_item.getBrId()); packet.writeD(_item.getPrice()); packet.writeD(_item.getItems().size()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java index dc851ffd43..0f042ba043 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java @@ -45,9 +45,8 @@ public class ExBRProductList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); // Adena - packet.writeQ(0x00); // Hero coins + packet.writeQ(0); // Hero coins packet.writeC(_type); // Type 0 - Home, 1 - History, 2 - Favorites packet.writeD(_primeList.size()); for (PrimeShopGroup brItem : _primeList) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java index 320140ace6..bf67164bfe 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java @@ -39,7 +39,6 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RAID_BOSS_SPAWN_INFO.writeId(packet); - packet.writeD(_statuses.size()); // count for (Entry entry : _statuses.entrySet()) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftExtract.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftExtract.java index 5d082bad06..0ec53792ce 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftExtract.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftExtract.java @@ -33,7 +33,7 @@ public class ExCraftExtract implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CRAFT_EXTRACT.writeId(packet); - packet.writeC(0x00); + packet.writeC(0); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftInfo.java index 24b3008866..b9dc4c096c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftInfo.java @@ -38,12 +38,10 @@ public class ExCraftInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CRAFT_INFO.writeId(packet); - final PlayerRandomCraft rc = _player.getRandomCraft(); packet.writeD(rc.getFullCraftPoints()); // Full points owned packet.writeD(rc.getCraftPoints()); // Craft Points (10k = 1%) - packet.writeC(rc.isSayhaRoll() ? 0x01 : 0x00); // Will get sayha? - + packet.writeC(rc.isSayhaRoll() ? 1 : 0); // Will get sayha? return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomInfo.java index 4d0da6f059..638956b1c5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomInfo.java @@ -40,7 +40,6 @@ public class ExCraftRandomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CRAFT_RANDOM_INFO.writeId(packet); - final List rewards = _player.getRandomCraft().getRewards(); int size = 5; packet.writeD(size); // size @@ -49,30 +48,28 @@ public class ExCraftRandomInfo implements IClientOutgoingPacket final RandomCraftRewardItemHolder holder = rewards.get(i); if ((holder != null) && (holder.getItemId() != 0)) { - packet.writeC(holder.isLocked() ? 0x01 : 0x00); // Locked + packet.writeC(holder.isLocked() ? 1 : 0); // Locked packet.writeD(holder.getLockLeft()); // Rolls it will stay locked packet.writeD(holder.getItemId()); // Item id packet.writeQ(holder.getItemCount()); // Item count } else { - packet.writeC(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeQ(0x00); + packet.writeC(0); + packet.writeD(0); + packet.writeD(0); + packet.writeQ(0); } size--; } - // Write missing for (int i = size; i > 0; i--) { - packet.writeC(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeQ(0x00); + packet.writeC(0); + packet.writeD(0); + packet.writeD(0); + packet.writeQ(0); } - return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomLockSlot.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomLockSlot.java index d4f6f05a0c..206d10c5f1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomLockSlot.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomLockSlot.java @@ -33,7 +33,7 @@ public class ExCraftRandomLockSlot implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CRAFT_RANDOM_LOCK_SLOT.writeId(packet); - packet.writeC(0x00); + packet.writeC(0); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomMake.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomMake.java index 9b82b3d21e..1da2dae3c9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomMake.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomMake.java @@ -38,11 +38,11 @@ public class ExCraftRandomMake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CRAFT_RANDOM_MAKE.writeId(packet); - packet.writeC(0x00); // Close window + packet.writeC(0); // Close window packet.writeH(0x0F); // Unknown packet.writeD(_itemId); packet.writeQ(_itemCount); - packet.writeC(0x00); // Enchantment level + packet.writeC(0); // Enchantment level return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomRefresh.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomRefresh.java index 8ffe0f4ede..084eeb46d3 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomRefresh.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomRefresh.java @@ -33,7 +33,7 @@ public class ExCraftRandomRefresh implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CRAFT_RANDOM_REFRESH.writeId(packet); - packet.writeC(0x00); + packet.writeC(0); return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java index d1896f32a7..5c835c1dea 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java @@ -47,7 +47,6 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_HERO_AND_LEGEND_INFO.writeId(packet); - if (!Hero.getInstance().getHeroes().isEmpty()) { try (Connection con = DatabaseFactory.getConnection(); @@ -63,7 +62,6 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket { packet.writeC(1); // ?? shows 78 on JP packet.writeC(1); // ?? shows 0 on JP - packet.writeString(rset.getString("char_name")); final int clanId = rset.getInt("clanid"); if (clanId > 0) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java index b7395dee4e..3e7261542a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java @@ -55,7 +55,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MY_RANKING_INFO.writeId(packet); - final Date date = new Date(); final Calendar calendar = new GregorianCalendar(); calendar.setTime(date); @@ -99,7 +98,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket { PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } - int previousPlace = 0; int previousWins = 0; int previousLoses = 0; @@ -128,7 +126,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket { PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } - int heroCount = 0; int legendCount = 0; if (Hero.getInstance().getCompleteHeroes().containsKey(_player.getObjectId())) @@ -137,7 +134,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket heroCount = hero.getInt("count", 0); legendCount = hero.getInt("legend_count", 0); } - packet.writeD(year); // Year packet.writeD(month); // Month packet.writeD(Math.min(Olympiad.getInstance().getCurrentCycle() - 1, 0)); // cycle ? diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java index bad88659b0..db5efac89a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java @@ -64,20 +64,17 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_RANKING_INFO.writeId(packet); - packet.writeC(_tabId); // Tab id packet.writeC(_rankingType); // ranking type packet.writeC(_unk); // unk, shows 1 all time packet.writeD(_classId); // class id (default 148) or caller class id for personal rank packet.writeD(_serverId); // 0 - all servers, server id - for caller server packet.writeD(933); // unk, 933 all time - if (!_playerList.isEmpty()) { final RankingOlympiadCategory category = RankingOlympiadCategory.values()[_tabId]; writeFilteredRankingData(packet, category, category.getScopeByGroup(_rankingType), ClassId.getClassId(_classId)); } - return true; } @@ -100,10 +97,8 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket private void writeScopeData(PacketWriter packet, RankingOlympiadScope scope, List> list, List> snapshot) { - Entry playerData = list.stream().filter(it -> it.getValue().getInt("charId", 0) == _player.getObjectId()).findFirst().orElse(null); final int indexOf = list.indexOf(playerData); - final List> limited; switch (scope) { @@ -132,9 +127,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket limited = Collections.emptyList(); } } - packet.writeD(limited.size()); - int rank = 1; for (Entry data : limited.stream().sorted(Entry.comparingByKey()).collect(Collectors.toList())) { @@ -143,7 +136,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket packet.writeString(player.getString("name")); // name packet.writeString(player.getString("clanName")); // clan name packet.writeD(scope == RankingOlympiadScope.SELF ? data.getKey() : curRank); // rank - if (!snapshot.isEmpty()) { int snapshotRank = 1; @@ -160,7 +152,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket { packet.writeD(scope == RankingOlympiadScope.SELF ? data.getKey() : curRank); } - packet.writeD(Config.SERVER_ID); // server id packet.writeD(player.getInt("level")); // level packet.writeD(player.getInt("classId")); // class id diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPetRankingList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPetRankingList.java index 1530d22cc2..8fd721e11a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPetRankingList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPetRankingList.java @@ -60,13 +60,11 @@ public class ExPetRankingList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PET_RANKING_LIST.writeId(packet); - packet.writeC(_season); packet.writeC(_tabId); packet.writeC(_type); packet.writeD(_race); packet.writeC(0); - if (!_playerList.isEmpty() && (_type != 255) && (_race != 255)) { final RankingCategory category = RankingCategory.values()[_season]; @@ -76,7 +74,6 @@ public class ExPetRankingList implements IClientOutgoingPacket { packet.writeD(0); } - return true; } @@ -111,7 +108,6 @@ public class ExPetRankingList implements IClientOutgoingPacket { Entry playerData = list.stream().filter(it -> it.getValue().getInt("charId", 0) == _player.getObjectId()).findFirst().orElse(null); final int indexOf = list.indexOf(playerData); - final List> limited; switch (scope) { @@ -140,9 +136,7 @@ public class ExPetRankingList implements IClientOutgoingPacket limited = Collections.emptyList(); } } - packet.writeD(limited.size()); - int rank = 1; for (Entry data : limited.stream().sorted(Entry.comparingByKey()).collect(Collectors.toList())) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPledgeRankingList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPledgeRankingList.java index 363ba2eff3..2af1892fa7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPledgeRankingList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPledgeRankingList.java @@ -67,13 +67,10 @@ public class ExPledgeRankingList implements IClientOutgoingPacket private void writeScopeData(PacketWriter packet, boolean isTop150, List> list, List> snapshot) { - Entry playerData = list.stream().filter(it -> it.getValue().getInt("clan_id", 0) == _player.getClanId()).findFirst().orElse(null); final int indexOf = list.indexOf(playerData); final List> limited = isTop150 ? list.stream().limit(150).collect(Collectors.toList()) : playerData == null ? Collections.emptyList() : list.subList(Math.max(0, indexOf - 10), Math.min(list.size(), indexOf + 10)); - packet.writeD(limited.size()); - int rank = 1; for (Entry data : limited.stream().sorted(Entry.comparingByKey()).collect(Collectors.toList())) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingList.java index ad8f5d0034..164286d6f1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingList.java @@ -114,10 +114,8 @@ public class ExPvpRankingList implements IClientOutgoingPacket private void writeScopeData(PacketWriter packet, RankingScope scope, List> list, List> snapshot) { - Entry playerData = list.stream().filter(it -> it.getValue().getInt("charId", 0) == _player.getObjectId()).findFirst().orElse(null); final int indexOf = list.indexOf(playerData); - final List> limited; switch (scope) { @@ -146,9 +144,7 @@ public class ExPvpRankingList implements IClientOutgoingPacket limited = Collections.emptyList(); } } - packet.writeD(limited.size()); - int rank = 1; for (Entry data : limited.stream().sorted(Entry.comparingByKey()).collect(Collectors.toList())) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java index 3b3728f090..f2e96db6b1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java @@ -48,7 +48,6 @@ public class ExRankingCharInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RANKING_CHAR_INFO.writeId(packet); - if (!_playerList.isEmpty()) { for (Integer id : _playerList.keySet()) @@ -59,7 +58,6 @@ public class ExRankingCharInfo implements IClientOutgoingPacket packet.writeD(id); // server rank packet.writeD(player.getInt("raceRank")); // race rank packet.writeD(player.getInt("classRank")); // class rank - for (Integer id2 : _snapshotList.keySet()) { final StatSet snapshot = _snapshotList.get(id2); @@ -68,7 +66,7 @@ public class ExRankingCharInfo implements IClientOutgoingPacket packet.writeD(id2); // server rank snapshot packet.writeD(snapshot.getInt("raceRank")); // race rank snapshot packet.writeD(snapshot.getInt("classRank")); // class rank snapshot - packet.writeD(0); + packet.writeD(0); packet.writeD(0); packet.writeD(0); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java index f89d104f27..54de929cd5 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java @@ -55,12 +55,10 @@ public class ExRankingCharRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RANKING_CHAR_RANKERS.writeId(packet); - packet.writeC(_group); packet.writeC(_scope); packet.writeD(_race); packet.writeD(_player.getClassId().getId()); - if (!_playerList.isEmpty()) { switch (_group) @@ -71,7 +69,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket { final int count = _playerList.size() > 150 ? 150 : _playerList.size(); packet.writeD(count); - for (Integer id : _playerList.keySet()) { final StatSet player = _playerList.get(id); @@ -130,7 +127,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket packet.writeD(plr.getInt("classId")); packet.writeD(plr.getInt("race")); packet.writeD(id2); // server rank - if (!_snapshotList.isEmpty()) { for (Integer id3 : _snapshotList.keySet()) @@ -168,7 +164,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } } packet.writeD(count > 100 ? 100 : count); - int i = 1; for (Integer id : _playerList.keySet()) { @@ -218,7 +213,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket else { boolean found = false; - final Map raceList = new ConcurrentHashMap<>(); int i = 1; for (Integer id : _playerList.keySet()) @@ -230,7 +224,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket i++; } } - for (Integer id : raceList.keySet()) { final StatSet player = raceList.get(id); @@ -284,9 +277,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket i++; } } - packet.writeD(clanList.size()); - for (Integer id : clanList.keySet()) { final StatSet player = clanList.get(id); @@ -342,9 +333,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } } friendList.add(_player.getObjectId()); - packet.writeD(count); - for (int id : _playerList.keySet()) { final StatSet player = _playerList.get(id); @@ -381,7 +370,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket else { packet.writeD(1); - packet.writeString(_player.getName()); if (_player.getClan() != null) { @@ -431,7 +419,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } } packet.writeD(count > 100 ? 100 : count); - int i = 1; for (Integer id : _playerList.keySet()) { @@ -481,7 +468,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket else { boolean found = false; - final Map raceList = new ConcurrentHashMap<>(); int i = 1; for (Integer id : _playerList.keySet()) @@ -493,7 +479,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket i++; } } - for (Integer id : raceList.keySet()) { final StatSet player = raceList.get(id); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java index 2463589c81..c09b3e899d 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java @@ -47,18 +47,15 @@ public class ExFlyMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_mapId); - packet.writeD(_locations.size()); for (SayuneEntry loc : _locations) { packet.writeD(loc.getId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(loc.getX()); packet.writeD(loc.getY()); packet.writeD(loc.getZ()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java index 03fc6b580d..70b3fb25d2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java @@ -47,16 +47,13 @@ public class ExFlyMoveBroadcast implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE_BROADCAST.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); packet.writeD(_mapId); - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD(_currentLoc.getX()); packet.writeD(_currentLoc.getY()); packet.writeD(_currentLoc.getZ()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java index cfe11a27e0..49e5d86910 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java @@ -35,7 +35,6 @@ public class ExNotifyFlyMoveStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_FLY_MOVE_START.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java index d5640a47ef..0efa37ae8c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java @@ -51,7 +51,6 @@ public class ExMoveToLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_SUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_targetX); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java index 0cbe2c3e02..a0314c39aa 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java @@ -46,7 +46,6 @@ public class ExShuttleGetOff implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_OFF.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_x); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java index 5211bef5ba..061bcafed9 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java @@ -43,7 +43,6 @@ public class ExShuttleGetOn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_ON.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java index 97d54a9019..c8aee1fde7 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java @@ -43,7 +43,6 @@ public class ExShuttleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHUTTLE_INFO.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD(_shuttle.getX()); packet.writeD(_shuttle.getY()); @@ -60,8 +59,8 @@ public class ExShuttleInfo implements IClientOutgoingPacket packet.writeD(loc.getY()); packet.writeD(loc.getZ()); } - packet.writeD(stop.isDoorOpen() ? 0x01 : 0x00); - packet.writeD(stop.hasDoorChanged() ? 0x01 : 0x00); + packet.writeD(stop.isDoorOpen() ? 1 : 0); + packet.writeD(stop.hasDoorChanged() ? 1 : 0); } return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java index 6ba38f29a1..28b33b998e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java @@ -43,7 +43,6 @@ public class ExShuttleMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_MOVE.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD((int) _shuttle.getStat().getMoveSpeed()); packet.writeD((int) _shuttle.getStat().getRotationSpeed()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java index bf2b6ea6eb..6c31189d6a 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java @@ -44,7 +44,6 @@ public class ExStopMoveInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_SHUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java index f7f6849732..8492f42a6e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java @@ -44,7 +44,6 @@ public class ExValidateLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_SHUTTLE.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExShowSharingLocationUi.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExShowSharingLocationUi.java index ace3c3deeb..4f9698963c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExShowSharingLocationUi.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExShowSharingLocationUi.java @@ -35,7 +35,6 @@ public class ExShowSharingLocationUi implements IClientOutgoingPacket @Override public boolean write(PacketWriter packet) { - OutgoingPackets.EX_SHARED_POSITION_SHARING_UI.writeId(packet); packet.writeQ(Config.SHARING_LOCATION_COST); return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExTeleportFavoritesList.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExTeleportFavoritesList.java index 0f68a71088..6bd6a492d2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExTeleportFavoritesList.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExTeleportFavoritesList.java @@ -42,14 +42,12 @@ public class ExTeleportFavoritesList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_FAVORITES_LIST.writeId(packet); - - packet.writeC(_enable ? 0x01 : 0x00); + packet.writeC(_enable ? 1 : 0); packet.writeD(_teleports.size()); for (int id : _teleports) { packet.writeD(id); } - return true; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java index 1d59c6d002..e7654ed911 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java @@ -60,7 +60,7 @@ public class AccountKicked implements IOutgoingPacket { OutgoingPackets.ACCOUNT_KICKED.writeId(packet); packet.writeD(_reason.getCode()); - return true; } } + diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 2e3a1f6163..1fe813e393 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: response + * Format: d d: response */ public class GGAuth implements IOutgoingPacket { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/network/serverpackets/Init.java index 4b3f71f30e..d725f45ca2 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/network/serverpackets/Init.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/network/serverpackets/Init.java @@ -52,7 +52,6 @@ public class Init implements IOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.INIT.writeId(packet); - packet.writeD(_sessionId); // session id packet.writeD(0x0000c621); // protocol revision diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index 8c534554a8..f4dcd22b00 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: the failure reason + * Format: d d: the failure reason */ public class LoginFail implements IOutgoingPacket { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/commons/network/BaseRecievePacket.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/commons/network/BaseRecievePacket.java index c682cb741d..a6ed15ce32 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/commons/network/BaseRecievePacket.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/commons/network/BaseRecievePacket.java @@ -73,7 +73,7 @@ public abstract class BaseRecievePacket try { result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE); - result = result.substring(0, result.indexOf(0x00)); + result = result.substring(0, result.indexOf(0)); _off += (result.length() * 2) + 2; } catch (Exception e) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/commons/network/BaseSendablePacket.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/commons/network/BaseSendablePacket.java index a9d918de4c..8fa8491cbf 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/commons/network/BaseSendablePacket.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/commons/network/BaseSendablePacket.java @@ -117,16 +117,16 @@ public abstract class BaseSendablePacket public byte[] getBytes() { // if (this instanceof Init) - // writeD(0x00); // reserve for XOR initial key + // writeD(0); // reserve for XOR initial key - writeD(0x00); // reserve for checksum + writeD(0); // reserve for checksum final int padding = _bao.size() % 8; if (padding != 0) { for (int i = padding; i < 8; i++) { - writeC(0x00); + writeC(0); } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/AttackType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/AttackType.java index 6064b10ed7..e9983f15e3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/AttackType.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/AttackType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum AttackType { - MISSED(0x01), - BLOCKED(0x02), - CRITICAL(0x04), - SHOT_USED(0x08); + MISSED(1), + BLOCKED(2), + CRITICAL(4), + SHOT_USED(8); private final int _mask; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/GroupType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/GroupType.java index 954aaace8b..916a14fd05 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/GroupType.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/GroupType.java @@ -23,9 +23,9 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum GroupType implements IUpdateTypeComponent { - NONE(0x01), - PARTY(0x02), - COMMAND_CHANNEL(0x04); + NONE(1), + PARTY(2), + COMMAND_CHANNEL(4); private int _mask; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/ItemListType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/ItemListType.java index 35ad11dd07..9dd765e702 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/ItemListType.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/ItemListType.java @@ -23,13 +23,13 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum ItemListType implements IUpdateTypeComponent { - AUGMENT_BONUS(0x01), - ELEMENTAL_ATTRIBUTE(0x02), - ENCHANT_EFFECT(0x04), - VISUAL_ID(0x08), - SOUL_CRYSTAL(0x10), - EVOLVE(0x80), - BLESSED(0x100); + AUGMENT_BONUS(1), + ELEMENTAL_ATTRIBUTE(2), + ENCHANT_EFFECT(4), + VISUAL_ID(8), + SOUL_CRYSTAL(16), + EVOLVE(128), + BLESSED(256); private final int _mask; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java index b3d08596c6..29403b783d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/MacroUpdateType.java @@ -21,10 +21,10 @@ package org.l2jmobius.gameserver.enums; */ public enum MacroUpdateType { - ADD(0x01), - LIST(0x01), - MODIFY(0x02), - DELETE(0x00); + ADD(1), + LIST(1), + MODIFY(2), + DELETE(0); private final int _id; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java index 86c6159869..7776721c0f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/enums/PartySmallWindowUpdateType.java @@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.model.interfaces.IUpdateTypeComponent; */ public enum PartySmallWindowUpdateType implements IUpdateTypeComponent { - CURRENT_CP(0x01), - MAX_CP(0x02), - CURRENT_HP(0x04), - MAX_HP(0x08), - CURRENT_MP(0x10), - MAX_MP(0x20), - LEVEL(0x40), - CLASS_ID(0x80), - PARTY_SUBSTITUTE(0x100), - VITALITY_POINTS(0x200); + CURRENT_CP(1), + MAX_CP(2), + CURRENT_HP(4), + MAX_HP(8), + CURRENT_MP(16), + MAX_MP(32), + LEVEL(64), + CLASS_ID(128), + PARTY_SUBSTITUTE(256), + VITALITY_POINTS(512); private final int _mask; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 00bb331778..667ce7f17c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.util.Broadcast; import org.l2jmobius.gameserver.util.Util; /** - * Fromat:(ch) dddddc + * Format:(ch) dddddc * @author -Wooden- */ public class RequestExMagicSkillUseGround implements IClientIncomingPacket diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java index 8744393432..033095e74d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AbnormalStatusUpdate.java @@ -39,7 +39,6 @@ public class AbnormalStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ABNORMAL_STATUS_UPDATE.writeId(packet); - packet.writeH(_effects.size()); for (BuffInfo info : _effects) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java index 1b8ddb2042..bec794bef3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java @@ -44,7 +44,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; } @@ -60,7 +59,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { throw new IllegalArgumentException(); } - _npcObjId = npcObjId; setHtml(html); } @@ -77,13 +75,11 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Html is too long! this will crash the client!"); _html = html.substring(0, 17200); } - if (!html.contains(""; return; } - _html = html; } @@ -96,7 +92,6 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket PacketLogger.warning(getClass().getSimpleName() + ": Missing html page " + path); return false; } - setHtml(content); return true; } @@ -138,12 +133,10 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket { player.clearHtmlActions(getScope()); } - if (_disabledValidation) { return; } - if (player != null) { Util.buildHtmlActionCache(player, getScope(), _npcObjId, _html); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index c1843be93c..e70fd93427 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -72,7 +72,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket= 0) || (item.getAttributeDefence(AttributeType.FIRE) > 0) || (item.getAttributeDefence(AttributeType.WATER) > 0) || (item.getAttributeDefence(AttributeType.WIND) > 0) || (item.getAttributeDefence(AttributeType.EARTH) > 0) || (item.getAttributeDefence(AttributeType.HOLY) > 0) || (item.getAttributeDefence(AttributeType.DARK) > 0)) { mask |= ItemListType.ELEMENTAL_ATTRIBUTE.getMask(); } - if (item.getEnchantOptions() != null) { for (int id : item.getEnchantOptions()) @@ -205,27 +199,22 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket 0) { mask |= ItemListType.VISUAL_ID.getMask(); } - if (((item.getSoulCrystalOptions() != null) && !item.getSoulCrystalOptions().isEmpty()) || ((item.getSoulCrystalSpecialOptions() != null) && !item.getSoulCrystalSpecialOptions().isEmpty())) { mask |= ItemListType.SOUL_CRYSTAL.getMask(); } - if (item.getPetData() != null) { mask |= ItemListType.EVOLVE.getMask(); } - if (item.isBlessed()) { mask |= ItemListType.BLESSED.getMask(); } - return mask; } @@ -293,7 +282,6 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket removeSkills = skill.getRemoveSkills().stream().map(_player::getKnownSkill).filter(Objects::nonNull).collect(Collectors.toList()); packet.writeC(removeSkills.size()); for (Skill removed : removeSkills) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java index 8fa6259f64..6451dffd02 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ActionFailed.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ActionFailed implements IClientOutgoingPacket { public static final ActionFailed STATIC_PACKET = new ActionFailed(); - private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); + private static final Map STATIC_PACKET_BY_CASTING_TYPE = new EnumMap<>(SkillCastingType.class); static { for (SkillCastingType castingType : SkillCastingType.values()) @@ -57,7 +57,6 @@ public class ActionFailed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ACTION_FAIL.writeId(packet); - packet.writeD(_castingType); // MagicSkillUse castingType return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java index 6e868368c9..30ce58da60 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AgitDecoInfo.java @@ -44,9 +44,8 @@ public class AgitDecoInfo implements IClientOutgoingPacket { continue; } - packet.writeC(_residense.hasFunction(type) ? 0x01 : 0x00); + packet.writeC(_residense.hasFunction(type) ? 1 : 0); } - // Unknown packet.writeD(0); // TODO: Find me! packet.writeD(0); // TODO: Find me! diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java index 6cb71fc985..4683fb30f0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AllianceInfo.java @@ -44,7 +44,6 @@ public class AllianceInfo implements IClientOutgoingPacket _name = leader.getAllyName(); _leaderC = leader.getName(); _leaderP = leader.getLeaderName(); - final Collection allies = ClanTable.getInstance().getClanAllies(allianceId); _allies = new ClanInfo[allies.size()]; int idx = 0; @@ -57,7 +56,6 @@ public class AllianceInfo implements IClientOutgoingPacket total += ci.getTotal(); online += ci.getOnline(); } - _total = total; _online = online; } @@ -66,18 +64,16 @@ public class AllianceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ALLIANCE_INFO.writeId(packet); - packet.writeS(_name); packet.writeD(_total); packet.writeD(_online); packet.writeS(_leaderC); packet.writeS(_leaderP); - packet.writeD(_allies.length); for (ClanInfo aci : _allies) { packet.writeS(aci.getClan().getName()); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(aci.getClan().getLevel()); packet.writeS(aci.getClan().getLeaderName()); packet.writeD(aci.getTotal()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java index 6218f1717f..1ae4653f91 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinAlly.java @@ -38,7 +38,6 @@ public class AskJoinAlly implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_ALLIANCE.writeId(packet); - packet.writeD(_requestorObjId); packet.writeS(null); // Ally Name ? packet.writeS(null); // TODO: Find me! diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java index a66bb3cd33..b9cfbe81b9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AskJoinParty.java @@ -39,7 +39,6 @@ public class AskJoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ASK_JOIN_PARTY.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java index 05c420ff59..227ab571be 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Attack.java @@ -45,7 +45,6 @@ public class Attack implements IClientOutgoingPacket _attackerObjId = attacker.getObjectId(); _attackerLoc = new Location(attacker); _targetLoc = new Location(target); - final Player player = attacker.getActingPlayer(); if (player == null) { @@ -111,7 +110,6 @@ public class Attack implements IClientOutgoingPacket final Iterator it = _hits.iterator(); final Hit firstHit = it.next(); OutgoingPackets.ATTACK.writeId(packet); - packet.writeD(_attackerObjId); packet.writeD(firstHit.getTargetId()); packet.writeD(_soulshotVisualSubstitute); // Ertheia @@ -121,13 +119,11 @@ public class Attack implements IClientOutgoingPacket packet.writeD(_attackerLoc.getX()); packet.writeD(_attackerLoc.getY()); packet.writeD(_attackerLoc.getZ()); - packet.writeH(_hits.size() - 1); while (it.hasNext()) { writeHit(packet, it.next()); } - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java index bd6878eb42..8b85fe85e3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStart.java @@ -35,7 +35,6 @@ public class AutoAttackStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_START.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java index e767d1877a..a294b1e212 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/AutoAttackStop.java @@ -35,7 +35,6 @@ public class AutoAttackStop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.AUTO_ATTACK_STOP.writeId(packet); - packet.writeD(_targetObjId); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java index 3f329415df..0c79677eae 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/BlockListPacket.java @@ -38,7 +38,6 @@ public class BlockListPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BLOCK_LIST.writeId(packet); - packet.writeD(_playersId.size()); for (int playerId : _playersId) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index f610cdc6aa..d95f0543b9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -45,8 +45,7 @@ public class BuyList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x00); // Type BUY + packet.writeD(0); // Type BUY packet.writeQ(_money); // current money packet.writeD(_listId); packet.writeD(_inventorySlots); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java index cd25af908d..7cb2bf4425 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/BuyListSeed.java @@ -50,36 +50,34 @@ public class BuyListSeed implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.BUY_LIST_SEED.writeId(packet); - packet.writeQ(_money); // current money - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeD(_manorId); // manor id - if (!_list.isEmpty()) { packet.writeH(_list.size()); // list length for (SeedProduction s : _list) { - packet.writeC(0x00); // mask item 0 to print minimal item information + packet.writeC(0); // mask item 0 to print minimal item information packet.writeD(s.getId()); // ObjectId packet.writeD(s.getId()); // ItemId packet.writeC(0xFF); // T1 packet.writeQ(s.getAmount()); // Quantity - packet.writeC(0x05); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item - packet.writeC(0x00); // Filler (always 0) - packet.writeH(0x00); // Equipped : 00-No, 01-yes - packet.writeQ(0x00); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand - packet.writeH(0x00); // Enchant level (pet level shown in control item) + packet.writeC(5); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item + packet.writeC(0); // Filler (always 0) + packet.writeH(0); // Equipped : 00-No, 01-yes + packet.writeQ(0); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand + packet.writeH(0); // Enchant level (pet level shown in control item) packet.writeD(-1); packet.writeD(-9999); - packet.writeC(0x01); // GOD Item enabled = 1 disabled (red) = 0 + packet.writeC(1); // GOD Item enabled = 1 disabled (red) = 0 packet.writeQ(s.getPrice()); // price } _list.clear(); } else { - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java index 3a7b67af23..f3dc872dca 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CSShowComBoard.java @@ -32,8 +32,7 @@ public class CSShowComBoard implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SHOW_BOARD.writeId(packet); - - packet.writeC(0x01); // c4 1 to show community 00 to hide + packet.writeC(1); // c4 1 to show community 00 to hide packet.writeB(_html); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java index eacc27aa07..b18dac4cc3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CameraMode.java @@ -36,7 +36,6 @@ public class CameraMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CAMERA_MODE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java index 1682f5bc62..adea754676 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ChairSit.java @@ -39,7 +39,6 @@ public class ChairSit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAIR_SIT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_staticObjectId); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java index 2bc31a285a..de141fa067 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java @@ -38,7 +38,6 @@ public class ChangeMoveType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_MOVE_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_running ? RUN : WALK); packet.writeD(0); // c2 diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java index 73277d923d..fbe5e39e2e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ChangeWaitType.java @@ -22,17 +22,17 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ChangeWaitType implements IClientOutgoingPacket { + public static final int WT_SITTING = 0; + public static final int WT_STANDING = 1; + public static final int WT_START_FAKEDEATH = 2; + public static final int WT_STOP_FAKEDEATH = 3; + private final int _objectId; private final int _moveType; private final int _x; private final int _y; private final int _z; - public static final int WT_SITTING = 0; - public static final int WT_STANDING = 1; - public static final int WT_START_FAKEDEATH = 2; - public static final int WT_STOP_FAKEDEATH = 3; - public ChangeWaitType(Creature creature, int newMoveType) { _objectId = creature.getObjectId(); @@ -46,7 +46,6 @@ public class ChangeWaitType implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHANGE_WAIT_TYPE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_moveType); packet.writeD(_x); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java index 41180bac50..aa2e7b2eaa 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java @@ -30,7 +30,6 @@ public class CharCreateFail implements IClientOutgoingPacket public static final int REASON_CREATE_NOT_ALLOWED = 0x05; // "Characters cannot be created from this server." public static final int REASON_CHOOSE_ANOTHER_SVR = 0x06; // "Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please // choose another server." - private final int _error; public CharCreateFail(int errorCode) @@ -42,7 +41,6 @@ public class CharCreateFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java index f0e99885ad..768617e558 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateOk.java @@ -31,8 +31,7 @@ public class CharCreateOk implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_CREATE_SUCCESS.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java index bed289ca0a..1674eef343 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharDeleteFail.java @@ -33,7 +33,6 @@ public class CharDeleteFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_DELETE_FAIL.writeId(packet); - packet.writeD(_error); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index c55485256f..ef26a54c08 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -35,6 +35,22 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { + private static final int[] PAPERDOLL_ORDER = new int[] + { + Inventory.PAPERDOLL_UNDER, + Inventory.PAPERDOLL_HEAD, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_LHAND, + Inventory.PAPERDOLL_GLOVES, + Inventory.PAPERDOLL_CHEST, + Inventory.PAPERDOLL_LEGS, + Inventory.PAPERDOLL_FEET, + Inventory.PAPERDOLL_CLOAK, + Inventory.PAPERDOLL_RHAND, + Inventory.PAPERDOLL_HAIR, + Inventory.PAPERDOLL_HAIR2 + }; + private final Player _player; private final Clan _clan; private int _objId; @@ -57,22 +73,6 @@ public class CharInfo implements IClientOutgoingPacket private int _vehicleId = 0; private final boolean _gmSeeInvis; - private static final int[] PAPERDOLL_ORDER = new int[] - { - Inventory.PAPERDOLL_UNDER, - Inventory.PAPERDOLL_HEAD, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_LHAND, - Inventory.PAPERDOLL_GLOVES, - Inventory.PAPERDOLL_CHEST, - Inventory.PAPERDOLL_LEGS, - Inventory.PAPERDOLL_FEET, - Inventory.PAPERDOLL_CLOAK, - Inventory.PAPERDOLL_RHAND, - Inventory.PAPERDOLL_HAIR, - Inventory.PAPERDOLL_HAIR2 - }; - public CharInfo(Player player, boolean gmSeeInvis) { _player = player; @@ -121,17 +121,15 @@ public class CharInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); // Confirmed packet.writeD(_y); // Confirmed packet.writeD(_z); // Confirmed packet.writeD(_vehicleId); // Confirmed packet.writeD(_objId); // Confirmed packet.writeS(_player.getAppearance().getVisibleName()); // Confirmed - packet.writeH(_player.getRace().ordinal()); // Confirmed - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); // Confirmed packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) @@ -155,10 +153,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.getPvpFlag()); packet.writeD(_player.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -169,53 +165,40 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); - packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeS(_gmSeeInvis ? "Invisible" : _player.getAppearance().getVisibleTitle()); - packet.writeD(_player.getAppearance().getVisibleClanId()); packet.writeD(_player.getAppearance().getVisibleClanCrestId()); packet.writeD(_player.getAppearance().getVisibleAllyId()); packet.writeD(_player.getAppearance().getVisibleAllyCrestId()); - - packet.writeC(_player.isSitting() ? 0x00 : 0x01); // Confirmed - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // Confirmed - packet.writeC(_player.isInCombat() ? 0x01 : 0x00); // Confirmed - - packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 0x01 : 0x00); // Confirmed - - packet.writeC(_player.isInvisible() ? 0x01 : 0x00); - + packet.writeC(_player.isSitting() ? 0 : 1); // Confirmed + packet.writeC(_player.isRunning() ? 1 : 0); // Confirmed + packet.writeC(_player.isInCombat() ? 1 : 0); // Confirmed + packet.writeC(!_player.isInOlympiadMode() && _player.isAlikeDead() ? 1 : 0); // Confirmed + packet.writeC(_player.isInvisible() ? 1 : 0); packet.writeC(_player.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount packet.writeC(_player.getPrivateStoreType().getId()); // Confirmed packet.writeH(_player.getCubics().size()); // Confirmed _player.getCubics().keySet().forEach(packet::writeH); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); // Confirmed - + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); // Confirmed packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); packet.writeH(_player.getRecomHave()); // Confirmed packet.writeD(_player.getMountNpcId() == 0 ? 0 : _player.getMountNpcId() + 1000000); - packet.writeD(_player.getClassId().getId()); // Confirmed - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! packet.writeC(_player.isMounted() ? 0 : _enchantLevel); // Confirmed - packet.writeC(_player.getTeam().getId()); // Confirmed - packet.writeD(_player.getClanCrestLargeId()); packet.writeC(_player.isNoble() ? 1 : 0); // Confirmed packet.writeC(_player.isHero() || (_player.isGM() && Config.GM_HERO_AURA) ? 2 : 0); // 152 - Value for enabled changed to 2? packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed - final ILocational baitLocation = _player.getFishing().getBaitLocation(); if (baitLocation != null) { @@ -231,29 +214,21 @@ public class CharInfo implements IClientOutgoingPacket } packet.writeD(_player.getAppearance().getNameColor()); // Confirmed - packet.writeD(_heading); // Confirmed - packet.writeC(_player.getPledgeClass()); packet.writeH(_player.getPledgeType()); - packet.writeD(_player.getAppearance().getTitleColor()); // Confirmed - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - - packet.writeC(0x00); // nPvPRestrainStatus - + packet.writeC(0); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentHp())); // Confirmed packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - - packet.writeC(0x00); // cBRLectureMark + packet.writeC(0); // cBRLectureMark final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed @@ -265,11 +240,11 @@ public class CharInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(_player.isTrueHero() ? 100 : 0); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); // Hair accessory - packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points - packet.writeD(0x00); // nCursedWeaponClassId + packet.writeC(_player.isTrueHero() ? 100 : 0); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); // Hair accessory + packet.writeC(_player.getAbilityPointsUsed()); // Used Ability Points + packet.writeD(0); // nCursedWeaponClassId // AFK animation. if ((_player.getClan() != null) && (CastleManager.getInstance().getCastleByOwner(_player.getClan()) != null)) @@ -278,19 +253,17 @@ public class CharInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); + packet.writeD(0); } // Rank. packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : RankManager.getInstance().getPlayerClassRank(_player) == 1 ? 4 : 0); - - packet.writeH(0x00); - packet.writeC(0x00); + packet.writeH(0); + packet.writeC(0); packet.writeD(_player.getClassId().getId()); - packet.writeC(0x00); + packet.writeC(0); packet.writeD(_player.getVisualHairColor() + 1); // 338 - DK color. - packet.writeD(0x00); - + packet.writeD(0); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java index 7187b73184..11f5f4df52 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharSelected.java @@ -40,17 +40,16 @@ public class CharSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTED.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getTitle()); packet.writeD(_sessionId); packet.writeD(_player.getClanId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getRace().ordinal()); packet.writeD(_player.getClassId().getId()); - packet.writeD(0x01); // active ?? + packet.writeD(1); // active ?? packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -62,25 +61,20 @@ public class CharSelected implements IClientOutgoingPacket packet.writeD(_player.getReputation()); packet.writeD(_player.getPkKills()); packet.writeD(GameTimeTaskManager.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_player.getClassId().getId()); - packet.writeB(new byte[16]); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeB(new byte[28]); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 2eef532371..7af720f1e3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -44,10 +44,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharSelectionInfo implements IClientOutgoingPacket { private static final Logger LOGGER = Logger.getLogger(CharSelectionInfo.class.getName()); - private final String _loginName; - private final int _sessionId; - private int _activeId; - private final List _characterPackages; private static final int[] PAPERDOLL_ORDER = new int[] { @@ -112,7 +108,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_ARTIFACT20, // 152 Inventory.PAPERDOLL_ARTIFACT21 // 152 }; - private static final int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, @@ -126,6 +121,11 @@ public class CharSelectionInfo implements IClientOutgoingPacket Inventory.PAPERDOLL_HAIR2, }; + private final String _loginName; + private final int _sessionId; + private int _activeId; + private final List _characterPackages; + /** * Constructor for CharSelectionInfo. * @param loginName @@ -156,17 +156,14 @@ public class CharSelectionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHARACTER_SELECTION_INFO.writeId(packet); - final int size = _characterPackages.size(); packet.writeD(size); // Created character count - packet.writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT); // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) - packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 0x01 : 0x00); // if 1 can't create new char - packet.writeC(0x01); // 0=can't play, 1=can play free until level 85, 2=100% free play - packet.writeD(0x02); // if 1, Korean client - packet.writeC(0x00); // Gift message for inactive accounts // 152 - packet.writeC(0x00); // Balthus Knights, if 1 suggests premium account - + packet.writeC(size == Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT ? 1 : 0); // if 1 can't create new char + packet.writeC(1); // 0=can't play, 1=can play free until level 85, 2=100% free play + packet.writeD(2); // if 1, Korean client + packet.writeC(0); // Gift message for inactive accounts // 152 + packet.writeC(0); // Balthus Knights, if 1 suggests premium account long lastAccess = 0; if (_activeId == -1) { @@ -179,7 +176,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket } } } - for (int i = 0; i < size; i++) { final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i); @@ -187,94 +183,75 @@ public class CharSelectionInfo implements IClientOutgoingPacket packet.writeD(charInfoPackage.getObjectId()); // Character ID packet.writeS(_loginName); // Account name packet.writeD(_sessionId); // Account ID - packet.writeD(0x00); // Clan ID - packet.writeD(0x00); // Builder level - + packet.writeD(0); // Clan ID + packet.writeD(0); // Builder level packet.writeD(charInfoPackage.getSex()); // Sex packet.writeD(charInfoPackage.getRace()); // Race packet.writeD(charInfoPackage.getBaseClassId()); - packet.writeD(Config.SERVER_ID); - packet.writeD(charInfoPackage.getX()); packet.writeD(charInfoPackage.getY()); packet.writeD(charInfoPackage.getZ()); packet.writeF(charInfoPackage.getCurrentHp()); packet.writeF(charInfoPackage.getCurrentMp()); - packet.writeQ(charInfoPackage.getSp()); packet.writeQ(charInfoPackage.getExp()); packet.writeF((float) (charInfoPackage.getExp() - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(charInfoPackage.getLevel()))); packet.writeD(charInfoPackage.getLevel()); - packet.writeD(charInfoPackage.getReputation()); packet.writeD(charInfoPackage.getPkKills()); packet.writeD(charInfoPackage.getPvPKills()); - - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - - packet.writeD(0x00); // Ertheia - packet.writeD(0x00); // Ertheia - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); // Ertheia + packet.writeD(0); // Ertheia for (int slot : getPaperdollOrder()) { packet.writeD(charInfoPackage.getPaperdollItemId(slot)); } - for (int slot : getPaperdollOrderVisualId()) { packet.writeD(charInfoPackage.getPaperdollItemVisualId(slot)); } - packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_CHEST)); // Upper Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_LEGS)); // Lower Body enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_HEAD)); // Headgear enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_GLOVES)); // Gloves enchant level packet.writeH(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_FEET)); // Boots enchant level - packet.writeD(charInfoPackage.getHairStyle()); packet.writeD(charInfoPackage.getHairColor()); packet.writeD(charInfoPackage.getFace()); - packet.writeF(charInfoPackage.getMaxHp()); // Maximum HP packet.writeF(charInfoPackage.getMaxMp()); // Maximum MP - packet.writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - Chronos.currentTimeMillis()) / 1000) : 0); packet.writeD(charInfoPackage.getClassId()); packet.writeD(i == _activeId ? 1 : 0); - packet.writeC(charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND) > 127 ? 127 : charInfoPackage.getEnchantEffect(Inventory.PAPERDOLL_RHAND)); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption1Id() : 0); packet.writeD(charInfoPackage.getAugmentation() != null ? charInfoPackage.getAugmentation().getOption2Id() : 0); - // packet.writeD(charInfoPackage.getTransformId()); // Used to display Transformations - packet.writeD(0x00); // Currently on retail when you are on character select you don't see your transformation. - - packet.writeD(0x00); // Pet NpcId - packet.writeD(0x00); // Pet level - packet.writeD(0x00); // Pet Food - packet.writeD(0x00); // Pet Food Level - packet.writeF(0x00); // Current pet HP - packet.writeF(0x00); // Current pet MP - + packet.writeD(0); // Currently on retail when you are on character select you don't see your transformation. + packet.writeD(0); // Pet NpcId + packet.writeD(0); // Pet level + packet.writeD(0); // Pet Food + packet.writeD(0); // Pet Food Level + packet.writeF(0); // Current pet HP + packet.writeF(0); // Current pet MP packet.writeD(charInfoPackage.getVitalityPoints()); // Vitality packet.writeD((int) Config.RATE_VITALITY_EXP_MULTIPLIER * 100); // Vitality Percent packet.writeD(charInfoPackage.getVitalityItemsUsed()); // Remaining vitality item uses - packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0x00 : 0x01); // Char is active or not - packet.writeC(charInfoPackage.isNoble() ? 0x01 : 0x00); - packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 0x02 : 0x00); // Hero glow - packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 0x01 : 0x00); // Show hair accessory if enabled - - packet.writeD(0x00); // 235 - ban time left + packet.writeD(charInfoPackage.getAccessLevel() == -100 ? 0 : 1); // Char is active or not + packet.writeC(charInfoPackage.isNoble() ? 1 : 0); + packet.writeC(Hero.getInstance().isHero(charInfoPackage.getObjectId()) ? 2 : 0); // Hero glow + packet.writeC(charInfoPackage.isHairAccessoryEnabled() ? 1 : 0); // Show hair accessory if enabled + packet.writeD(0); // 235 - ban time left packet.writeD((int) (charInfoPackage.getLastAccess() / 1000)); // 235 - last play time - - packet.writeC(0x00); // 338 + packet.writeC(0); // 338 packet.writeD(charInfoPackage.getHairColor() + 1); // 338 - DK color. } return true; @@ -284,7 +261,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { CharSelectInfoPackage charInfopackage; final List characterList = new LinkedList<>(); - try (Connection con = DatabaseFactory.getConnection(); PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate")) { @@ -297,7 +273,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket if (charInfopackage != null) { characterList.add(charInfopackage); - final Player player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { @@ -311,7 +286,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { LOGGER.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e); } - return characterList; } @@ -353,7 +327,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { clan.removeClanMember(objectId, 0); } - GameClient.deleteCharByObjId(objectId); return null; } @@ -372,20 +345,16 @@ public class CharSelectionInfo implements IClientOutgoingPacket charInfopackage.setHairStyle(chardata.getInt("hairstyle")); charInfopackage.setHairColor(chardata.getInt("haircolor")); charInfopackage.setSex(chardata.getInt("sex")); - charInfopackage.setExp(chardata.getLong("exp")); charInfopackage.setSp(chardata.getLong("sp")); charInfopackage.setVitalityPoints(chardata.getInt("vitality_points")); charInfopackage.setClanId(chardata.getInt("clanid")); - charInfopackage.setRace(chardata.getInt("race")); - final int baseClassId = chardata.getInt("base_class"); final int activeClassId = chardata.getInt("classid"); charInfopackage.setX(chardata.getInt("x")); charInfopackage.setY(chardata.getInt("y")); charInfopackage.setZ(chardata.getInt("z")); - final int faction = chardata.getInt("faction"); if (faction == 1) { @@ -395,7 +364,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setEvil(); } - if (Config.MULTILANG_ENABLE) { String lang = chardata.getString("language"); @@ -405,22 +373,18 @@ public class CharSelectionInfo implements IClientOutgoingPacket } charInfopackage.setHtmlPrefix("data/lang/" + lang + "/"); } - // if is in subclass, load subclass exp, sp, level info if (baseClassId != activeClassId) { loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId); } - charInfopackage.setClassId(activeClassId); - // Get the augmentation id for equipped weapon int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); if (weaponObjId < 1) { weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND); } - if (weaponObjId > 0) { try (Connection con = DatabaseFactory.getConnection(); @@ -446,7 +410,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket LOGGER.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e); } } - // Check if the base class is set to zero and also doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly. if ((baseClassId == 0) && (activeClassId > 0)) { @@ -456,7 +419,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket { charInfopackage.setBaseClassId(baseClassId); } - charInfopackage.setDeleteTimer(deletetime); charInfopackage.setLastAccess(chardata.getLong("lastAccess")); charInfopackage.setNoble(chardata.getInt("nobless") == 1); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java index 847e24db87..d59df7911a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ChooseInventoryItem.java @@ -32,7 +32,6 @@ public class ChooseInventoryItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHOOSE_INVENTORY_ITEM.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java index 12a3940521..ac66c2fa0f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ClientSetTime.java @@ -32,7 +32,6 @@ public class ClientSetTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CLIENT_SET_TIME.writeId(packet); - packet.writeD(GameTimeTaskManager.getInstance().getGameTime()); // time in client minutes packet.writeD(6); // constant to match the server time( this determines the speed of the client clock) return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java index 43732f74fa..66a1f5e20d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ConfirmDlg.java @@ -68,7 +68,6 @@ public class ConfirmDlg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CONFIRM_DLG.writeId(packet); - final SMParam[] params = _systemMessage.getParams(); packet.writeD(_systemMessage.getId()); packet.writeD(params.length); @@ -131,7 +130,6 @@ public class ConfirmDlg implements IClientOutgoingPacket } } } - packet.writeD(_time); packet.writeD(_requesterId); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index e11807bdba..63acd728ea 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -73,7 +73,6 @@ public class CreatureSay implements IClientOutgoingPacket _mask |= 0x08; } } - // Does not shows level if (sender.isGM()) { @@ -125,7 +124,6 @@ public class CreatureSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_sender == null ? 0 : _sender.getObjectId()); packet.writeD(_chatType.getClientId()); if (_senderName != null) @@ -156,7 +154,6 @@ public class CreatureSay implements IClientOutgoingPacket packet.writeS(s); } } - // Rank if ((_sender != null) && _sender.isPlayer()) { @@ -165,7 +162,6 @@ public class CreatureSay implements IClientOutgoingPacket { packet.writeC(0); // unknown clan byte } - final int rank = RankManager.getInstance().getPlayerGlobalRank(_sender.getActingPlayer()); if ((rank == 0) || (rank > 100)) { @@ -183,7 +179,6 @@ public class CreatureSay implements IClientOutgoingPacket { packet.writeC(3); } - if (clan != null) { packet.writeC(clan.getCastleId()); @@ -197,7 +192,6 @@ public class CreatureSay implements IClientOutgoingPacket { packet.writeC(0); } - return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java index dfc40d995f..a307b06e4b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/DeleteObject.java @@ -38,9 +38,8 @@ public class DeleteObject implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DELETE_OBJECT.writeId(packet); - packet.writeD(_objectId); - packet.writeC(0x00); // c2 + packet.writeC(0); // c2 return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java index 982c8f3311..3b5917e55b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Dice.java @@ -50,7 +50,6 @@ public class Dice implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DICE.writeId(packet); - packet.writeD(_objectId); // object id of player packet.writeD(_itemId); // item id of dice (spade) 4625,4626,4627,4628 packet.writeD(_number); // number rolled diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Die.java index 30bce18efa..3d20a7e921 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Die.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Die.java @@ -57,7 +57,6 @@ public class Die implements IClientOutgoingPacket siegeClan = fort.getSiege().getAttackerClan(clan); isInFortDefense = (siegeClan == null) && fort.getSiege().checkIsDefender(clan); } - // ClanHall check. if ((clan != null) && (clan.getHideoutId() > 0)) { @@ -92,12 +91,12 @@ public class Die implements IClientOutgoingPacket OutgoingPackets.DIE.writeId(packet); packet.writeD(_objectId); packet.writeQ(_flags); - packet.writeD(_isSweepable ? 0x01 : 0x00); - packet.writeD(0x00); // Feather item time. - packet.writeC(0x00); // Hide die animation. - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(_isSweepable ? 1 : 0); + packet.writeD(0); // Feather item time. + packet.writeC(0); // Hide die animation. + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java index 15404f9dee..5837faec19 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/DoorInfo.java @@ -33,7 +33,6 @@ public class DoorInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_INFO.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.getId()); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java index 54f8742a73..14d41afee7 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/DoorStatusUpdate.java @@ -33,7 +33,6 @@ public class DoorStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DOOR_STATUS_UPDATE.writeId(packet); - packet.writeD(_door.getObjectId()); packet.writeD(_door.isOpen() ? 0 : 1); packet.writeD(_door.getDamage()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java index b12458e719..3035890956 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/DropItem.java @@ -40,20 +40,17 @@ public class DropItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.DROP_ITEM.writeId(packet); - packet.writeD(_objectId); packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeC(_item.isStackable() ? 0x01 : 0x00); + packet.writeC(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - - packet.writeC(0x00); - // packet.writeD(0x01); if above C == true (1) then packet.readD() + packet.writeC(0); + // packet.writeD(1); if above C == true (1) then packet.readD() packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java index 631c43ba0c..99bd80d97e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Earthquake.java @@ -62,13 +62,12 @@ public class Earthquake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EARTHQUAKE.writeId(packet); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_intensity); packet.writeD(_duration); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java index 6063a54535..1a8b8ddfbb 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/EnchantResult.java @@ -59,25 +59,20 @@ public class EnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_crystal); packet.writeQ(_count); - // Guessing. // With 166 options became 3x write integers instead of shorts and enchant level moved bellow. - // Commenting until actually knowing. // for (int option : _enchantOptions) // { // packet.writeD(option); // } - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_enchantLevel); // Confirmed. - return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java index d7be9824ff..ef78a83f25 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/EtcStatusUpdate.java @@ -42,7 +42,6 @@ public class EtcStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.ETC_STATUS_UPDATE.writeId(packet); - packet.writeC(_player.getCharges()); // 1-7 increase force, level packet.writeD(_player.getWeightPenalty()); // 1-4 weight penalty, level (1=50%, 2=66.6%, 3=80%, 4=100%) packet.writeC(0); // Weapon Grade Penalty [1-4] diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java index 5dca90f960..9f8d576148 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordAck.java @@ -24,13 +24,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class Ex2ndPasswordAck implements IClientOutgoingPacket { + // TODO: Enum + public static final int SUCCESS = 0; + public static final int WRONG_PATTERN = 1; + private final int _status; private final int _response; - // TODO: Enum - public static final int SUCCESS = 0x00; - public static final int WRONG_PATTERN = 0x01; - public Ex2ndPasswordAck(int status, int response) { _status = status; @@ -41,10 +41,9 @@ public class Ex2ndPasswordAck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_ACK.writeId(packet); - packet.writeC(_status); - packet.writeD(_response == WRONG_PATTERN ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(_response == WRONG_PATTERN ? 1 : 0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java index 48bde5161d..c86b5185d0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordCheck.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordCheck implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_NEW = 0x00; - public static final int PASSWORD_PROMPT = 0x01; - public static final int PASSWORD_OK = 0x02; + public static final int PASSWORD_NEW = 0; + public static final int PASSWORD_PROMPT = 1; + public static final int PASSWORD_OK = 2; private final int _windowType; @@ -40,9 +40,8 @@ public class Ex2ndPasswordCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_CHECK.writeId(packet); - packet.writeD(_windowType); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java index 1abf50ab01..f6731bf18f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Ex2ndPasswordVerify.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class Ex2ndPasswordVerify implements IClientOutgoingPacket { // TODO: Enum - public static final int PASSWORD_OK = 0x00; - public static final int PASSWORD_WRONG = 0x01; - public static final int PASSWORD_BAN = 0x02; + public static final int PASSWORD_OK = 0; + public static final int PASSWORD_WRONG = 1; + public static final int PASSWORD_BAN = 2; private final int _wrongTentatives; private final int _mode; @@ -42,7 +42,6 @@ public class Ex2ndPasswordVerify implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_2ND_PASSWORD_VERIFY.writeId(packet); - packet.writeD(_mode); packet.writeD(_wrongTentatives); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java index 55abf718c5..db551344ef 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAbnormalStatusUpdateFromTarget.java @@ -45,10 +45,8 @@ public class ExAbnormalStatusUpdateFromTarget implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ABNORMAL_STATUS_UPDATE_FROM_TARGET.writeId(packet); - packet.writeD(_creature.getObjectId()); packet.writeH(_effects.size()); - for (BuffInfo info : _effects) { packet.writeD(info.getSkill().getDisplayId()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java index c4b9cd8356..f3abd6ec5c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquirableSkillListByClass.java @@ -41,7 +41,6 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRABLE_SKILL_LIST_BY_CLASS.writeId(packet); - packet.writeH(_type.getId()); packet.writeH(_learnable.size()); for (SkillLearn skill : _learnable) @@ -54,7 +53,7 @@ public class ExAcquirableSkillListByClass implements IClientOutgoingPacket packet.writeC(skill.getRequiredItems().size()); if (_type == AcquireSkillType.SUBPLEDGE) { - packet.writeH(0x00); + packet.writeH(0); } } return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java index fd0e2fc97c..8555bb6e86 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java @@ -61,7 +61,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ACQUIRE_SKILL_INFO.writeId(packet); - packet.writeD(_id); packet.writeD(_level); packet.writeQ(_spCost); @@ -73,7 +72,6 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket packet.writeD(holder.getId()); packet.writeQ(holder.getCount()); } - packet.writeD(_skillRem.size()); for (Skill skill : _skillRem) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java index 29793f4d6c..ff8c526ec4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAdenaInvenCount.java @@ -36,7 +36,6 @@ public class ExAdenaInvenCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ADENA_INVEN_COUNT.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeH(_player.getInventory().getSize()); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java index 2aa2d85bc5..5ef11e0f1e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipInfo.java @@ -50,13 +50,11 @@ public class ExAirShipInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_INFO.writeId(packet); - packet.writeD(_ship.getObjectId()); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(_heading); - packet.writeD(_captain); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); @@ -73,14 +71,13 @@ public class ExAirShipInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - packet.writeD(_ship.getFuel()); packet.writeD(_ship.getMaxFuel()); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java index 4cfc76bfba..8b37f4fc0a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipStopMove.java @@ -42,7 +42,6 @@ public class ExAirShipStopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_airShipId); packet.writeD(_playerId); packet.writeD(_x); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java index 33c57712da..52958f931b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAirShipTeleportList.java @@ -37,12 +37,10 @@ public class ExAirShipTeleportList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AIR_SHIP_TELEPORT_LIST.writeId(packet); - packet.writeD(_dockId); if (_teleports != null) { packet.writeD(_teleports.length); - for (int i = 0; i < _teleports.length; i++) { packet.writeD(i - 1); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java index 392b228f0d..7918022c72 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAlchemySkillList.java @@ -50,13 +50,12 @@ public class ExAlchemySkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ALCHEMY_SKILL_LIST.writeId(packet); - packet.writeD(_skills.size()); for (Skill skill : _skills) { packet.writeD(skill.getId()); packet.writeD(skill.getLevel()); - packet.writeQ(0x00); // Always 0 on Naia, SP i guess? + packet.writeQ(0); // Always 0 on Naia, SP i guess? packet.writeC(skill.getId() == CommonSkill.ALCHEMY_CUBE.getId() ? 0 : 1); // This is type in flash, visible or not } return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java index 3d7ee12a81..1990e1e701 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAskCoupleAction.java @@ -37,7 +37,6 @@ public class ExAskCoupleAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_COUPLE_ACTION.writeId(packet); - packet.writeD(_actionId); packet.writeD(_objectId); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java index 61cabedd98..45615daf5a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinMPCC.java @@ -39,9 +39,8 @@ public class ExAskJoinMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_MPCC.writeId(packet); - packet.writeS(_requestorName); // name of CCLeader - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java index 17fa9d028f..908022ff7e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAskJoinPartyRoom.java @@ -38,7 +38,6 @@ public class ExAskJoinPartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_JOIN_PARTY_ROOM.writeId(packet); - packet.writeS(_charName); packet.writeS(_roomName); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java index 2a6b958dc9..1551840013 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAskModifyPartyLooting.java @@ -38,7 +38,6 @@ public class ExAskModifyPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ASK_MODIFY_PARTY_LOOTING.writeId(packet); - packet.writeS(_requestor); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java index 958e7c3d06..fa62c8a207 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAttributeEnchantResult.java @@ -45,7 +45,6 @@ public class ExAttributeEnchantResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ATTRIBUTE_ENCHANT_RESULT.writeId(packet); - packet.writeD(_result); packet.writeC(_isWeapon); packet.writeH(_type); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java index 1a3a1ef3fe..3d65055b3c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExAutoSoulShot.java @@ -41,9 +41,8 @@ public class ExAutoSoulShot implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AUTO_SOUL_SHOT.writeId(packet); - packet.writeD(_itemId); - packet.writeD(_enable ? 0x01 : 0x00); + packet.writeD(_enable ? 1 : 0); packet.writeD(_type); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java index 8680c6bd7a..a8137347ec 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java @@ -37,8 +37,7 @@ public class ExBaseAttributeCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASE_ATTRIBUTE_CANCEL_RESULT.writeId(packet); - - packet.writeD(0x01); // result + packet.writeD(1); // result packet.writeD(_objId); packet.writeD(_attribute); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java index 755fbc66c8..a454d136c6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBasicActionList.java @@ -75,7 +75,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 1149, 1150, 1151, 1152, 1153, 1154, 1155 }; - public static final int[] DEFAULT_ACTION_LIST = { 0, 1, 2, 3, @@ -147,7 +146,6 @@ public class ExBasicActionList implements IClientOutgoingPacket 5012, 5013, 5014, 5015 }; //@formatter:on - public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST); private final int[] _actionIds; @@ -161,7 +159,6 @@ public class ExBasicActionList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BASIC_ACTION_LIST.writeId(packet); - packet.writeD(_actionIds.length); for (int _actionId : _actionIds) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java index 4c4fac8c91..d32dca4d21 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBeautyItemList.java @@ -34,13 +34,14 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBeautyItemList implements IClientOutgoingPacket { - private int _colorCount; - private final BeautyData _beautyData; - private final Map> _colorData = new HashMap<>(); private static final int HAIR_TYPE = 0; private static final int FACE_TYPE = 1; private static final int COLOR_TYPE = 2; + private int _colorCount; + private final BeautyData _beautyData; + private final Map> _colorData = new HashMap<>(); + public ExBeautyItemList(Player player) { _beautyData = BeautyShopData.getInstance().getBeautyData(player.getRace(), player.getAppearance().getSexType()); @@ -60,7 +61,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BEAUTY_ITEM_LIST.writeId(packet); - packet.writeD(HAIR_TYPE); packet.writeD(_beautyData.getHairList().size()); for (BeautyItem hair : _beautyData.getHairList().values()) @@ -72,7 +72,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(hair.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(FACE_TYPE); packet.writeD(_beautyData.getFaceList().size()); for (BeautyItem face : _beautyData.getFaceList().values()) @@ -84,7 +83,6 @@ public class ExBeautyItemList implements IClientOutgoingPacket packet.writeD(face.getBeautyShopTicket()); packet.writeD(1); // Limit } - packet.writeD(COLOR_TYPE); packet.writeD(_colorCount); for (Entry> entry : _colorData.entrySet()) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java index 1825236886..6d4c45cb2b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBirthdayPopup.java @@ -34,7 +34,6 @@ public class ExBirthdayPopup implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_BIRTH_DAY.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java index 7d2f17e697..43e525f05f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBroadcastEventState.java @@ -26,6 +26,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExBrBroadcastEventState implements IClientOutgoingPacket { + public static final int APRIL_FOOLS = 20090401; + public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) + public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) + public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) + public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) + private final int _eventId; private final int _eventState; private int _param0; @@ -36,12 +42,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket private String _param5; private String _param6; - public static final int APRIL_FOOLS = 20090401; - public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100) - public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show) - public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show) - public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show) - public ExBrBroadcastEventState(int eventId, int eventState) { _eventId = eventId; @@ -65,7 +65,6 @@ public class ExBrBroadcastEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BROADCAST_EVENT_STATE.writeId(packet); - packet.writeD(_eventId); packet.writeD(_eventState); packet.writeD(_param0); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java index 1fd7ec663a..c0683c8797 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBrBuffEventState.java @@ -44,7 +44,6 @@ public class ExBrBuffEventState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUFF_EVENT_STATE.writeId(packet); - packet.writeD(_type); packet.writeD(_value); packet.writeD(_state); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java index 943aae8a62..8e009d7b09 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java @@ -43,7 +43,6 @@ public class ExBrLoadEventTopRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_LOAD_EVENT_TOP_RANKERS.writeId(packet); - packet.writeD(_eventId); packet.writeD(_day); packet.writeD(_count); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java index 0a0ddf31b8..291f7a6b55 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBrPremiumState.java @@ -36,9 +36,8 @@ public class ExBrPremiumState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PREMIUM_STATE.writeId(packet); - packet.writeD(_player.getObjectId()); - packet.writeC(_player.hasPremiumStatus() || (_player.getVipTier() > 0) ? 0x01 : 0x00); + packet.writeC(_player.hasPremiumStatus() || (_player.getVipTier() > 0) ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 381dd859ad..567cfc70f9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -59,10 +59,8 @@ public class ExBuySellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BUY_SELL_LIST.writeId(packet); - - packet.writeD(0x01); // Type SELL + packet.writeD(1); // Type SELL packet.writeD(_inventorySlots); - if ((_sellList != null)) { packet.writeH(_sellList.size()); @@ -74,9 +72,8 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - if ((_refundList != null) && !_refundList.isEmpty()) { packet.writeH(_refundList.size()); @@ -90,10 +87,9 @@ public class ExBuySellList extends AbstractItemPacket } else { - packet.writeH(0x00); + packet.writeH(0); } - - packet.writeC(_done ? 0x01 : 0x00); + packet.writeC(_done ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java index 2b43c0ce4b..e0ec81e0e7 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCastleState.java @@ -39,7 +39,6 @@ public class ExCastleState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CASTLE_STATE.writeId(packet); - packet.writeD(_castleId); packet.writeD(_castleSide.ordinal()); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java index b7f90d261b..a8196c7a83 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeClientEffectInfo.java @@ -52,7 +52,6 @@ public class ExChangeClientEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_CLIENT_EFFECT_INFO.writeId(packet); - packet.writeD(_type); packet.writeD(_key); packet.writeD(_value); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java index 472abc88df..eea59162ee 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeNpcState.java @@ -37,7 +37,6 @@ public class ExChangeNpcState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NPC_STATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java index 8cdcb4460d..45f2805517 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExChangePostState.java @@ -49,7 +49,6 @@ public class ExChangePostState implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_POST_STATE.writeId(packet); - packet.writeD(_receivedBoard ? 1 : 0); packet.writeD(_changedMsgIds.length); for (int postId : _changedMsgIds) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java index fc58ec9a2e..d765ab54e0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExChangeToAwakenedClass.java @@ -35,7 +35,6 @@ public class ExChangeToAwakenedClass implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_TO_AWAKENED_CLASS.writeId(packet); - packet.writeD(_classId); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java index f51a3eb3ae..1e9b8e9dc8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java @@ -47,7 +47,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket throw new IllegalArgumentException("Undefined Atribute item: " + stone); } _level = ElementalAttributeData.getInstance().getMaxElementLevel(_itemId); - // Register only items that can be put an attribute stone/crystal for (Item item : player.getInventory().getItems()) { @@ -62,7 +61,6 @@ public class ExChooseInventoryAttributeItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_INVENTORY_ATTRIBUTE_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeQ(_count); packet.writeD(_atribute == AttributeType.FIRE ? 1 : 0); // Fire diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java index a272d85469..238882cd11 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCloseMPCC.java @@ -35,7 +35,6 @@ public class ExCloseMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java index d2ecd70952..877bca760a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExClosePartyRoom.java @@ -34,7 +34,6 @@ public class ExClosePartyRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CLOSE_PARTY_ROOM.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java index 27c112776b..1d02c972b5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExColosseumFenceInfo.java @@ -54,7 +54,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLOSSEUM_FENCE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_clientState); packet.writeD(_x); @@ -62,7 +61,6 @@ public class ExColosseumFenceInfo implements IClientOutgoingPacket packet.writeD(_z); packet.writeD(_width); packet.writeD(_length); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java index 766d3619ad..b72bef93e8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExConfirmAddingContact.java @@ -37,9 +37,8 @@ public class ExConfirmAddingContact implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_AGIT_AUCTION_CMD.writeId(packet); - packet.writeS(_charName); - packet.writeD(_added ? 0x01 : 0x00); + packet.writeD(_added ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java index beded32254..c832d507ed 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameAddPlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameAddPlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x01); - + packet.writeD(1); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java index 5f36f730d0..847ea93e6a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangePoints.java @@ -45,9 +45,7 @@ public class ExCubeGameChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java index 66abbf4b75..a2f2e61ded 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTeam.java @@ -43,12 +43,10 @@ public class ExCubeGameChangeTeam implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x05); - + packet.writeD(5); packet.writeD(_player.getObjectId()); - packet.writeD(_fromRedTeam ? 0x01 : 0x00); - packet.writeD(_fromRedTeam ? 0x00 : 0x01); + packet.writeD(_fromRedTeam ? 1 : 0); + packet.writeD(_fromRedTeam ? 0 : 1); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java index 5273b2099a..136b439283 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java @@ -39,9 +39,7 @@ public class ExCubeGameChangeTimeToStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x03); - + packet.writeD(3); packet.writeD(_seconds); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java index f81a302941..9bdba49029 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameCloseUI.java @@ -35,7 +35,6 @@ public class ExCubeGameCloseUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - packet.writeD(0xffffffff); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java index 259a0e9407..3177e7a488 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameEnd.java @@ -40,11 +40,9 @@ public class ExCubeGameEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x01); - - packet.writeD(_isRedTeamWin ? 0x01 : 0x00); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(1); + packet.writeD(_isRedTeamWin ? 1 : 0); + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java index 4d89e621ce..8b96bb545f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java @@ -55,14 +55,11 @@ public class ExCubeGameExtendedChangePoints implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_STATE.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_timeLeft); packet.writeD(_bluePoints); packet.writeD(_redPoints); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); packet.writeD(_playerPoints); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java index e5a00f1ab7..c084789f13 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java @@ -43,12 +43,9 @@ public class ExCubeGameRemovePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x02); - + packet.writeD(2); packet.writeD(0xffffffff); - - packet.writeD(_isRedTeam ? 0x01 : 0x00); + packet.writeD(_isRedTeam ? 1 : 0); packet.writeD(_player.getObjectId()); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java index 00be884d2f..35a3f289d1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameRequestReady.java @@ -35,8 +35,7 @@ public class ExCubeGameRequestReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x04); + packet.writeD(4); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java index 1bc89e0c32..8b755dd3cc 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCubeGameTeamList.java @@ -30,7 +30,6 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket // Players Lists private final List _bluePlayers; private final List _redPlayers; - // Common Values private final int _roomNumber; @@ -51,12 +50,9 @@ public class ExCubeGameTeamList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BLOCK_UP_SET_LIST.writeId(packet); - - packet.writeD(0x00); - + packet.writeD(0); packet.writeD(_roomNumber); packet.writeD(0xffffffff); - packet.writeD(_bluePlayers.size()); for (Player player : _bluePlayers) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java index 2f2c092c08..d000112787 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponList.java @@ -31,7 +31,6 @@ public class ExCursedWeaponList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LIST.writeId(packet); - final Set ids = CursedWeaponsManager.getInstance().getCursedWeaponsIds(); packet.writeD(ids.size()); ids.forEach(packet::writeD); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java index 2f60a1b80c..5bc7ff3238 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExCursedWeaponLocation.java @@ -39,7 +39,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURSED_WEAPON_LOCATION.writeId(packet); - if (!_cursedWeaponInfo.isEmpty()) { packet.writeD(_cursedWeaponInfo.size()); @@ -47,7 +46,6 @@ public class ExCursedWeaponLocation implements IClientOutgoingPacket { packet.writeD(w.id); packet.writeD(w.activated); - packet.writeD(w.pos.getX()); packet.writeD(w.pos.getY()); packet.writeD(w.pos.getZ()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java index a0ba15da9f..8bee464fb0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDieInfo.java @@ -41,7 +41,6 @@ public class ExDieInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIE_INFO.writeId(packet); - packet.writeH(_droppedItems.size()); for (Item item : _droppedItems) { @@ -49,17 +48,15 @@ public class ExDieInfo implements IClientOutgoingPacket packet.writeD(item.getEnchantLevel()); packet.writeD((int) item.getCount()); } - packet.writeD(_lastDamageTaken.size()); for (DamageTakenHolder damageHolder : _lastDamageTaken) { packet.writeS(damageHolder.getCreature().getName()); - packet.writeH(0x00); + packet.writeH(0); packet.writeD(damageHolder.getSkillId()); packet.writeF(damageHolder.getDamage()); - packet.writeD(0x00); + packet.writeD(0); } - return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java index f475a02b28..0456fb9dae 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDissmissMPCCRoom.java @@ -34,7 +34,6 @@ public class ExDissmissMPCCRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DISSMISS_MPCC_ROOM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java index 258010f717..c731b7c7a9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelAskStart.java @@ -37,7 +37,6 @@ public class ExDuelAskStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_ASK_START.writeId(packet); - packet.writeS(_requestorName); packet.writeD(_partyDuel); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java index 043c82c0db..e9a31bee57 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelEnd.java @@ -38,7 +38,6 @@ public class ExDuelEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_END.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java index 264409b3d6..e1fa1cea88 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelReady.java @@ -38,7 +38,6 @@ public class ExDuelReady implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_READY.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java index 488aafcb7d..ecdd528a16 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelStart.java @@ -38,7 +38,6 @@ public class ExDuelStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_START.writeId(packet); - packet.writeD(_partyDuel); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java index 7df040c5e7..5ed0c09675 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java @@ -36,7 +36,6 @@ public class ExDuelUpdateUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DUEL_UPDATE_USER_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_player.getObjectId()); packet.writeD(_player.getClassId().getId()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 7ab055a3d8..f58c0573a8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExEnchantSkillInfo implements IClientOutgoingPacket { private final Set _routes; - private final int _skillId; private final int _skillLevel; private final int _skillSubLevel; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 41368a8efb..e4ee350e64 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -50,7 +50,6 @@ public class ExEnchantSkillInfoDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_INFO_DETAIL.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skillId); packet.writeH(_skillLevel); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java index 5cedcd6284..1d32f0d725 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillList.java @@ -43,7 +43,6 @@ public class ExEnchantSkillList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_LIST.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_skills.size()); for (Skill skill : _skills) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java index 6ab5e869f2..853d74039f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java @@ -38,7 +38,6 @@ public class ExEnchantSkillResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SKILL_RESULT.writeId(packet); - packet.writeD(_enchanted ? 1 : 0); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java index 7b7d2d008d..410bf16510 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExEventMatchMessage.java @@ -42,7 +42,6 @@ public class ExEventMatchMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_EVENT_MATCH_MESSAGE.writeId(packet); - packet.writeC(_type); packet.writeS(_message); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java index 7264e90233..1946758bf5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java @@ -37,11 +37,9 @@ public class ExGetBookMarkInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOOK_MARK_INFO.writeId(packet); - - packet.writeD(0x00); // Dummy + packet.writeD(0); // Dummy packet.writeD(_player.getBookMarkSlot()); packet.writeD(_player.getTeleportBookmarks().size()); - for (TeleportBookmark tpbm : _player.getTeleportBookmarks()) { packet.writeD(tpbm.getId()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java index 36e7bb81af..201e8eb49b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExGetBossRecord.java @@ -42,15 +42,14 @@ public class ExGetBossRecord implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_BOSS_RECORD.writeId(packet); - packet.writeD(_ranking); packet.writeD(_totalPoints); if (_bossRecordInfo == null) { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } else { @@ -59,7 +58,7 @@ public class ExGetBossRecord implements IClientOutgoingPacket { packet.writeD(entry.getKey()); packet.writeD(entry.getValue()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? } } return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java index ea0a5f8b18..85ccad0758 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOffAirShip.java @@ -41,7 +41,6 @@ public class ExGetOffAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_OFF_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_x); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java index f8e16a4191..9a02e49223 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExGetOnAirShip.java @@ -39,7 +39,6 @@ public class ExGetOnAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_ON_AIR_SHIP.writeId(packet); - packet.writeD(_playerId); packet.writeD(_airShipId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java index 51197344a5..704b3212a1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExGetPremiumItemList.java @@ -30,7 +30,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExGetPremiumItemList implements IClientOutgoingPacket { private final Player _player; - private final Map _map; public ExGetPremiumItemList(Player player) @@ -43,7 +42,6 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_PREMIUM_ITEM_LIST.writeId(packet); - packet.writeD(_map.size()); for (Entry entry : _map.entrySet()) { @@ -51,7 +49,7 @@ public class ExGetPremiumItemList implements IClientOutgoingPacket packet.writeQ(entry.getKey()); packet.writeD(item.getItemId()); packet.writeQ(item.getCount()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeS(item.getSender()); } return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java index 5f4810be42..34ef181b22 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExHeroList.java @@ -40,19 +40,18 @@ public class ExHeroList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_HERO_LIST.writeId(packet); - packet.writeD(_heroList.size()); for (StatSet hero : _heroList.values()) { packet.writeS(hero.getString(Olympiad.CHAR_NAME)); packet.writeD(hero.getInt(Olympiad.CLASS_ID)); packet.writeS(hero.getString(Hero.CLAN_NAME, "")); - packet.writeD(0x00); // hero.getInt(Hero.CLAN_CREST, 0) + packet.writeD(0); // hero.getInt(Hero.CLAN_CREST, 0) packet.writeS(hero.getString(Hero.ALLY_NAME, "")); - packet.writeD(0x00); // hero.getInt(Hero.ALLY_CREST, 0) + packet.writeD(0); // hero.getInt(Hero.ALLY_CREST, 0) packet.writeD(hero.getInt(Hero.COUNT)); - packet.writeD(0x00); - packet.writeC(0x00); // 272 + packet.writeD(0); + packet.writeC(0); // 272 } return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java index d5b5430142..0baca7cd86 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExInzoneWaiting.java @@ -48,8 +48,7 @@ public class ExInzoneWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_INZONE_WAITING_INFO.writeId(packet); - - packet.writeC(_hide ? 0x00 : 0x01); // Grand Crusade + packet.writeC(_hide ? 0 : 1); // Grand Crusade packet.writeD(_currentTemplateId); packet.writeD(_instanceTimes.size()); for (Entry entry : _instanceTimes.entrySet()) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java index 81db66b88f..323c0cdf1e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExIsCharNameCreatable.java @@ -35,7 +35,6 @@ public class ExIsCharNameCreatable implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_IS_CHAR_NAME_CREATABLE.writeId(packet); - packet.writeD(_allowed); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java index 6f00d41989..132003d4d8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAnnounce.java @@ -26,8 +26,8 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExItemAnnounce implements IClientOutgoingPacket { - public static final int ENCHANT = 0x00; - public static final int RANDOM_CRAFT = 0x02; + public static final int ENCHANT = 0; + public static final int RANDOM_CRAFT = 2; private final Item _item; private final Player _player; @@ -48,7 +48,7 @@ public class ExItemAnnounce implements IClientOutgoingPacket packet.writeString(_player.getName()); // name of player packet.writeD(_item.getId()); // item id packet.writeD(_item.getEnchantLevel()); // enchant level - packet.writeC(0x00); // name of item + packet.writeC(0); // name of item return true; } } \ No newline at end of file diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java index ecc751eab3..45def9e0be 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java @@ -38,7 +38,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { throw new NullPointerException(); } - if (currentAuction.getAuctionState() != ItemAuctionState.STARTED) { _timeRemaining = 0; @@ -47,7 +46,6 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket { _timeRemaining = (int) (currentAuction.getFinishingTimeRemaining() / 1000); // in seconds } - _refresh = refresh; _currentAuction = currentAuction; _nextAuction = nextAuction; @@ -57,16 +55,12 @@ public class ExItemAuctionInfoPacket extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ITEM_AUCTION_INFO.writeId(packet); - - packet.writeC(_refresh ? 0x00 : 0x01); + packet.writeC(_refresh ? 0 : 1); packet.writeD(_currentAuction.getInstanceId()); - final ItemAuctionBid highestBid = _currentAuction.getHighestBid(); packet.writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid()); - packet.writeD(_timeRemaining); writeItem(packet, _currentAuction.getItemInfo()); - if (_nextAuction != null) { packet.writeQ(_nextAuction.getAuctionInitBid()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExLetterCollectorUI.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExLetterCollectorUI.java index 1f6701e6dc..61e987edef 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExLetterCollectorUI.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExLetterCollectorUI.java @@ -36,7 +36,7 @@ public class ExLetterCollectorUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LETTER_COLLECTOR_UI_LAUNCHER.writeId(packet); - packet.writeC(0x01); // enabled (0x00 - no, 0x01 -yes) + packet.writeC(1); // enabled (0x00 - no, 0x01 -yes) packet.writeD(LETTER_COLLECTOR_MIN_LEVEL); // Minimum Level return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java index 53ad8abd58..1c5e38cbab 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExListMpccWaiting.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListMpccWaiting implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _rooms = new LinkedList<>(); @@ -53,7 +54,6 @@ public class ExListMpccWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_MPCC_WAITING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java index 78f2fec636..eafea24fa6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java @@ -37,6 +37,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket { private static final int NUM_PER_PAGE = 64; + private final int _size; private final List _players = new LinkedList<>(); @@ -60,7 +61,6 @@ public class ExListPartyMatchingWaitingRoom implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_LIST_PARTY_MATCHING_WAITING_ROOM.writeId(packet); - packet.writeD(_size); packet.writeD(_players.size()); for (Player player : _players) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java index 786c616875..c8723a9fc0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java @@ -46,7 +46,6 @@ public class ExMPCCPartyInfoUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCPARTY_INFO_UPDATE.writeId(packet); - packet.writeS(_name); packet.writeD(_LeaderOID); packet.writeD(_memberCount); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java index 4bf07f0133..08259e4e6c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCPartymasterList.java @@ -37,7 +37,6 @@ public class ExMPCCPartymasterList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_PARTYMASTER_LIST.writeId(packet); - packet.writeD(_leadersName.size()); _leadersName.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java index abbdc8fe76..f021ef5f1f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomInfo.java @@ -36,7 +36,6 @@ public class ExMPCCRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java index 154e156270..2eec590cb4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCRoomMember.java @@ -41,7 +41,6 @@ public class ExMPCCRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCC_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java index 06e3027bfc..a0e9d0a4b0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java @@ -37,7 +37,6 @@ public class ExMPCCShowPartyMemberInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MPCCSHOW_PARTY_MEMBER_INFO.writeId(packet); - packet.writeD(_party.getMemberCount()); for (Player pc : _party.getMembers()) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java index e454a746f3..771b2f22cb 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java @@ -49,7 +49,6 @@ public class ExMagicAttackInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAGIC_ATTACK_INFO.writeId(packet); - packet.writeD(_caster); packet.writeD(_target); packet.writeD(_type); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java index 9cfbeb5aee..1aaa5b6520 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMailArrived.java @@ -35,7 +35,6 @@ public class ExMailArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAIL_ARRIVED.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java index 983ff22b92..48156c0600 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExManageMpccRoomMember.java @@ -44,7 +44,6 @@ public class ExManageMpccRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MANAGE_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_player.getObjectId()); packet.writeS(_player.getName()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java index f710c006e8..9d7d14211e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationAirShip.java @@ -45,7 +45,6 @@ public class ExMoveToLocationAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_AIR_SHIP.writeId(packet); - packet.writeD(_objId); packet.writeD(_tx); packet.writeD(_ty); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java index 3e3bdc9fed..87e44b51cd 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java @@ -43,7 +43,6 @@ public class ExMoveToLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java index 7ab0d1c7da..3c1902892a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java @@ -40,11 +40,9 @@ public class ExMultiPartyCommandChannelInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MULTI_PARTY_COMMAND_CHANNEL_INFO.writeId(packet); - packet.writeS(_channel.getLeader().getName()); - packet.writeD(0x00); // Channel loot 0 or 1 + packet.writeD(0); // Channel loot 0 or 1 packet.writeD(_channel.getMemberCount()); - packet.writeD(_channel.getParties().size()); for (Party p : _channel.getParties()) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java index 1536bd5f9b..f2a32bb6e8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNeedToChangeName.java @@ -43,7 +43,6 @@ public class ExNeedToChangeName implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEED_TO_CHANGE_NAME.writeId(packet); - packet.writeD(_type); packet.writeD(_subType); packet.writeS(_name); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java index be9bec8559..d18b4606b3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventEffect.java @@ -35,7 +35,6 @@ public class ExNevitAdventEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CHANNELING_EFFECT.writeId(packet); - packet.writeD(_timeLeft); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java index 3a0367c178..09f6250f51 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java @@ -35,7 +35,6 @@ public class ExNevitAdventPointInfoPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_AGATHION_ENERGY_INFO.writeId(packet); - packet.writeD(_points); // 72 = 1%, max 7200 = 100% return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java index 88fdaae499..ef220d86de 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNevitAdventTimeChange.java @@ -37,9 +37,8 @@ public class ExNevitAdventTimeChange implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - // state 0 - pause 1 - started - packet.writeC(_paused ? 0x00 : 0x01); + packet.writeC(_paused ? 0 : 1); // left time in ms max is 16000 its 4m and state is automatically changed to quit packet.writeD(_time); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java index fccdf510cc..4025bf78fa 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNewSkillToLearnByLevelUp.java @@ -34,7 +34,6 @@ public class ExNewSkillToLearnByLevelUp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NEW_SKILL_TO_LEARN_BY_LEVEL_UP.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java index 324c18a517..f2ce8614dc 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java @@ -43,8 +43,7 @@ public class ExNoticePostArrived implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTICE_POST_ARRIVED.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java index afe3719d9b..050c7ccea5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java @@ -43,8 +43,7 @@ public class ExNoticePostSent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_WRITE_POST.writeId(packet); - - packet.writeD(_showAnim ? 0x01 : 0x00); + packet.writeD(_showAnim ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java index 5d98c20b09..e0bd08d39a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExNotifyPremiumItem.java @@ -30,7 +30,6 @@ public class ExNotifyPremiumItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_PREMIUM_ITEM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java index 6cb3724448..ba3c0cfeaa 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchEnd.java @@ -34,7 +34,6 @@ public class ExOlympiadMatchEnd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MATCH_END.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java index 264d5aa484..7ffd5ed3bd 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchList.java @@ -55,19 +55,15 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x00); // Type 0 = Match List, 1 = Match Result - + packet.writeD(0); // Type 0 = Match List, 1 = Match Result packet.writeD(_games.size()); - packet.writeD(0x00); - + packet.writeD(0); for (OlympiadGameTask curGame : _games) { final AbstractOlympiadGame game = curGame.getGame(); if (game != null) { packet.writeD(game.getStadiumId()); // Stadium Id (Arena 1 = 0) - if (game instanceof OlympiadGameNonClassed) { packet.writeD(1); @@ -80,8 +76,7 @@ public class ExOlympiadMatchList implements IClientOutgoingPacket { packet.writeD(0); } - - packet.writeD(curGame.isRunning() ? 0x02 : 0x01); // (1 = Standby, 2 = Playing) + packet.writeD(curGame.isRunning() ? 2 : 1); // (1 = Standby, 2 = Playing) packet.writeS(game.getPlayerNames()[0]); // Player 1 Name packet.writeS(game.getPlayerNames()[1]); // Player 2 Name } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java index 712651603d..b387271fba 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMatchResult.java @@ -53,9 +53,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_OLYMPIAD.writeId(packet); - - packet.writeD(0x01); // Type 0 = Match List, 1 = Match Result - + packet.writeD(1); // Type 0 = Match List, 1 = Match Result packet.writeD(_tie ? 1 : 0); // 0 - win, 1 - tie packet.writeS(_winnerList.get(0).getName()); packet.writeD(_winTeam); @@ -69,9 +67,8 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } - packet.writeD(_loseTeam); packet.writeD(_loserList.size()); for (OlympiadInfo info : _loserList) @@ -83,7 +80,7 @@ public class ExOlympiadMatchResult implements IClientOutgoingPacket packet.writeD(info.getDamage()); packet.writeD(info.getCurrentPoints()); packet.writeD(info.getDiffPoints()); - packet.writeD(0x00); // Helios + packet.writeD(0); // Helios } return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java index 34d81d1f53..712b9e06c6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadMode.java @@ -38,7 +38,6 @@ public class ExOlympiadMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MODE.writeId(packet); - packet.writeC(_mode); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java index ebea6c56f3..5b4f2c2523 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java @@ -53,7 +53,6 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_SPELLED_INFO.writeId(packet); - packet.writeD(_playerId); packet.writeD(_effects.size() + _effects2.size()); for (BuffInfo info : _effects) @@ -62,7 +61,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(info.getSkill().getDisplayId()); packet.writeH(info.getSkill().getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(info.getSkill().getAbnormalType().getClientId()); writeOptionalD(packet, info.getSkill().isAura() ? -1 : info.getTime()); } @@ -73,7 +72,7 @@ public class ExOlympiadSpelledInfo implements IClientOutgoingPacket { packet.writeD(skill.getDisplayId()); packet.writeH(skill.getDisplayLevel()); - packet.writeH(0x00); // Sub level + packet.writeH(0); // Sub level packet.writeD(skill.getAbnormalType().getClientId()); packet.writeH(-1); } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java index 18c34fe9de..ca473edfcf 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOlympiadUserInfo.java @@ -76,7 +76,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_USER_INFO.writeId(packet); - if (_player != null) { packet.writeC(_player.getOlympiadSide()); @@ -91,7 +90,6 @@ public class ExOlympiadUserInfo implements IClientOutgoingPacket packet.writeS(_par.getName()); packet.writeD(_par.getBaseClass()); } - packet.writeD(_curHp); packet.writeD(_maxHp); packet.writeD(_curCp); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java index e84d0251bd..7ec64cc8c3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExOpenMPCC.java @@ -35,7 +35,6 @@ public class ExOpenMPCC implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OPEN_MPCC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java index 90349cc1a2..5661dc9f57 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPCCafePointInfo.java @@ -56,7 +56,6 @@ public class ExPCCafePointInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PCCAFE_POINT_INFO.writeId(packet); - packet.writeD(_points); // num points packet.writeD(_mAddPoint); // points inc display packet.writeC(_mPeriodType); // period(0=don't show window,1=acquisition,2=use points) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java index f7e8b4a99a..248a2f7d98 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowAdd.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_ADD.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java index 832bee0012..1f452f4bae 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowDelete.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_DELETE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_summon.getSummonType()); packet.writeD(_summon.getOwner().getObjectId()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java index 0646a67001..703694fa2f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java @@ -36,7 +36,6 @@ public class ExPartyPetWindowUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_PET_WINDOW_UPDATE.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); packet.writeC(_summon.getSummonType()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index 0e3edb3ea7..e4c6b79ae0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -47,7 +47,6 @@ public class ExPartyRoomMember implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PARTY_ROOM_MEMBER.writeId(packet); - packet.writeD(_type.ordinal()); packet.writeD(_room.getMembersCount()); for (Player member : _room.getMembers()) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java index 082f4c7662..0f72c05a3a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPlayScene.java @@ -34,7 +34,6 @@ public class ExPlayScene implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLAY_SCENE.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java index e98d317e14..7e3803bdaa 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeCount.java @@ -36,7 +36,6 @@ public class ExPledgeCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_COUNT.writeId(packet); - packet.writeD(_count); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java index 838029e284..4084de3481 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeDraftListSearch.java @@ -38,7 +38,6 @@ public class ExPledgeDraftListSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_DRAFT_LIST_SEARCH.writeId(packet); - packet.writeD(_pledgeRecruitList.size()); for (PledgeWaitingInfo prl : _pledgeRecruitList) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java index fb956e9996..44e34004ea 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeEmblem.java @@ -25,11 +25,12 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExPledgeEmblem implements IClientOutgoingPacket { + private static final int TOTAL_SIZE = 65664; + private final int _crestId; private final int _clanId; private final byte[] _data; private final int _chunkId; - private static final int TOTAL_SIZE = 65664; public ExPledgeEmblem(int crestId, byte[] chunkedData, int clanId, int chunkId) { @@ -43,7 +44,6 @@ public class ExPledgeEmblem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_EMBLEM.writeId(packet); - packet.writeD(Config.SERVER_ID); packet.writeD(_clanId); packet.writeD(_crestId); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java index ed19bf976b..b32f8c0645 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitApplyInfo.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitApplyInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_APPLY_INFO.writeId(packet); - packet.writeD(_status.ordinal()); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java index fc98b7b6f7..af4af9c9c1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardDetail.java @@ -36,7 +36,6 @@ public class ExPledgeRecruitBoardDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_DETAIL.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClanId()); packet.writeD(_pledgeRecruitInfo.getKarma()); packet.writeS(_pledgeRecruitInfo.getInformation()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index b4d48373a6..eda808e754 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -34,7 +34,6 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket private final int _clanOnCurrentPage; private final int _startIndex; private final int _endIndex; - static final int CLAN_PER_PAGE = 12; public ExPledgeRecruitBoardSearch(List clanList, int currentPage) @@ -51,11 +50,9 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_BOARD_SEARCH.writeId(packet); - packet.writeD(_currentPage); packet.writeD(_totalNumberOfPage); packet.writeD(_clanOnCurrentPage); - for (int i = _startIndex; i < _endIndex; i++) { packet.writeD(_clanList.get(i).getClanId()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 4ae5ffe316..b1f139226d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -40,7 +40,6 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - final Collection subPledges = _clan.getAllSubPledges(); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java index 77080a3820..5844f220ec 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingList.java @@ -39,7 +39,6 @@ public class ExPledgeWaitingList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST.writeId(packet); - packet.writeD(pledgePlayerRecruitInfos.size()); for (PledgeApplicantInfo recruitInfo : pledgePlayerRecruitInfos.values()) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java index a9245c1309..6b88572057 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListAlarm.java @@ -30,7 +30,6 @@ public class ExPledgeWaitingListAlarm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_ALARM.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java index 60997b3da0..28c3967119 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingListApplied.java @@ -40,7 +40,6 @@ public class ExPledgeWaitingListApplied implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_LIST_APPLIED.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getClan().getId()); packet.writeS(_pledgeRecruitInfo.getClan().getName()); packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java index 66a06892c2..1f53d1bb38 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPledgeWaitingUser.java @@ -36,7 +36,6 @@ public class ExPledgeWaitingUser implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_WAITING_USER.writeId(packet); - packet.writeD(_pledgeRecruitInfo.getPlayerId()); packet.writeS(_pledgeRecruitInfo.getMessage()); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java index 49bc9b0995..5f404779f5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java @@ -43,7 +43,6 @@ public class ExPrivateStoreSetWholeMsg implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PRIVATE_STORE_WHOLE_MSG.writeId(packet); - packet.writeD(_objectId); packet.writeS(_msg); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java index cb5e8fbce9..ff996b5d0c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutCommissionResultForVariationMake implements IClientOutgoingPac public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_COMMISSION_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_gemstoneObjId); packet.writeD(_itemId); packet.writeQ(_gemstoneCount); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java index 81721e921f..098472b7ae 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantScrollItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantScrollItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SCROLL_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java index 871f377db2..ffea182a49 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java index c47a4bcff4..8016e128f4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java @@ -35,7 +35,6 @@ public class ExPutEnchantTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ENCHANT_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java index c8b46be499..95c0c0e4e1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java @@ -40,7 +40,6 @@ public class ExPutIntensiveResultForVariationMake implements IClientOutgoingPack public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_INTENSIVE_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_refinerItemObjId); packet.writeD(_lifestoneItemId); packet.writeD(_gemstoneItemId); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index 2128b2b19f..2970ca00a2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -41,13 +41,12 @@ public class ExPutItemResultForVariationCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_CANCEL.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); packet.writeD(_itemAug1); packet.writeD(_itemAug2); packet.writeQ(_price); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java index 80541e65cd..c25dd16b01 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java @@ -34,10 +34,9 @@ public class ExPutItemResultForVariationMake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_ITEM_RESULT_FOR_VARIATION_MAKE.writeId(packet); - packet.writeD(_itemObjId); packet.writeD(_itemId); - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java index fe5eb74eb0..bc8896164d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExQuestNpcLogList.java @@ -56,13 +56,12 @@ public class ExQuestNpcLogList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_QUEST_NPC_LOG_LIST.writeId(packet); - packet.writeD(_questId); packet.writeC(_npcLogList.size()); for (NpcLogListHolder holder : _npcLogList) { packet.writeD(holder.isNpcString() ? holder.getId() : holder.getId() + 1000000); - packet.writeC(holder.isNpcString() ? 0x01 : 0x00); + packet.writeC(holder.isNpcString() ? 1 : 0); packet.writeD(holder.getCount()); } return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java index 62d622caff..60616b256d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRedSky.java @@ -35,7 +35,6 @@ public class ExRedSky implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RED_SKY.writeId(packet); - packet.writeD(_duration); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java index ce40b1a792..163faff855 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRegenMax.java @@ -36,7 +36,6 @@ public class ExRegenMax implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REGEN_MAX.writeId(packet); - packet.writeD(1); packet.writeD(_time); packet.writeD(_tickInterval); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java index d864795cd6..a17525576b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRemoveEnchantSupportItemResult.java @@ -34,7 +34,6 @@ public class ExRemoveEnchantSupportItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REMOVE_ENCHANT_SUPPORT_ITEM_RESULT.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java index 57ed88ac29..4e479e75a6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplyReceivedPost.java @@ -56,7 +56,6 @@ public class ExReplyReceivedPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_RECEIVED_POST.writeId(packet); - packet.writeD(_msg.getMailType().ordinal()); // GOD if (_msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED) { @@ -76,11 +75,10 @@ public class ExReplyReceivedPost extends AbstractItemPacket } packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown packet.writeS(_msg.getSenderName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -92,9 +90,8 @@ public class ExReplyReceivedPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeQ(_msg.getReqAdena()); packet.writeD(_msg.hasAttachments() ? 1 : 0); packet.writeD(_msg.isReturned() ? 1 : 0); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java index 75f6596194..ed490eae91 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExReplySentPost.java @@ -54,14 +54,12 @@ public class ExReplySentPost extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REPLY_SENT_POST.writeId(packet); - - packet.writeD(0x00); // GOD + packet.writeD(0); // GOD packet.writeD(_msg.getId()); packet.writeD(_msg.isLocked() ? 1 : 0); packet.writeS(_msg.getReceiverName()); packet.writeS(_msg.getSubject()); packet.writeS(_msg.getContent()); - if ((_items != null) && !_items.isEmpty()) { packet.writeD(_items.size()); @@ -73,11 +71,11 @@ public class ExReplySentPost extends AbstractItemPacket } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeQ(_msg.getReqAdena()); - packet.writeD(_msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(_msg.isReturned() ? 0x01 : 00); + packet.writeD(_msg.hasAttachments() ? 1 : 0); + packet.writeD(_msg.isReturned() ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java index cc4f7ce1d8..e6a3f9bca2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java @@ -35,7 +35,6 @@ public class ExRequestChangeNicknameColor implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHANGE_NICKNAME_NCOLOR.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java index 2634aa1cdd..60201b177f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRequestHackShield.java @@ -35,7 +35,6 @@ public class ExRequestHackShield implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_REQUEST_HACK_SHIELD.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java index c51ff31d0b..75e3b3a945 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java @@ -29,13 +29,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyList implements IClientOutgoingPacket { + public static final int SHOW_FACESHAPE = 1; + public static final int SHOW_HAIRSTYLE = 0; + private final Player _player; private final int _type; private final Map _beautyItem; - public static final int SHOW_FACESHAPE = 1; - public static final int SHOW_HAIRSTYLE = 0; - public ExResponseBeautyList(Player player, int type) { _player = player; @@ -54,7 +54,6 @@ public class ExResponseBeautyList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java index ca2ed360ab..4b19201833 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java @@ -25,16 +25,15 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket { + public static final int FAILURE = 0; + public static final int SUCCESS = 1; + public static final int CHANGE = 0; + public static final int RESTORE = 1; + private final Player _player; private final int _type; private final int _result; - public static final int FAILURE = 0; - public static final int SUCCESS = 1; - - public static final int CHANGE = 0; - public static final int RESTORE = 1; - public ExResponseBeautyRegistReset(Player player, int type, int result) { _player = player; @@ -46,7 +45,6 @@ public class ExResponseBeautyRegistReset implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_BEAUTY_REGIST_RESET.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); packet.writeD(_type); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java index 0e313ef3b7..c0922cfb04 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExResponseResetList.java @@ -36,10 +36,8 @@ public class ExResponseResetList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_RESET_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); packet.writeQ(_player.getBeautyTickets()); - packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java index 01fe1945ef..a230033d67 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRotation.java @@ -37,7 +37,6 @@ public class ExRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ROTATION.writeId(packet); - packet.writeD(_charId); packet.writeD(_heading); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java index c58ccfc233..2646a71e77 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java @@ -36,7 +36,6 @@ public class ExRpItemLink extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RP_ITEM_LINK.writeId(packet); - writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java index 04556bbed2..f0c6eba8e9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSearchOrc.java @@ -34,7 +34,6 @@ public class ExSearchOrc implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEARCH_ORC.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java index 1e06cc2a3f..7a4dced122 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSendManorList.java @@ -38,7 +38,6 @@ public class ExSendManorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_MANOR_LIST.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java index b63c69f37e..2c25cc8bfc 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSendUIEvent.java @@ -124,7 +124,6 @@ public class ExSendUIEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SEND_UIEVENT.writeId(packet); - packet.writeD(_objectId); packet.writeD(_type); // 0 = show, 1 = hide (there is 2 = pause and 3 = resume also but they don't work well you can only pause count down and you cannot resume it because resume hides the counter). packet.writeD(0); // unknown diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java index 4378479707..716a3e8623 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExServerPrimitive.java @@ -385,16 +385,13 @@ public class ExServerPrimitive implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SERVER_PRIMITIVE.writeId(packet); - packet.writeS(_name); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); packet.writeD(65535); // has to do something with display range and angle packet.writeD(65535); // has to do something with display range and angle - packet.writeD(_points.size() + _lines.size()); - for (Point point : _points) { packet.writeC(1); // Its the type in this case Point @@ -408,7 +405,6 @@ public class ExServerPrimitive implements IClientOutgoingPacket packet.writeD(point.getY()); packet.writeD(point.getZ()); } - for (Line line : _lines) { packet.writeC(2); // Its the type in this case Line diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java index 5187833002..627d61cd05 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSetCompassZoneCode.java @@ -43,7 +43,6 @@ public class ExSetCompassZoneCode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_COMPASS_ZONE_CODE.writeId(packet); - packet.writeD(_zoneType); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java index 1d0fbae3a4..34dee8bda0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSetPartyLooting.java @@ -38,7 +38,6 @@ public class ExSetPartyLooting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SET_PARTY_LOOTING.writeId(packet); - packet.writeD(_result); packet.writeD(_partyDistributionType.getId()); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java index 7b14ec8412..4e491af9d1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java @@ -34,7 +34,6 @@ public class ExShowAdventurerGuideBook implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_ADVENTURER_GUIDE_BOOK.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java index 82554fdc5f..1f8df76083 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowAgitInfo.java @@ -39,7 +39,6 @@ public class ExShowAgitInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_AGIT_INFO.writeId(packet); - final Collection clanHalls = ClanHallData.getInstance().getClanHalls(); packet.writeD(clanHalls.size()); clanHalls.forEach(clanHall -> diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index dd11ee0150..51e6646ff5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -44,7 +44,6 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BASE_ATTRIBUTE_CANCEL_WINDOW.writeId(packet); - packet.writeD(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java index 14e55d39f3..e22345c4fd 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java @@ -25,13 +25,13 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExShowBeautyMenu implements IClientOutgoingPacket { - private final Player _player; - private final int _type; - // TODO: Enum public static final int MODIFY_APPEARANCE = 0; public static final int RESTORE_APPEARANCE = 1; + private final Player _player; + private final int _type; + public ExShowBeautyMenu(Player player, int type) { _player = player; @@ -42,7 +42,6 @@ public class ExShowBeautyMenu implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_BEAUTY_MENU.writeId(packet); - packet.writeD(_type); packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java index 15d011befc..b0d2b90494 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCastleInfo.java @@ -41,7 +41,6 @@ public class ExShowCastleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CASTLE_INFO.writeId(packet); - final Collection castles = CastleManager.getInstance().getCastles(); packet.writeD(castles.size()); for (Castle castle : castles) @@ -65,8 +64,7 @@ public class ExShowCastleInfo implements IClientOutgoingPacket } packet.writeD(castle.getTaxPercent(TaxType.BUY)); packet.writeD((int) (castle.getSiege().getSiegeDate().getTimeInMillis() / 1000)); - - packet.writeC(castle.getSiege().isInProgress() ? 0x01 : 0x00); // Grand Crusade + packet.writeC(castle.getSiege().isInProgress() ? 1 : 0); // Grand Crusade packet.writeC(castle.getSide().ordinal()); // Grand Crusade } return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java index aeb4079f3a..f9a6ebe0e7 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowContactList.java @@ -38,7 +38,6 @@ public class ExShowContactList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RECEIVE_SHOW_POST_FRIEND.writeId(packet); - packet.writeD(_contacts.size()); _contacts.forEach(packet::writeS); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java index a079ea3129..94b989b583 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropInfo.java @@ -37,7 +37,6 @@ public class ExShowCropInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _crops = (nextPeriod && !manor.isManorApproved()) ? null : manor.getCropProcure(manorId, nextPeriod); } @@ -46,10 +45,9 @@ public class ExShowCropInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Crop Sales" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Crop Sales" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); + packet.writeD(0); if (_crops != null) { packet.writeD(_crops.size()); @@ -64,17 +62,17 @@ public class ExShowCropInfo implements IClientOutgoingPacket if (seed == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(seed.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(seed.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(seed.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java index ebffd775d8..1f01ee7b87 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowCropSetting.java @@ -62,10 +62,8 @@ public class ExShowCropSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_CROP_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getCropId()); // crop id diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java index ee9fa9fd37..b625a1e4e7 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressInfo.java @@ -39,7 +39,6 @@ public class ExShowFortressInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_INFO.writeId(packet); - final Collection forts = FortManager.getInstance().getForts(); packet.writeD(forts.size()); for (Fort fort : forts) @@ -47,7 +46,7 @@ public class ExShowFortressInfo implements IClientOutgoingPacket final Clan clan = fort.getOwnerClan(); packet.writeD(fort.getResidenceId()); packet.writeS(clan != null ? clan.getName() : ""); - packet.writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00); + packet.writeD(fort.getSiege().isInProgress() ? 1 : 0); // Time of possession packet.writeD(fort.getOwnedTime()); } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java index f389b26ed5..678ab43e96 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressMapInfo.java @@ -42,11 +42,9 @@ public class ExShowFortressMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_MAP_INFO.writeId(packet); - packet.writeD(_fortress.getResidenceId()); packet.writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status packet.writeD(_fortress.getFortSize()); // barracks count - final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId()); if ((commanders != null) && !commanders.isEmpty() && _fortress.getSiege().isInProgress()) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 27da99cf41..da186103ae 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -51,7 +51,6 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_FORTRESS_SIEGE_INFO.writeId(packet); - packet.writeD(_fortId); // Fortress Id packet.writeD(_size); // Total Barracks Count if (_csize > 0) @@ -64,22 +63,22 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { case 0: { - packet.writeD(0x03); + packet.writeD(3); break; } case 1: { - packet.writeD(0x02); + packet.writeD(2); break; } case 2: { - packet.writeD(0x01); + packet.writeD(1); break; } case 3: { - packet.writeD(0x00); + packet.writeD(0); break; } } @@ -92,27 +91,27 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket // TODO: once control room supported, update packet.writeD(0x0x) to support 5th room case 0: { - packet.writeD(0x05); + packet.writeD(5); break; } case 1: { - packet.writeD(0x04); + packet.writeD(4); break; } case 2: { - packet.writeD(0x03); + packet.writeD(3); break; } case 3: { - packet.writeD(0x02); + packet.writeD(2); break; } case 4: { - packet.writeD(0x01); + packet.writeD(1); break; } } @@ -124,7 +123,7 @@ public class ExShowFortressSiegeInfo implements IClientOutgoingPacket { for (int i = 0; i < _size; i++) { - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java index f7aca7dffd..912839e242 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowManorDefaultInfo.java @@ -41,8 +41,7 @@ public class ExShowManorDefaultInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_MANOR_DEFAULT_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" and "Crop Sales" buttons + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" and "Crop Sales" buttons packet.writeD(_crops.size()); for (Seed crop : _crops) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java index 1d3312d668..d03ce2a5fd 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowProcureCropDetail.java @@ -52,10 +52,8 @@ public class ExShowProcureCropDetail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_PROCURE_CROP_DETAIL.writeId(packet); - packet.writeD(_cropId); // crop id packet.writeD(_castleCrops.size()); // size - for (Entry entry : _castleCrops.entrySet()) { final CropProcure crop = entry.getValue(); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java index cf38d18c1c..f41999329f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestInfo.java @@ -34,7 +34,6 @@ public class ExShowQuestInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_INFO.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java index 70f31e318f..0fa64c401d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowQuestMark.java @@ -37,7 +37,6 @@ public class ExShowQuestMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_QUEST_MARK.writeId(packet); - packet.writeD(_questId); packet.writeD(_questState); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java index ab85228caf..1a6ee00a10 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowReceivedPostList.java @@ -31,11 +31,11 @@ import org.l2jmobius.gameserver.network.SystemMessageId; */ public class ExShowReceivedPostList implements IClientOutgoingPacket { - private final List _inbox; - private static final int MESSAGE_FEE = 100; private static final int MESSAGE_FEE_PER_SLOT = 1000; + private final List _inbox; + public ExShowReceivedPostList(int objectId) { _inbox = MailManager.getInstance().getInbox(objectId); @@ -45,7 +45,6 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_RECEIVED_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_inbox != null) && !_inbox.isEmpty()) { @@ -64,18 +63,18 @@ public class ExShowReceivedPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getSenderName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); + packet.writeD(msg.isUnread() ? 1 : 0); packet.writeD(((msg.getMailType() == MailType.COMMISSION_ITEM_SOLD) || (msg.getMailType() == MailType.COMMISSION_ITEM_RETURNED)) ? 0 : 1); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(msg.isReturned() ? 0x01 : 0x00); - packet.writeD(0x00); // SysString in some case it seems + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(msg.isReturned() ? 1 : 0); + packet.writeD(0); // SysString in some case it seems } } else { - packet.writeD(0x00); + packet.writeD(0); } packet.writeD(MESSAGE_FEE); packet.writeD(MESSAGE_FEE_PER_SLOT); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java index 9679468789..deebb99c8f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java @@ -33,6 +33,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId.SMLocalisation; */ public class ExShowScreenMessage implements IClientOutgoingPacket { + // Positions + public static final byte TOP_LEFT = 1; + public static final byte TOP_CENTER = 2; + public static final byte TOP_RIGHT = 3; + public static final byte MIDDLE_LEFT = 4; + public static final byte MIDDLE_CENTER = 5; + public static final byte MIDDLE_RIGHT = 6; + public static final byte BOTTOM_CENTER = 7; + public static final byte BOTTOM_RIGHT = 8; + private final int _type; private final int _sysMessageId; private final int _unk1; @@ -48,15 +58,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket private List _parameters; // Localisation related. private String _lang; - // Positions - public static final byte TOP_LEFT = 0x01; - public static final byte TOP_CENTER = 0x02; - public static final byte TOP_RIGHT = 0x03; - public static final byte MIDDLE_LEFT = 0x04; - public static final byte MIDDLE_CENTER = 0x05; - public static final byte MIDDLE_RIGHT = 0x06; - public static final byte BOTTOM_CENTER = 0x07; - public static final byte BOTTOM_RIGHT = 0x08; public void setLang(String lang) { @@ -265,7 +266,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SCREEN_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -284,9 +284,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(sml.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -308,9 +308,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(-1); packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.emptyList())); return true; @@ -318,7 +318,6 @@ public class ExShowScreenMessage implements IClientOutgoingPacket } } } - packet.writeD(_type); packet.writeD(_sysMessageId); packet.writeD(_position); @@ -326,9 +325,9 @@ public class ExShowScreenMessage implements IClientOutgoingPacket packet.writeD(_size); packet.writeD(_unk2); packet.writeD(_unk3); - packet.writeD(_effect ? 0x01 : 0x00); + packet.writeD(_effect ? 1 : 0); packet.writeD(_time); - packet.writeD(_fade ? 0x01 : 0x00); + packet.writeD(_fade ? 1 : 0); packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java index 29ab5d355f..6123b08991 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedInfo.java @@ -37,7 +37,6 @@ public class ExShowSeedInfo implements IClientOutgoingPacket { _manorId = manorId; _hideButtons = hideButtons; - final CastleManorManager manor = CastleManorManager.getInstance(); _seeds = (nextPeriod && !manor.isManorApproved()) ? null : manor.getSeedProduction(manorId, nextPeriod); } @@ -46,16 +45,14 @@ public class ExShowSeedInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_INFO.writeId(packet); - - packet.writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" button + packet.writeC(_hideButtons ? 1 : 0); // Hide "Seed Purchase" button packet.writeD(_manorId); // Manor ID - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown if (_seeds == null) { packet.writeD(0); return true; } - packet.writeD(_seeds.size()); for (SeedProduction seed : _seeds) { @@ -67,17 +64,17 @@ public class ExShowSeedInfo implements IClientOutgoingPacket if (s == null) { packet.writeD(0); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(0); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(0); // Reward 2 - item id } else { packet.writeD(s.getLevel()); // Seed level - packet.writeC(0x01); // Reward 1 + packet.writeC(1); // Reward 1 packet.writeD(s.getReward(1)); // Reward 1 - item id - packet.writeC(0x01); // Reward 2 + packet.writeC(1); // Reward 2 packet.writeD(s.getReward(2)); // Reward 2 - item id } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java index e628099700..eb6e686e10 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedMapInfo.java @@ -32,13 +32,10 @@ public class ExShowSeedMapInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_MAP_INFO.writeId(packet); - packet.writeD(2); // seed count - // Seed of Destruction packet.writeD(1); // id 1? Grand Crusade packet.writeD(2770 + GraciaSeedsManager.getInstance().getSoDState()); // sys msg id - // Seed of Infinity packet.writeD(2); // id 2? Grand Crusade // Manager not implemented yet diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java index 4fd891a466..373c314eba 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSeedSetting.java @@ -62,10 +62,8 @@ public class ExShowSeedSetting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SEED_SETTING.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_seeds.size()); // size - for (Seed s : _seeds) { packet.writeD(s.getSeedId()); // seed id diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java index 1994402da2..269bec5b97 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSellCropList.java @@ -47,7 +47,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket _cropsItems.put(cropId, item); } } - for (CropProcure crop : CastleManorManager.getInstance().getCropProcure(_manorId, false)) { if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) @@ -61,7 +60,6 @@ public class ExShowSellCropList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SELL_CROP_LIST.writeId(packet); - packet.writeD(_manorId); // manor id packet.writeD(_cropsItems.size()); // size for (Item item : _cropsItems.values()) @@ -70,9 +68,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket packet.writeD(item.getObjectId()); // Object id packet.writeD(item.getId()); // crop id packet.writeD(seed.getLevel()); // seed level - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(1)); // reward 1 id - packet.writeC(0x01); + packet.writeC(1); packet.writeD(seed.getReward(2)); // reward 2 id if (_castleCrops.containsKey(item.getId())) { @@ -85,9 +83,9 @@ public class ExShowSellCropList implements IClientOutgoingPacket else { packet.writeD(0xFFFFFFFF); // manor - packet.writeQ(0x00); // buy residual - packet.writeQ(0x00); // buy price - packet.writeC(0x00); // reward + packet.writeQ(0); // buy residual + packet.writeQ(0); // buy price + packet.writeC(0); // reward } packet.writeQ(item.getCount()); // my crops } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java index db4bccc928..b61d5b2301 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowSentPostList.java @@ -40,7 +40,6 @@ public class ExShowSentPostList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_SENT_POST_LIST.writeId(packet); - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if ((_outbox != null) && !_outbox.isEmpty()) { @@ -50,17 +49,17 @@ public class ExShowSentPostList implements IClientOutgoingPacket packet.writeD(msg.getId()); packet.writeS(msg.getSubject()); packet.writeS(msg.getReceiverName()); - packet.writeD(msg.isLocked() ? 0x01 : 0x00); + packet.writeD(msg.isLocked() ? 1 : 0); packet.writeD(msg.getExpirationSeconds()); - packet.writeD(msg.isUnread() ? 0x01 : 0x00); - packet.writeD(0x01); - packet.writeD(msg.hasAttachments() ? 0x01 : 0x00); - packet.writeD(0x00); + packet.writeD(msg.isUnread() ? 1 : 0); + packet.writeD(1); + packet.writeD(msg.hasAttachments() ? 1 : 0); + packet.writeD(0); } } else { - packet.writeD(0x00); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java index 0e4e9fd2ef..0dca57f2f8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTerritory.java @@ -48,7 +48,6 @@ public class ExShowTerritory implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TERRITORY.writeId(packet); - packet.writeD(_vertices.size()); packet.writeD(_minZ); packet.writeD(_maxZ); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java index 4e284f82c5..86e1009bbf 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowTrace.java @@ -46,7 +46,6 @@ public class ExShowTrace implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_TRACE.writeId(packet); - packet.writeH(0); // type broken in H5 packet.writeD(0); // time broken in H5 packet.writeH(_locations.size()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java index 3245767ed7..836a5c9624 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java @@ -44,7 +44,6 @@ public class ExShowUsm implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_USM.writeId(packet); - packet.writeD(_videoId); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java index 4acdffa842..1f1a14c31b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationCancelWindow.java @@ -34,7 +34,6 @@ public class ExShowVariationCancelWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_CANCEL_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java index 3a2298019e..9870424e26 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExShowVariationMakeWindow.java @@ -35,7 +35,6 @@ public class ExShowVariationMakeWindow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_VARIATION_MAKE_WINDOW.writeId(packet); - return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java index 169827bab3..86211c8d97 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSpawnEmitter.java @@ -44,10 +44,9 @@ public class ExSpawnEmitter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SPAWN_EMITTER.writeId(packet); - packet.writeD(_npcObjectId); packet.writeD(_playerObjectId); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java index 620800c1c4..534549b4fe 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExStartScenePlayer.java @@ -36,7 +36,6 @@ public class ExStartScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_START_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java index 0bd990cf34..babac59129 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_AIR_SHIP.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java index 0e2689d598..d3e67afe99 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExStopMoveInAirShip.java @@ -44,7 +44,6 @@ public class ExStopMoveInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipObjId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java index 44b064113f..f5b3e1340f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExStopScenePlayer.java @@ -36,7 +36,6 @@ public class ExStopScenePlayer implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_SCENE_PLAYER.writeId(packet); - packet.writeD(_movie.getClientId()); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java index 8029930c9a..367ac79be4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExStorageMaxCount.java @@ -66,7 +66,6 @@ public class ExStorageMaxCount implements IClientOutgoingPacket } OutgoingPackets.EX_STORAGE_MAX_COUNT.writeId(packet); - packet.writeD(_inventory); packet.writeD(_warehouse); // packet.writeD(_freight); // Removed with 152. diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java index 3293a5b557..57563ca2f9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java @@ -39,7 +39,6 @@ public class ExSubPledgeSkillAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUB_PLEDGET_SKILL_ADD.writeId(packet); - packet.writeD(_type); packet.writeD(_skillId); packet.writeD(_skillLevel); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java index d61dfa20ab..816d6f16a6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExSubjobInfo.java @@ -97,7 +97,6 @@ public class ExSubjobInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUBJOB_INFO.writeId(packet); - packet.writeC(_type); packet.writeD(_currClassId); packet.writeD(_currRace); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java index 85616016c7..b7a152629d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExTacticalSign.java @@ -38,7 +38,6 @@ public class ExTacticalSign implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TACTICAL_SIGN.writeId(packet); - packet.writeD(_target.getObjectId()); packet.writeD(_tokenId); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java index 3486e6281d..9e03a8bd0a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExTeleportToLocationActivate.java @@ -39,7 +39,6 @@ public class ExTeleportToLocationActivate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_TO_LOCATION_ACTIVATE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java index a214c53a0f..7bcddd964d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUISetting.java @@ -27,6 +27,7 @@ public class ExUISetting implements IClientOutgoingPacket { public static final String UI_KEY_MAPPING_VAR = "UI_KEY_MAPPING"; public static final String SPLIT_VAR = " "; + private final byte[] _uiKeyMapping; public ExUISetting(Player player) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java index 187770cfc8..eff4285a8b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUnReadMailCount.java @@ -37,7 +37,6 @@ public class ExUnReadMailCount implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_UN_READ_MAIL_COUNT.writeId(packet); - packet.writeD(_mailUnreadCount); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java index f992b3c937..e59c651371 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUseSharedGroupItem.java @@ -41,7 +41,6 @@ public class ExUseSharedGroupItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USE_SHARED_GROUP_ITEM.writeId(packet); - packet.writeD(_itemId); packet.writeD(_grpId); packet.writeD(_remainingTime); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java index 2b35f4fed1..53f6aa83de 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUserBoostStat.java @@ -40,7 +40,6 @@ public class ExUserBoostStat implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_BOOST_STAT.writeId(packet); - int count = 0; int bonus = 0; switch (_type) @@ -68,11 +67,9 @@ public class ExUserBoostStat implements IClientOutgoingPacket break; } } - packet.writeC(_type.getId()); packet.writeC(count); packet.writeH(bonus); - return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java index 474fcc5208..f49d451587 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class ExUserInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getTransformationId()); - final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); final boolean isInvisible = _player.isInvisible(); packet.writeD(abnormalVisualEffects.size() + (isInvisible ? 1 : 0)); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java index b841449ab3..1069a64e3e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoCubic.java @@ -36,12 +36,9 @@ public class ExUserInfoCubic implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_CUBIC.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(_player.getCubics().size()); - _player.getCubics().keySet().forEach(packet::writeH); - packet.writeD(_player.getAgathionId()); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java index 3e4afb995b..6ef31d6117 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoEquipSlot.java @@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class ExUserInfoEquipSlot extends AbstractMaskPacket { private final Player _player; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -66,11 +65,9 @@ public class ExUserInfoEquipSlot extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_EQUIP_SLOT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeH(InventorySlot.values().length); // 152 packet.writeB(_masks); - final PlayerInventory inventory = _player.getInventory(); for (InventorySlot slot : InventorySlot.values()) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java index 3eb1cf9578..d655e48843 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExUserInfoInvenWeight.java @@ -36,7 +36,6 @@ public class ExUserInfoInvenWeight implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_INVEN_WEIGHT.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java index 91e0e92338..16aa81e9c0 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExValidateLocationInAirShip.java @@ -44,7 +44,6 @@ public class ExValidateLocationInAirShip implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_AIR_SHIP.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java index 727267c9d5..50cb4025e4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationCancelResult.java @@ -35,7 +35,6 @@ public class ExVariationCancelResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_CANCEL_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java index 5cdc1b8d0e..4fde190ae2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExVariationResult.java @@ -32,14 +32,13 @@ public class ExVariationResult implements IClientOutgoingPacket { _option1 = option1; _option2 = option2; - _success = success ? 0x01 : 0x00; + _success = success ? 1 : 0; } @Override public boolean write(PacketWriter packet) { OutgoingPackets.EX_VARIATION_RESULT.writeId(packet); - packet.writeD(_option1); packet.writeD(_option2); packet.writeD(_success); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java index db0acfd5ff..60fb57c0b3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExVitalityEffectInfo.java @@ -41,10 +41,9 @@ public class ExVitalityEffectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VITALITY_EFFECT_INFO.writeId(packet); - packet.writeD(_points); packet.writeD(_vitalityBonus); // Vitality Bonus - packet.writeH(0x00); // Vitality additional bonus in % + packet.writeH(0); // Vitality additional bonus in % packet.writeH(_vitalityItemsRemaining); // How much vitality items remaining for use packet.writeH(Config.VITALITY_MAX_ITEMS_ALLOWED); // Max number of items for use return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java index 71baff96ea..c4c5539ca4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExVoteSystemInfo.java @@ -45,7 +45,6 @@ public class ExVoteSystemInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VOTE_SYSTEM_INFO.writeId(packet); - packet.writeD(_recomLeft); packet.writeD(_recomHave); packet.writeD(_bonusTime); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java index bc41adf7f2..8abcfc022e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ExWorldChatCnt.java @@ -37,7 +37,6 @@ public class ExWorldChatCnt implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_WORLD_CHAT_CNT.writeId(packet); - packet.writeD(_points); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java index 5f935fe0dc..dc9c2288f8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/FakePlayerInfo.java @@ -79,19 +79,17 @@ public class FakePlayerInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CHAR_INFO.writeId(packet); - packet.writeC(0x00); // Grand Crusade + packet.writeC(0); // Grand Crusade packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // vehicleId + packet.writeD(0); // vehicleId packet.writeD(_objId); packet.writeS(_npc.getName()); - packet.writeH(_npc.getRace().ordinal()); - packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 0x01 : 0x00); + packet.writeC(_npc.getTemplate().getSex() == Sex.FEMALE ? 1 : 0); packet.writeD(_fpcHolder.getClassId()); - - packet.writeD(0x00); // Inventory.PAPERDOLL_UNDER + packet.writeD(0); // Inventory.PAPERDOLL_UNDER packet.writeD(_fpcHolder.getEquipHead()); packet.writeD(_fpcHolder.getEquipRHand()); packet.writeD(_fpcHolder.getEquipLHand()); @@ -103,28 +101,22 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeD(_fpcHolder.getEquipRHand()); // dual hand packet.writeD(_fpcHolder.getEquipHair()); packet.writeD(_fpcHolder.getEquipHair2()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderAugument()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } - packet.writeC(_fpcHolder.getArmorEnchantLevel()); - for (@SuppressWarnings("unused") final int slot : getPaperdollOrderVisualId()) { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeC(_npc.getScriptValue()); // getPvpFlag() packet.writeD(_npc.getReputation()); - packet.writeD(_mAtkSpd); packet.writeD(_pAtkSpd); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -135,16 +127,12 @@ public class FakePlayerInfo implements IClientOutgoingPacket packet.writeH(_flyWalkSpd); packet.writeF(_moveMultiplier); packet.writeF(_attackSpeedMultiplier); - packet.writeF(_npc.getCollisionRadius()); packet.writeF(_npc.getCollisionHeight()); - packet.writeD(_fpcHolder.getHair()); packet.writeD(_fpcHolder.getHairColor()); packet.writeD(_fpcHolder.getFace()); - packet.writeS(_npc.getTemplate().getTitle()); - if (_clan != null) { packet.writeD(_clan.getId()); @@ -154,71 +142,51 @@ public class FakePlayerInfo implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); } - - packet.writeC(0x01); // isSitting() ? 0x00 : 0x01 (at some initial tests it worked) - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); - packet.writeC(_npc.isInCombat() ? 0x01 : 0x00); - - packet.writeC(_npc.isAlikeDead() ? 0x01 : 0x00); - - packet.writeC(_npc.isInvisible() ? 0x01 : 0x00); - - packet.writeC(0x00); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount - packet.writeC(0x00); // getPrivateStoreType().getId() - - packet.writeH(0x00); // getCubics().size() + packet.writeC(1); // isSitting() ? 0 : 1 (at some initial tests it worked) + packet.writeC(_npc.isRunning() ? 1 : 0); + packet.writeC(_npc.isInCombat() ? 1 : 0); + packet.writeC(_npc.isAlikeDead() ? 1 : 0); + packet.writeC(_npc.isInvisible() ? 1 : 0); + packet.writeC(0); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount + packet.writeC(0); // getPrivateStoreType().getId() + packet.writeH(0); // getCubics().size() // getCubics().keySet().forEach(packet::writeH); - packet.writeC(0x00); - + packet.writeC(0); packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : 0); packet.writeH(_fpcHolder.getRecommends()); - packet.writeD(0x00); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 - + packet.writeD(0); // getMountNpcId() == 0 ? 0 : getMountNpcId() + 1000000 packet.writeD(_fpcHolder.getClassId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(_fpcHolder.getWeaponEnchantLevel()); // isMounted() ? 0 : _enchantLevel - packet.writeC(_npc.getTeam().getId()); - - packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0x00); + packet.writeD(_clan != null ? _clan.getCrestLargeId() : 0); packet.writeC(_fpcHolder.getNobleLevel()); - packet.writeC(_fpcHolder.isHero() ? 0x01 : 0x00); - - packet.writeC(_fpcHolder.isFishing() ? 0x01 : 0x00); - + packet.writeC(_fpcHolder.isHero() ? 1 : 0); + packet.writeC(_fpcHolder.isFishing() ? 1 : 0); packet.writeD(_fpcHolder.getBaitLocationX()); packet.writeD(_fpcHolder.getBaitLocationY()); packet.writeD(_fpcHolder.getBaitLocationZ()); - packet.writeD(_fpcHolder.getNameColor()); - packet.writeD(_heading); - packet.writeC(_fpcHolder.getPledgeStatus()); - packet.writeH(0x00); // getPledgeType() - + packet.writeH(0); // getPledgeType() packet.writeD(_fpcHolder.getTitleColor()); - - packet.writeC(0x00); // isCursedWeaponEquipped - - packet.writeD(0x00); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 - packet.writeD(0x00); // getTransformationDisplayId() + packet.writeC(0); // isCursedWeaponEquipped + packet.writeD(0); // getAppearance().getVisibleClanId() > 0 ? getClan().getReputationScore() : 0 + packet.writeD(0); // getTransformationDisplayId() packet.writeD(_fpcHolder.getAgathionId()); - - packet.writeC(0x00); - - packet.writeD(0x00); // getCurrentCp() + packet.writeC(0); + packet.writeD(0); // getCurrentCp() packet.writeD(_npc.getMaxHp()); packet.writeD((int) Math.round(_npc.getCurrentHp())); packet.writeD(_npc.getMaxMp()); packet.writeD((int) Math.round(_npc.getCurrentMp())); - - packet.writeC(0x00); + packet.writeC(0); final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) @@ -229,9 +197,9 @@ public class FakePlayerInfo implements IClientOutgoingPacket { packet.writeH(AbnormalVisualEffect.STEALTH.getClientId()); } - packet.writeC(0x00); // cocPlayer.getPosition() - packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 0x01 : 0x00); - packet.writeC(0x00); // Used Ability Points + packet.writeC(0); // cocPlayer.getPosition() + packet.writeC((_fpcHolder.getHair() > 0) || (_fpcHolder.getEquipHair2() > 0) ? 1 : 0); + packet.writeC(0); // Used Ability Points return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java index ae088538da..03223c8a3e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/FlyToLocation.java @@ -62,7 +62,6 @@ public class FlyToLocation implements IClientOutgoingPacket _destY = destY; _destZ = destZ; _type = type; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -82,7 +81,6 @@ public class FlyToLocation implements IClientOutgoingPacket _flySpeed = flySpeed; _flyDelay = flyDelay; _animationSpeed = animationSpeed; - if (creature.isPlayer()) { creature.getActingPlayer().setBlinkActive(true); @@ -103,7 +101,6 @@ public class FlyToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FLY_TO_LOCATION.writeId(packet); - packet.writeD(_chaObjId); packet.writeD(_destX); packet.writeD(_destY); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java index 1e52b0ef72..471d70f791 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/FriendAddRequest.java @@ -35,8 +35,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x01); + packet.writeC(1); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java index ef1d37297e..2ee6ffbcd9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java @@ -50,25 +50,24 @@ public class GMHennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GMHENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON packet.writeH(_player.getHennaValue(BaseStat.MEN)); // equip MEN packet.writeH(_player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeH(_player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeH(0x00); // equip LUC - packet.writeH(0x00); // equip CHA + packet.writeH(0); // equip LUC + packet.writeH(0); // equip CHA packet.writeD(3); // Slots packet.writeD(_hennas.size()); // Size for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java index 38ca4c7be0..59bf0d9d93 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMHide.java @@ -38,7 +38,6 @@ public class GMHide implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_HIDE.writeId(packet); - packet.writeD(_mode); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java index cd876896af..c2f0803303 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java @@ -50,7 +50,6 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_CHARACTER_INFO.writeId(packet); - packet.writeD(_player.getX()); packet.writeD(_player.getY()); packet.writeD(_player.getZ()); @@ -69,8 +68,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getINT()); packet.writeD(_player.getWIT()); packet.writeD(_player.getMEN()); - packet.writeD(0x00); // LUC - packet.writeD(0x00); // CHA + packet.writeD(0); // LUC + packet.writeD(0); // CHA packet.writeD(_player.getMaxHp()); packet.writeD((int) _player.getCurrentHp()); packet.writeD(_player.getMaxMp()); @@ -79,28 +78,24 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getCurrentLoad()); packet.writeD(_player.getMaxLoad()); packet.writeD(_player.getPkKills()); - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollObjectId(slot)); } - for (int slot : getPaperdollOrder()) { packet.writeD(_player.getInventory().getPaperdollItemDisplayId(slot)); } - for (int slot = 0; slot < 11; slot++) { final VariationInstance augment = _player.getInventory().getPaperdollAugmentation(slot); packet.writeD(augment != null ? augment.getOption1Id() : 0); // Confirmed packet.writeD(augment != null ? augment.getOption2Id() : 0); // Confirmed } - packet.writeC(_player.getInventory().getTalismanSlots()); // CT2.3 packet.writeC(_player.getInventory().canEquipCloak() ? 1 : 0); // CT2.3 - packet.writeD(0x00); - packet.writeH(0x00); + packet.writeD(0); + packet.writeH(0); packet.writeD(_player.getPAtk()); packet.writeD(_player.getPAtkSpd()); packet.writeD(_player.getPDef()); @@ -108,18 +103,14 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAccuracy()); packet.writeD(_player.getCriticalHit()); packet.writeD(_player.getMAtk()); - packet.writeD(_player.getMAtkSpd()); packet.writeD(_player.getPAtkSpd()); - packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicEvasionRate()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(_player.getPvpFlag()); // 0-non-pvp 1-pvp = violett name packet.writeD(_player.getReputation()); - packet.writeD(_runSpd); packet.writeD(_walkSpd); packet.writeD(_swimRunSpd); @@ -135,8 +126,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeD(_player.getAppearance().getHairStyle()); packet.writeD(_player.getAppearance().getHairColor()); packet.writeD(_player.getAppearance().getFace()); - packet.writeD(_player.isGM() ? 0x01 : 0x00); // builder level - + packet.writeD(_player.isGM() ? 1 : 0); // builder level packet.writeS(_player.getTitle()); packet.writeD(_player.getClanId()); // pledge id packet.writeD(_player.getClanCrestId()); // pledge crest id @@ -146,26 +136,19 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket packet.writeC(_player.hasDwarvenCraft() ? 1 : 0); packet.writeD(_player.getPkKills()); packet.writeD(_player.getPvpKills()); - packet.writeH(_player.getRecomLeft()); packet.writeH(_player.getRecomHave()); // Blue value for name (0 = white, 255 = pure blue) packet.writeD(_player.getClassId().getId()); - packet.writeD(0x00); // special effects? circles around player... + packet.writeD(0); // special effects? circles around player... packet.writeD(_player.getMaxCp()); packet.writeD((int) _player.getCurrentCp()); - - packet.writeC(_player.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window - + packet.writeC(_player.isRunning() ? 1 : 0); // changes the Speed display on Status Window packet.writeC(321); - packet.writeD(_player.getPledgeClass()); // changes the text above CP on Status Window - - packet.writeC(_player.isNoble() ? 0x01 : 0x00); - packet.writeC(_player.isHero() ? 0x01 : 0x00); - + packet.writeC(_player.isNoble() ? 1 : 0); + packet.writeC(_player.isHero() ? 1 : 0); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); - final AttributeType attackAttribute = _player.getAttackElement(); packet.writeH(attackAttribute.getClientId()); packet.writeH(_player.getAttackElementValue(attackAttribute)); @@ -175,8 +158,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket } packet.writeD(_player.getFame()); packet.writeD(_player.getVitalityPoints()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index 1d88596096..552b6e6168 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -37,14 +37,12 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_PLEDGE_INFO.writeId(packet); - - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_player.getName()); packet.writeD(_clan.getId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeS(_clan.getName()); packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game packet.writeD(_clan.getLevel()); packet.writeD(_clan.getCastleId()); @@ -52,15 +50,14 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket packet.writeD(_clan.getFortId()); packet.writeD(_clan.getRank()); packet.writeD(_clan.getReputationScore()); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); packet.writeD(_clan.getAllyId()); // c2 packet.writeS(_clan.getAllyName()); // c2 packet.writeD(_clan.getAllyCrestId()); // c2 packet.writeD(_clan.isAtWar() ? 1 : 0); // c3 - packet.writeD(0x00); // T3 Unknown - + packet.writeD(0); // T3 Unknown packet.writeD(_clan.getMembers().size()); for (ClanMember member : _clan.getMembers()) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java index 93af10e254..3c155ff816 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMViewSkillInfo.java @@ -38,10 +38,8 @@ public class GMViewSkillInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_SKILL_INFO.writeId(packet); - packet.writeS(_player.getName()); packet.writeD(_skills.size()); - final boolean isDisabled = (_player.getClan() != null) && (_player.getClan().getReputationScore() < 0); for (Skill skill : _skills) { @@ -49,7 +47,7 @@ public class GMViewSkillInfo implements IClientOutgoingPacket packet.writeH(skill.getDisplayLevel()); packet.writeH(skill.getSubLevel()); packet.writeD(skill.getDisplayId()); - packet.writeD(0x00); + packet.writeD(0); packet.writeC(isDisabled && skill.isClanSkill() ? 1 : 0); packet.writeC(skill.isEnchantable() ? 1 : 0); } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java index f49138fafe..c909d5e6e1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java @@ -51,7 +51,6 @@ public class GMViewWarehouseWithdrawList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.GM_VIEW_WAREHOUSE_WITHDRAW_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java index d8c273f914..449271993b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GameGuardQuery.java @@ -35,7 +35,6 @@ public class GameGuardQuery implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GAME_GUARD_QUERY.writeId(packet); - packet.writeD(0x27533DD9); packet.writeD(0x2E72A51D); packet.writeD(0x2017038B); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java index b0c011b696..037b2e6b6b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GetItem.java @@ -35,10 +35,8 @@ public class GetItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ITEM.writeId(packet); - packet.writeD(_playerId); packet.writeD(_item.getObjectId()); - packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java index f8c6126c87..5f4d7bf3ca 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GetOffVehicle.java @@ -50,7 +50,6 @@ public class GetOffVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_OFF_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_x); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java index ffa8d5f310..77d1e6ba28 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GetOnVehicle.java @@ -45,7 +45,6 @@ public class GetOnVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.GET_ON_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java index e5dcb9ded6..b1f5b588f9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/GmViewQuestInfo.java @@ -44,14 +44,13 @@ public class GmViewQuestInfo implements IClientOutgoingPacket OutgoingPackets.GM_VIEW_QUEST_INFO.writeId(packet); packet.writeS(_player.getName()); packet.writeH(_questList.size()); // quest count - for (Quest quest : _questList) { final QuestState qs = _player.getQuestState(quest.getName()); packet.writeD(quest.getId()); packet.writeD(qs == null ? 0 : qs.getCond()); } - packet.writeH(0x00); // some size + packet.writeH(0); // some size // for size; ddQQ return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 7e0614b359..3283ac802a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -51,7 +51,6 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeQ(_player.getAdena()); // activeChar current amount of Adena packet.writeD(3); // available equip slot packet.writeD(_hennaEquipList.size()); - for (Henna henna : _hennaEquipList) { // Player must have at least one dye in inventory @@ -62,8 +61,8 @@ public class HennaEquipList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); // item Id of the dye packet.writeQ(henna.getWearCount()); // amount of dyes required packet.writeQ(henna.getWearFee()); // amount of Adena required - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not - // packet.writeD(0x00); // Does not exist in Classic. + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // meet the requirement or not + // packet.writeD(0); // Does not exist in Classic. } } return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java index 0e6e64c7b2..23364ad722 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaInfo.java @@ -50,25 +50,24 @@ public class HennaInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_INFO.writeId(packet); - packet.writeH(_player.getHennaValue(BaseStat.INT)); // equip INT packet.writeH(_player.getHennaValue(BaseStat.STR)); // equip STR packet.writeH(_player.getHennaValue(BaseStat.CON)); // equip CON packet.writeH(_player.getHennaValue(BaseStat.MEN)); // equip MEN packet.writeH(_player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeH(_player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeH(0x00); // equip LUC - packet.writeH(0x00); // equip CHA + packet.writeH(0); // equip LUC + packet.writeH(0); // equip CHA packet.writeD(3 - _player.getHennaEmptySlots()); // Slots packet.writeD(_hennas.size()); // Size for (Henna henna : _hennas) { packet.writeD(henna.getDyeId()); - packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); + packet.writeD(henna.isAllowedClass(_player.getClassId()) ? 1 : 0); } - packet.writeD(0x00); // Premium Slot Dye ID - packet.writeD(0x00); // Premium Slot Dye Time Left - packet.writeD(0x00); // Premium Slot Dye ID isValid + packet.writeD(0); // Premium Slot Dye ID + packet.writeD(0); // Premium Slot Dye Time Left + packet.writeD(0); // Premium Slot Dye ID isValid return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java index 658087380a..9a22f0a564 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemDrawInfo.java @@ -40,12 +40,11 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_ITEM_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getWearCount()); // total amount of dye require packet.writeQ(_henna.getWearFee()); // total amount of Adena require to draw symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to draw or not 0 is false and 1 is true + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to draw or not 0 is false and 1 is true packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() + _player.getHennaValue(BaseStat.INT)); // equip INT @@ -59,7 +58,7 @@ public class HennaItemDrawInfo implements IClientOutgoingPacket packet.writeH(_player.getDEX() + _player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeD(_player.getWIT()); // current WIT packet.writeH(_player.getWIT() + _player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java index 3800940bac..162812f30b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java @@ -40,12 +40,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_INFO.writeId(packet); - packet.writeD(_henna.getDyeId()); // symbol Id packet.writeD(_henna.getDyeItemId()); // item id of dye packet.writeQ(_henna.getCancelCount()); // total amount of dye require packet.writeQ(_henna.getCancelFee()); // total amount of Adena require to remove symbol - packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // able to remove or not + packet.writeD(_henna.isAllowedClass(_player.getClassId()) ? 1 : 0); // able to remove or not packet.writeQ(_player.getAdena()); packet.writeD(_player.getINT()); // current INT packet.writeH(_player.getINT() - _player.getHennaValue(BaseStat.INT)); // equip INT @@ -59,11 +58,11 @@ public class HennaItemRemoveInfo implements IClientOutgoingPacket packet.writeH(_player.getDEX() - _player.getHennaValue(BaseStat.DEX)); // equip DEX packet.writeD(_player.getWIT()); // current WIT packet.writeH(_player.getWIT() - _player.getHennaValue(BaseStat.WIT)); // equip WIT - packet.writeD(0x00); // current LUC - packet.writeH(0x00); // equip LUC - packet.writeD(0x00); // current CHA - packet.writeH(0x00); // equip CHA - packet.writeD(0x00); + packet.writeD(0); // current LUC + packet.writeH(0); // equip LUC + packet.writeD(0); // current CHA + packet.writeH(0); // equip CHA + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java index 3a780986a0..d9f092b327 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/HennaRemoveList.java @@ -37,11 +37,9 @@ public class HennaRemoveList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.HENNA_UNEQUIP_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); - packet.writeD(0x03); // seems to be max size + packet.writeD(3); // seems to be max size packet.writeD(3 - _player.getHennaEmptySlots()); - for (Henna henna : _player.getHennaList()) { if (henna != null) @@ -50,7 +48,7 @@ public class HennaRemoveList implements IClientOutgoingPacket packet.writeD(henna.getDyeItemId()); packet.writeQ(henna.getCancelCount()); packet.writeQ(henna.getCancelFee()); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java index b5c8628b50..f2a9cf1822 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/IClientOutgoingPacket.java @@ -89,14 +89,12 @@ public interface IClientOutgoingPacket extends IOutgoingPacket Inventory.PAPERDOLL_ARTIFACT20, Inventory.PAPERDOLL_ARTIFACT21, }; - int[] PAPERDOLL_ORDER_AUGMENT = new int[] { Inventory.PAPERDOLL_RHAND, Inventory.PAPERDOLL_LHAND, Inventory.PAPERDOLL_RHAND }; - int[] PAPERDOLL_ORDER_VISUAL_ID = new int[] { Inventory.PAPERDOLL_RHAND, diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 0c54e810f0..3378827f34 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -46,7 +46,6 @@ public class InventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index c4598a72e6..cef69ecb6f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -59,8 +59,8 @@ public class ItemList extends AbstractItemPacket } else { - packet.writeC(0x01); // _showWindow ? 0x01 : 0x00 - packet.writeD(0x00); + packet.writeC(1); // _showWindow ? 1 : 0 + packet.writeD(0); packet.writeD(_items.size()); } writeInventoryBlock(packet, _player.getInventory()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java index b32b4df4a3..c3b9918230 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/JoinParty.java @@ -32,9 +32,8 @@ public class JoinParty implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PARTY.writeId(packet); - packet.writeD(_response); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java index 65e06efeb7..f347f7efcd 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/JoinPledge.java @@ -32,7 +32,6 @@ public class JoinPledge implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.JOIN_PLEDGE.writeId(packet); - packet.writeD(_pledgeId); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java index ae9fff536d..407e46a895 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java @@ -35,17 +35,16 @@ public class KeyPacket implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VERSION_CHECK.writeId(packet); - packet.writeC(_result); // 0 - wrong protocol, 1 - protocol ok for (int i = 0; i < 8; i++) { packet.writeC(_key[i]); // key } - packet.writeD(0x01); + packet.writeD(1); packet.writeD(Config.SERVER_ID); // server id - packet.writeC(0x01); - packet.writeD(0x00); // obfuscation key - packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 0x04 : 0x00); // isClassic + packet.writeC(1); + packet.writeD(0); // obfuscation key + packet.writeC((Config.SERVER_LIST_TYPE & 0x400) == 0x400 ? 4 : 0); // isClassic return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java index 484c10f0c4..62424fd03a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/L2FriendSay.java @@ -40,7 +40,6 @@ public class L2FriendSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_SAY.writeId(packet); - packet.writeD(0); // ?? packet.writeS(_receiver); packet.writeS(_sender); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java index b875edb772..790d599b5b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ListPartyWaiting.java @@ -32,11 +32,11 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; */ public class ListPartyWaiting implements IClientOutgoingPacket { + private static final int NUM_PER_PAGE = 64; + private final List _rooms = new LinkedList<>(); private final int _size; - private static final int NUM_PER_PAGE = 64; - public ListPartyWaiting(PartyMatchingRoomLevelType type, int location, int page, int requestorLevel) { final List rooms = MatchingRoomManager.getInstance().getPartyMathchingRooms(location, type, requestorLevel); @@ -57,7 +57,6 @@ public class ListPartyWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_PARTY_WATING.writeId(packet); - packet.writeD(_size); packet.writeD(_rooms.size()); for (MatchingRoom room : _rooms) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java index 4f8f9adc64..bb0ac61dbd 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/LoginFail.java @@ -54,7 +54,6 @@ public class LoginFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LOGIN_FAIL.writeId(packet); - packet.writeD(_success); packet.writeD(_reason); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java index 18a522c315..6743e3e66f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillCanceld.java @@ -32,7 +32,6 @@ public class MagicSkillCanceld implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_CANCELED.writeId(packet); - packet.writeD(_objectId); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java index d56de10079..7ab29cc1a8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java @@ -66,7 +66,6 @@ public class MagicSkillLaunched implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // MagicSkillUse castingType packet.writeD(_objectId); packet.writeD(_skillId); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java index 1dbf929e1c..37ad6bd5cc 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillUse.java @@ -84,7 +84,6 @@ public class MagicSkillUse implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MAGIC_SKILL_USE.writeId(packet); - packet.writeD(_castingType.getClientBarId()); // Casting bar type: 0 - default, 1 - default up, 2 - blue, 3 - green, 4 - red. packet.writeD(_creature.getObjectId()); packet.writeD(_target.getObjectId()); @@ -111,7 +110,7 @@ public class MagicSkillUse implements IClientOutgoingPacket packet.writeD(_target.getX()); packet.writeD(_target.getY()); packet.writeD(_target.getZ()); - packet.writeD(_actionId >= 0 ? 0x01 : 0x00); // 1 when ID from RequestActionUse is used + packet.writeD(_actionId >= 0 ? 1 : 0); // 1 when ID from RequestActionUse is used packet.writeD(_actionId >= 0 ? _actionId : 0); // ID from RequestActionUse. Used to set cooldown on summon skills. packet.writeD(-1); // 306 return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java index 6b710c692e..12e2488f24 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ManagePledgePower.java @@ -37,11 +37,9 @@ public class ManagePledgePower implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MANAGE_PLEDGE_POWER.writeId(packet); - packet.writeD(_rank); packet.writeD(_action); packet.writeD(_clan.getRankPrivs(_rank).getBitmask()); - return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java index 95f4b6f201..4e2ab3f00b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MonRaceInfo.java @@ -42,11 +42,9 @@ public class MonRaceInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MON_RACE_INFO.writeId(packet); - packet.writeD(_unknown1); packet.writeD(_unknown2); - packet.writeD(0x08); - + packet.writeD(8); for (int i = 0; i < 8; i++) { packet.writeD(_monsters[i].getObjectId()); // npcObjectID @@ -68,7 +66,7 @@ public class MonRaceInfo implements IClientOutgoingPacket } else { - packet.writeC(0x00); + packet.writeC(0); } } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java index 0093b3edc9..e6386921ff 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocation.java @@ -45,13 +45,10 @@ public class MoveToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_xDst); packet.writeD(_yDst); packet.writeD(_zDst); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java index b1fb3ea003..59103c6c4c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MoveToLocationInVehicle.java @@ -48,7 +48,6 @@ public class MoveToLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_destination.getX()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java index 30ff3c96af..aa261f924f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MoveToPawn.java @@ -50,11 +50,9 @@ public class MoveToPawn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MOVE_TO_PAWN.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetId); packet.writeD(_distance); - packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java index 00d7618d34..f94917d93d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MultiSellList.java @@ -58,18 +58,16 @@ public class MultiSellList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.MULTI_SELL_LIST.writeId(packet); - - packet.writeC(0x00); // Helios + packet.writeC(0); // Helios packet.writeD(_list.getId()); // list id - packet.writeC(0x00); // GOD Unknown + packet.writeC(0); // GOD Unknown packet.writeD(1 + (_index / PAGE_SIZE)); // page started from 1 - packet.writeD(_finished ? 0x01 : 0x00); // finished + packet.writeD(_finished ? 1 : 0); // finished packet.writeD(PAGE_SIZE); // size of pages packet.writeD(_size); // list length - packet.writeC(0x00); // Grand Crusade - packet.writeC(_list.isChanceMultisell() ? 0x01 : 0x00); // new multisell window - packet.writeD(0x20); // Helios - Always 32 - + packet.writeC(0); // Grand Crusade + packet.writeC(_list.isChanceMultisell() ? 1 : 0); // new multisell window + packet.writeD(32); // Helios - Always 32 while (_size-- > 0) { ItemInfo itemEnchantment = _list.getItemEnchantment(_index); @@ -86,20 +84,16 @@ public class MultiSellList extends AbstractItemPacket } } } - packet.writeD(_index); // Entry ID. Start from 1. packet.writeC(entry.isStackable() ? 1 : 0); - // Those values will be passed down to MultiSellChoose packet. packet.writeH(itemEnchantment != null ? itemEnchantment.getEnchantLevel() : 0); // enchant level writeItemAugment(packet, itemEnchantment); writeItemElemental(packet, itemEnchantment); writeItemEnsoulOptions(packet, itemEnchantment); - packet.writeC(0x00); // 286 - + packet.writeC(0); // 286 packet.writeH(entry.getProducts().size()); packet.writeH(entry.getIngredients().size()); - for (ItemChanceHolder product : entry.getProducts()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(product.getId()); @@ -122,9 +116,8 @@ public class MultiSellList extends AbstractItemPacket writeItemAugment(packet, displayItemEnchantment); writeItemElemental(packet, displayItemEnchantment); writeItemEnsoulOptions(packet, displayItemEnchantment); - packet.writeC(0x00); // 286 + packet.writeC(0); // 286 } - for (ItemChanceHolder ingredient : entry.getIngredients()) { final ItemTemplate template = ItemTable.getInstance().getTemplate(ingredient.getId()); @@ -144,7 +137,7 @@ public class MultiSellList extends AbstractItemPacket writeItemAugment(packet, displayItemEnchantment); writeItemElemental(packet, displayItemEnchantment); writeItemEnsoulOptions(packet, displayItemEnchantment); - packet.writeC(0x00); // 286 + packet.writeC(0); // 286 } } return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java index 6e85f5348c..cd46aac3aa 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/MyTargetSelected.java @@ -45,11 +45,10 @@ public class MyTargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.MY_TARGET_SELECTED.writeId(packet); - - packet.writeD(0x01); // Grand Crusade + packet.writeD(1); // Grand Crusade packet.writeD(_objectId); packet.writeH(_color); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java index 1901ad1297..166c5c1e00 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NewCharacterSuccess.java @@ -36,7 +36,6 @@ public class NewCharacterSuccess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NEW_CHARACTER_SUCCESS.writeId(packet); - packet.writeD(_chars.size()); for (PlayerTemplate chr : _chars) { @@ -44,31 +43,24 @@ public class NewCharacterSuccess implements IClientOutgoingPacket { continue; } - // TODO: Unhardcode these packet.writeD(chr.getRace().ordinal()); packet.writeD(chr.getClassId().getId()); - packet.writeD(99); packet.writeD(chr.getBaseSTR()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseDEX()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseCON()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseINT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseWIT()); packet.writeD(1); - packet.writeD(99); packet.writeD(chr.getBaseMEN()); packet.writeD(1); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java index be1605f679..6061ea26ef 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NicknameChanged.java @@ -38,7 +38,6 @@ public class NicknameChanged implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NICK_NAME_CHANGED.writeId(packet); - packet.writeD(_objectId); packet.writeS(_title); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java index f9cd107e2c..3e4837b4a4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NpcHtmlMessage.java @@ -54,24 +54,20 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public NpcHtmlMessage(int npcObjId, int itemId) { super(npcObjId); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } public NpcHtmlMessage(int npcObjId, int itemId, String html) { super(npcObjId, html); - if (itemId < 0) { throw new IllegalArgumentException(); } - _itemId = itemId; } @@ -79,11 +75,10 @@ public class NpcHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_itemId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java index 94ba6684e4..db7138f1a5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfo.java @@ -47,10 +47,8 @@ public class NpcInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -58,7 +56,6 @@ public class NpcInfo extends AbstractMaskPacket private int _clanId = 0; private int _statusMask = 0; private final Set _abnormalVisualEffects; - private String[] _localisation; public void setLang(String lang) @@ -101,112 +98,90 @@ public class NpcInfo extends AbstractMaskPacket { addComponentType(NpcInfoType.HEADING); } - if ((npc.getStat().getPAtkSpd() > 0) || (npc.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (npc.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((npc.getLeftHandItem() > 0) || (npc.getRightHandItem() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (npc.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (npc.getDisplayEffect() > 0) { addComponentType(NpcInfoType.DISPLAY_EFFECT); } - if (npc.isInsideZone(ZoneId.WATER) || npc.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (npc.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (npc.getCloneObjId() > 0) { addComponentType(NpcInfoType.CLONE); } - if (npc.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (npc.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (npc.getCurrentHp() <= npc.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (npc.getCurrentMp() <= npc.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (npc.getTemplate().isUsingServerSideName()) { addComponentType(NpcInfoType.NAME); } - if (npc.getTemplate().isUsingServerSideTitle() || (npc.isMonster() && (Config.SHOW_NPC_LEVEL || Config.SHOW_NPC_AGGRESSION)) || npc.isChampion() || npc.isTrap()) { addComponentType(NpcInfoType.TITLE); } - if (npc.getNameString() != null) { addComponentType(NpcInfoType.NAME_NPCSTRINGID); } - if (npc.getTitleString() != null) { addComponentType(NpcInfoType.TITLE_NPCSTRINGID); } - if (_npc.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (!_abnormalVisualEffects.isEmpty() || npc.isInvisible()) { addComponentType(NpcInfoType.ABNORMALS); } - if (npc.getEnchantEffect() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (npc.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (npc.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (npc.getClanId() > 0) { final Clan clan = ClanTable.getInstance().getClan(npc.getClanId()); @@ -220,14 +195,11 @@ public class NpcInfo extends AbstractMaskPacket addComponentType(NpcInfoType.CLAN); } } - addComponentType(NpcInfoType.COLOR_EFFECT); - if (npc.getPvpFlag() > 0) { addComponentType(NpcInfoType.PVP_FLAG); } - // TODO: Confirm me if (npc.isInCombat()) { @@ -245,8 +217,7 @@ public class NpcInfo extends AbstractMaskPacket { _statusMask |= 0x08; } - - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -296,27 +267,23 @@ public class NpcInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO.writeId(packet); - packet.writeD(_npc.getObjectId()); - packet.writeC(_npc.isShowSummonAnimation() ? 0x02 : 0x00); // // 0=teleported 1=default 2=summoned + packet.writeC(_npc.isShowSummonAnimation() ? 2 : 0); // // 0=teleported 1=default 2=summoned packet.writeH(38); // 338 - mask_bits_38 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 0x01 : 0x00); + packet.writeC(_npc.isAttackable() && !(_npc instanceof Guard) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0x00); + packet.writeQ(0); } if (containsMask(NpcInfoType.TITLE)) { String title = _npc.getTitle(); - // Localisation related. if ((_localisation != null) && !_localisation[1].equals("")) { @@ -329,10 +296,8 @@ public class NpcInfo extends AbstractMaskPacket title = title.replace(NpcData.getInstance().getTemplate(_npc.getId()).getTitle(), _localisation[1]); } } - packet.writeS(title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -351,7 +316,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -366,20 +331,20 @@ public class NpcInfo extends AbstractMaskPacket if (containsMask(NpcInfoType.EQUIPPED)) { packet.writeD(_npc.getRightHandItem()); - packet.writeD(0x00); // Armor id? + packet.writeD(0); // Armor id? packet.writeD(_npc.getLeftHandItem()); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_npc.isDead() ? 0x00 : 0x01); + packet.writeC(_npc.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_npc.isRunning() ? 0x01 : 0x00); + packet.writeC(_npc.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 0x01 : _npc.isFlying() ? 0x02 : 0x00); + packet.writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -391,7 +356,7 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_npc.isFlying() ? 0x01 : 0x00); + packet.writeD(_npc.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { @@ -427,12 +392,12 @@ public class NpcInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(0x00); // 2 - do some animation on spawn + packet.writeC(0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -464,12 +429,10 @@ public class NpcInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeD(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size() + (_npc.isInvisible() ? 1 : 0)); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java index c95a8e5274..923e9cebad 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NpcInfoAbnormalVisualEffect.java @@ -39,10 +39,8 @@ public class NpcInfoAbnormalVisualEffect implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_INFO_ABNORMAL_VISUAL_EFFECT.writeId(packet); - packet.writeD(_npc.getObjectId()); packet.writeD(_npc.getTransformationDisplayId()); - final Set abnormalVisualEffects = _npc.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size()); for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java index a294edc57a..2a0ba41eeb 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NpcQuestHtmlMessage.java @@ -38,7 +38,6 @@ public class NpcQuestHtmlMessage extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NPC_QUEST_HTML_MESSAGE.writeId(packet); - packet.writeD(getNpcObjId()); packet.writeS(getHtml()); packet.writeD(_questId); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java index d3328ade97..fc6d0d4a3a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java @@ -106,7 +106,6 @@ public class NpcSay implements IClientOutgoingPacket { _parameters = new ArrayList<>(); } - for (String item : params) { if ((item != null) && (item.length() > 0)) @@ -127,11 +126,9 @@ public class NpcSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.NPC_SAY.writeId(packet); - packet.writeD(_objectId); packet.writeD(_textType.getClientId()); packet.writeD(_npcId); - // Localisation related. if (_lang != null) { @@ -147,7 +144,6 @@ public class NpcSay implements IClientOutgoingPacket } } } - packet.writeD(_npcString); if (_npcString == -1) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java index 356e3f48a9..ac61f9d247 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ObservationMode.java @@ -33,11 +33,10 @@ public class ObservationMode implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_START.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); - packet.writeD(0x00); // TODO: Find me + packet.writeD(0); // TODO: Find me packet.writeD(0xc0); // TODO: Find me return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java index 5c0a0766b3..896ccea02b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ObservationReturn.java @@ -33,7 +33,6 @@ public class ObservationReturn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.OBSERVER_END.writeId(packet); - packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); packet.writeD(_loc.getZ()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java index c2f7ab404f..173772c870 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/OnEventTrigger.java @@ -37,7 +37,6 @@ public class OnEventTrigger implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EVENT_TRIGGER.writeId(packet); - packet.writeD(_emitterId); packet.writeC(_enabled); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java index fbb5c84dfe..37d4fea9cf 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java @@ -45,7 +45,6 @@ public class PackageSendableList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_SENDABLE_LIST.writeId(packet); - packet.writeC(_sendType); if (_sendType == 2) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java index a53f589386..e24d63f717 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PackageToList.java @@ -39,7 +39,6 @@ public class PackageToList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PACKAGE_TO_LIST.writeId(packet); - packet.writeD(_players.size()); for (Entry entry : _players.entrySet()) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java index 655c7abcd1..44b23b37f4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PartyMemberPosition.java @@ -55,7 +55,6 @@ public class PartyMemberPosition implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_MEMBER_POSITION.writeId(packet); - packet.writeD(locations.size()); for (Entry entry : locations.entrySet()) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java index 9e275ec246..c9d3595037 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PartyRoomInfo.java @@ -36,7 +36,6 @@ public class PartyRoomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_ROOM_INFO.writeId(packet); - packet.writeD(_room.getId()); packet.writeD(_room.getMaxMembers()); packet.writeD(_room.getMinLevel()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java index 2233054c14..76c4555d3b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAdd.java @@ -36,12 +36,10 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ADD.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); // c3 packet.writeD(_party.getDistributionType().getId()); // c3 packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); - packet.writeD((int) _member.getCurrentCp()); // c4 packet.writeD(_member.getMaxCp()); // c4 packet.writeD((int) _member.getCurrentHp()); @@ -51,9 +49,9 @@ public class PartySmallWindowAdd implements IClientOutgoingPacket packet.writeD(_member.getVitalityPoints()); packet.writeC(_member.getLevel()); packet.writeH(_member.getClassId().getId()); - packet.writeC(0x00); + packet.writeC(0); packet.writeH(_member.getRace().ordinal()); - packet.writeD(0x00); // 228 + packet.writeD(0); // 228 return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java index e806018375..3a47801de1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowAll.java @@ -37,21 +37,17 @@ public class PartySmallWindowAll implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_ALL.writeId(packet); - packet.writeD(_party.getLeaderObjectId()); packet.writeC(_party.getDistributionType().getId()); packet.writeC(_party.getMemberCount() - 1); - for (Player member : _party.getMembers()) { if ((member != null) && (member != _exclude)) { packet.writeD(member.getObjectId()); packet.writeS(member.getName()); - packet.writeD((int) member.getCurrentCp()); // c4 packet.writeD(member.getMaxCp()); // c4 - packet.writeD((int) member.getCurrentHp()); packet.writeD(member.getMaxHp()); packet.writeD((int) member.getCurrentMp()); @@ -59,10 +55,9 @@ public class PartySmallWindowAll implements IClientOutgoingPacket packet.writeD(member.getVitalityPoints()); packet.writeC(member.getLevel()); packet.writeH(member.getClassId().getId()); - packet.writeC(0x01); // Unk + packet.writeC(1); // Unk packet.writeH(member.getRace().ordinal()); - packet.writeD(0x00); // 228 - + packet.writeD(0); // 228 final Summon pet = member.getPet(); packet.writeD(member.getServitors().size() + (pet != null ? 1 : 0)); // Summon size, one only atm if (pet != null) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java index 94a8a5a2ce..09ce132af4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowDelete.java @@ -33,7 +33,6 @@ public class PartySmallWindowDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PARTY_SMALL_WINDOW_DELETE.writeId(packet); - packet.writeD(_member.getObjectId()); packet.writeS(_member.getName()); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java index c53c6c7779..e9ea2efbbe 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/PartySmallWindowUpdate.java @@ -42,7 +42,6 @@ public class PartySmallWindowUpdate extends AbstractMaskPacket * c = ca
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Attackers Clans?
* d = Number of Attackers Clans
* { //repeats
@@ -58,11 +58,10 @@ public class SiegeAttackerList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_ATTACKER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // 0 - packet.writeD(0x01); // 1 - packet.writeD(0x00); // 0 + packet.writeD(0); // 0 + packet.writeD(1); // 1 + packet.writeD(0); // 0 final int size = _castle.getSiege().getAttackerClans().size(); if (size > 0) { @@ -76,12 +75,11 @@ public class SiegeAttackerList implements IClientOutgoingPacket { continue; } - packet.writeD(clan.getId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(clan.getAllyId()); packet.writeS(clan.getAllyName()); packet.writeS(""); // AllyLeaderName @@ -90,8 +88,8 @@ public class SiegeAttackerList implements IClientOutgoingPacket } else { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java index 5d5c831f14..8afd1f38ce 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SiegeDefenderList.java @@ -29,9 +29,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; *
* c = 0xcb
* d = CastleID
- * d = unknow (0x00)
- * d = unknow (0x01)
- * d = unknow (0x00)
+ * d = unknown (0)
+ * d = unknown (1)
+ * d = unknown (0)
* d = Number of Defending Clans?
* d = Number of Defending Clans
* { //repeats
@@ -60,16 +60,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_DEFENDER_LIST.writeId(packet); - packet.writeD(_castle.getResidenceId()); - packet.writeD(0x00); // Unknown - packet.writeD(0x01); // Unknown - packet.writeD(0x00); // Unknown - + packet.writeD(0); // Unknown + packet.writeD(1); // Unknown + packet.writeD(0); // Unknown final int size = _castle.getSiege().getDefenderWaitingClans().size() + _castle.getSiege().getDefenderClans().size() + (_castle.getOwner() != null ? 1 : 0); packet.writeD(size); packet.writeD(size); - // Add owners final Clan ownerClan = _castle.getOwner(); if (ownerClan != null) @@ -78,14 +75,13 @@ public class SiegeDefenderList implements IClientOutgoingPacket packet.writeS(ownerClan.getName()); packet.writeS(ownerClan.getLeaderName()); packet.writeD(ownerClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.OWNER.ordinal()); packet.writeD(ownerClan.getAllyId()); packet.writeS(ownerClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(ownerClan.getAllyCrestId()); } - // List of confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderClans()) { @@ -94,19 +90,17 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); packet.writeS(""); // AllyLeaderName packet.writeD(defendingClan.getAllyCrestId()); } - // List of not confirmed defenders for (SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans()) { @@ -115,12 +109,11 @@ public class SiegeDefenderList implements IClientOutgoingPacket { continue; } - packet.writeD(defendingClan.getId()); packet.writeS(defendingClan.getName()); packet.writeS(defendingClan.getLeaderName()); packet.writeD(defendingClan.getCrestId()); - packet.writeD(0x00); // signed time (seconds) (not storated by L2J) + packet.writeD(0); // signed time (seconds) (not storated by L2J) packet.writeD(SiegeClanType.DEFENDER_PENDING.ordinal()); packet.writeD(defendingClan.getAllyId()); packet.writeS(defendingClan.getAllyName()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 0a3fe46cb7..dfeefdaecf 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -59,13 +59,11 @@ public class SiegeInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.CASTLE_SIEGE_INFO.writeId(packet); - if (_castle != null) { packet.writeD(_castle.getResidenceId()); - final int ownerId = _castle.getOwnerId(); - packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 0x01 : 0x00); + packet.writeD(((ownerId == _player.getClanId()) && (_player.isClanLeader())) ? 1 : 0); packet.writeD(ownerId); if (ownerId > 0) { @@ -89,7 +87,6 @@ public class SiegeInfo implements IClientOutgoingPacket packet.writeD(0); // Ally ID packet.writeS(""); // Ally Name } - packet.writeD((int) (Chronos.currentTimeMillis() / 1000)); if (!_castle.isTimeRegistrationOver() && _player.isClanLeader() && (_player.getClanId() == _castle.getOwnerId())) { @@ -97,7 +94,7 @@ public class SiegeInfo implements IClientOutgoingPacket cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis()); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(Config.SIEGE_HOUR_LIST.size()); for (int hour : Config.SIEGE_HOUR_LIST) { @@ -108,7 +105,7 @@ public class SiegeInfo implements IClientOutgoingPacket else { packet.writeD((int) (_castle.getSiegeDate().getTimeInMillis() / 1000)); - packet.writeD(0x00); + packet.writeD(0); } } return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java index d11b3817c0..3c4c475339 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SkillCoolTime.java @@ -51,12 +51,11 @@ public class SkillCoolTime implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SKILL_COOL_TIME.writeId(packet); - packet.writeD(_skillReuseTimeStamps.size()); for (TimeStamp ts : _skillReuseTimeStamps) { packet.writeD(ts.getSkillId()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD((int) ts.getReuse() / 1000); packet.writeD((int) Math.max(ts.getStamp() - _currentTime, 0) / 1000); } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java index de54232b51..ed4615c403 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/Snoop.java @@ -41,10 +41,9 @@ public class Snoop implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SNOOP.writeId(packet); - packet.writeD(_convoId); packet.writeS(_name); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_type.getClientId()); packet.writeS(_speaker); packet.writeS(_msg); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java index 37827bdf6c..52f15519a5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SocialAction.java @@ -37,10 +37,9 @@ public class SocialAction implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SOCIAL_ACTION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_actionId); - packet.writeD(0x00); // TODO: Find me! + packet.writeD(0); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java index fd7e43a153..19066f5f85 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SpawnItem.java @@ -33,16 +33,15 @@ public class SpawnItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPAWN_ITEM.writeId(packet); - packet.writeD(_item.getObjectId()); packet.writeD(_item.getDisplayId()); packet.writeD(_item.getX()); packet.writeD(_item.getY()); packet.writeD(_item.getZ()); // only show item count if it is a stackable item - packet.writeD(_item.isStackable() ? 0x01 : 0x00); + packet.writeD(_item.isStackable() ? 1 : 0); packet.writeQ(_item.getCount()); - packet.writeD(0x00); // c2 + packet.writeD(0); // c2 packet.writeC(_item.getEnchantLevel()); // Grand Crusade packet.writeC(_item.getAugmentation() != null ? 1 : 0); // Grand Crusade packet.writeC(_item.getSpecialAbilities().size()); // Grand Crusade diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java index ccae75b850..04f3ad716c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SpecialCamera.java @@ -110,7 +110,6 @@ public class SpecialCamera implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SPECIAL_CAMERA.writeId(packet); - packet.writeD(_id); packet.writeD(_force); packet.writeD(_angle1); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java index cdd3821740..281756e793 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StartPledgeWar.java @@ -34,7 +34,6 @@ public class StartPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_PLEDGE_WAR.writeId(packet); - packet.writeS(_playerName); packet.writeS(_pledgeName); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java index 48b4238eea..27fb4f606b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StartRotation.java @@ -38,7 +38,6 @@ public class StartRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.START_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_side); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java index b4f421df36..067bdeb082 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StaticObjectInfo.java @@ -72,7 +72,6 @@ public class StaticObjectInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATIC_OBJECT.writeId(packet); - packet.writeD(_staticObjectId); packet.writeD(_objectId); packet.writeD(_type); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index c1a90dbcf0..0f99a19cd2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -46,7 +46,6 @@ public class StatusUpdate implements IClientOutgoingPacket public void addUpdate(StatusUpdateType type, int level) { _updates.put(type, level); - if (_isPlayable) { switch (type) @@ -76,10 +75,9 @@ public class StatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STATUS_UPDATE.writeId(packet); - packet.writeD(_objectId); // casterId - packet.writeD(_isVisible ? _casterObjectId : 0x00); - packet.writeC(_isVisible ? 0x01 : 0x00); + packet.writeD(_isVisible ? _casterObjectId : 0); + packet.writeC(_isVisible ? 1 : 0); packet.writeC(_updates.size()); for (Entry entry : _updates.entrySet()) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java index 9919307366..cf2b71df5a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StopMove.java @@ -53,7 +53,6 @@ public class StopMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java index 50fdc3fe4c..78fdb5d70c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StopMoveInVehicle.java @@ -43,7 +43,6 @@ public class StopMoveInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_MOVE_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java index 9c828c3962..b254cad8b1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StopPledgeWar.java @@ -34,7 +34,6 @@ public class StopPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.STOP_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java index b0392de226..ca69cd5346 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/StopRotation.java @@ -36,7 +36,6 @@ public class StopRotation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FINISH_ROTATING.writeId(packet); - packet.writeD(_objectId); packet.writeD(_degree); packet.writeD(_speed); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java index 393d53fc8e..3c5f5b1238 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SummonInfo.java @@ -43,10 +43,8 @@ public class SummonInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -68,88 +66,71 @@ public class SummonInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -159,9 +140,7 @@ public class SummonInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -175,11 +154,9 @@ public class SummonInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - // Show red aura? - // if (_statusMask != 0) + // if (_statusMask != 0x00) // { // addComponentType(NpcInfoType.VISUAL_STATE); // } @@ -229,28 +206,24 @@ public class SummonInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.SUMMON_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0x00); + packet.writeQ(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -269,7 +242,7 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -285,19 +258,19 @@ public class SummonInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -309,20 +282,20 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -346,12 +319,12 @@ public class SummonInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -381,12 +354,10 @@ public class SummonInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeD(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java index 864462f76f..6f88551204 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SurrenderPledgeWar.java @@ -34,7 +34,6 @@ public class SurrenderPledgeWar implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SURRENDER_PLEDGE_WAR.writeId(packet); - packet.writeS(_pledgeName); packet.writeS(_playerName); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index 55902e07e1..bbd7706dbe 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -162,7 +162,6 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.info("Wrong parameter count '" + (_paramIndex + 1) + "' for SystemMessageId: " + _smId); } } - _params[_paramIndex++] = param; } @@ -268,7 +267,6 @@ public class SystemMessage implements IClientOutgoingPacket { return addString(item.getName()); } - append(new SMParam(TYPE_ITEM_NAME, id)); return this; } @@ -396,7 +394,6 @@ public class SystemMessage implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SYSTEM_MESSAGE.writeId(packet); - // Localisation related. if (_lang != null) { @@ -409,13 +406,12 @@ public class SystemMessage implements IClientOutgoingPacket params[i] = _params[i].getValue(); } packet.writeH(SystemMessageId.S1_2.getId()); - packet.writeC(0x01); + packet.writeC(1); packet.writeC(TYPE_TEXT); packet.writeS(sml.getLocalisation(params)); return true; } } - packet.writeH(getId()); packet.writeC(_params.length); for (SMParam param : _params) @@ -425,9 +421,7 @@ public class SystemMessage implements IClientOutgoingPacket PacketLogger.warning("Found null parameter for SystemMessageId " + _smId); continue; } - packet.writeC(param.getType()); - switch (param.getType()) { case TYPE_ELEMENT_NAME: diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java index a91da07e77..d357efbb0e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TargetSelected.java @@ -47,13 +47,12 @@ public class TargetSelected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_SELECTED.writeId(packet); - packet.writeD(_objectId); packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ? + packet.writeD(0); // ? return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java index 3dadd249f6..3d7208c06f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TargetUnselected.java @@ -42,12 +42,11 @@ public class TargetUnselected implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TARGET_UNSELECTED.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java index 943b5078b6..13f9b9565a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TeleportToLocation.java @@ -41,14 +41,13 @@ public class TeleportToLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TELEPORT_TO_LOCATION.writeId(packet); - packet.writeD(_targetObjId); packet.writeD(_x); packet.writeD(_y); packet.writeD(_z); - packet.writeD(0x00); // Fade 0, Instant 1. + packet.writeD(0); // Fade 0, Instant 1. packet.writeD(_heading); - packet.writeD(0x00); // Unknown. + packet.writeD(0); // Unknown. return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java index cb82f2da59..8d09576d9d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TradeDone.java @@ -32,7 +32,6 @@ public class TradeDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TRADE_DONE.writeId(packet); - packet.writeD(_num); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java index 716ed2a099..6a94d2463f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java @@ -41,9 +41,9 @@ public class TradeOtherAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java index 3d0ef0b501..7907f3d498 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java @@ -41,9 +41,9 @@ public class TradeOwnAdd extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x01); + packet.writeD(1); writeItem(packet, _item); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index c59568bf1d..3822108c5a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -58,7 +58,6 @@ public class TradeStart extends AbstractItemPacket { _mask |= 0x08; } - // Does not shows level if (_partner.isGM()) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java index f8e2a191de..e5ec2376cc 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java @@ -44,10 +44,10 @@ public class TradeUpdate extends AbstractItemPacket { OutgoingPackets.TRADE_UPDATE.writeId(packet); packet.writeC(_sendType); - packet.writeD(0x01); + packet.writeD(1); if (_sendType == 2) { - packet.writeD(0x01); + packet.writeD(1); packet.writeH((_newCount > 0) && _item.getItem().isStackable() ? 3 : 2); writeItem(packet, _item, _count); } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java index c7102ca385..728020c0b1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TutorialEnableClientEvent.java @@ -32,7 +32,6 @@ public class TutorialEnableClientEvent implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_ENABLE_CLIENT_EVENT.writeId(packet); - packet.writeD(_eventId); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java index 92ac75afcf..7cc33a0f80 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowHtml.java @@ -48,7 +48,6 @@ public class TutorialShowHtml extends AbstractHtmlPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_HTML.writeId(packet); - packet.writeD(_type); packet.writeS(getHtml()); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java index 75a57be38b..2ee62835db 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/TutorialShowQuestionMark.java @@ -37,7 +37,6 @@ public class TutorialShowQuestionMark implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.TUTORIAL_SHOW_QUESTION_MARK.writeId(packet); - packet.writeC(_markType); packet.writeD(_markId); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 21b328c878..a9388bae55 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -37,7 +37,6 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class UserInfo extends AbstractMaskPacket { private Player _player; - private int _relation; private int _runSpd; private int _walkSpd; @@ -51,7 +50,6 @@ public class UserInfo extends AbstractMaskPacket private int _enchantLevel; private int _armorEnchant; private String _title; - private final byte[] _masks = new byte[] { (byte) 0x00, @@ -59,7 +57,6 @@ public class UserInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 5; public UserInfo(Player player) @@ -83,6 +80,7 @@ public class UserInfo extends AbstractMaskPacket _enchantLevel = player.getInventory().getWeaponEnchant(); _armorEnchant = player.getInventory().getArmorMinEnchant(); _title = player.getTitle(); + if (player.isGM() && player.isInvisible()) { _title = "[Invisible]"; @@ -138,30 +136,26 @@ public class UserInfo extends AbstractMaskPacket } OutgoingPackets.USER_INFO.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_initSize); packet.writeH(28); // 286 - 28 packet.writeB(_masks); - if (containsMask(UserInfoType.RELATION)) { packet.writeD(_relation); } - if (containsMask(UserInfoType.BASIC_INFO)) { packet.writeH(23 + (_player.getAppearance().getVisibleName().length() * 2)); packet.writeString(_player.getName()); - packet.writeC(_player.isGM() ? 0x01 : 0x00); + packet.writeC(_player.isGM() ? 1 : 0); packet.writeC(_player.getRace().ordinal()); - packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); + packet.writeC(_player.getAppearance().isFemale() ? 1 : 0); packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeD(_player.getLevel()); // 270 packet.writeD(_player.getClassId().getId()); // 286 } - if (containsMask(UserInfoType.BASE_STATS)) { packet.writeH(18); @@ -171,10 +165,9 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getINT()); packet.writeH(_player.getWIT()); packet.writeH(_player.getMEN()); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); } - if (containsMask(UserInfoType.MAX_HPCPMP)) { packet.writeH(14); @@ -182,7 +175,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMaxMp()); packet.writeD(_player.getMaxCp()); } - if (containsMask(UserInfoType.CURRENT_HPMPCP_EXP_SP)) { packet.writeH(38); @@ -193,34 +185,30 @@ public class UserInfo extends AbstractMaskPacket packet.writeQ(_player.getExp()); packet.writeF((float) (_player.getExp() - ExperienceData.getInstance().getExpForLevel(_player.getLevel())) / (ExperienceData.getInstance().getExpForLevel(_player.getLevel() + 1) - ExperienceData.getInstance().getExpForLevel(_player.getLevel()))); } - if (containsMask(UserInfoType.ENCHANTLEVEL)) { packet.writeH(5); // 338 packet.writeC(_enchantLevel); packet.writeC(_armorEnchant); - packet.writeC(0x00); // 338 - cBackEnchant? + packet.writeC(0); // 338 - cBackEnchant? } - if (containsMask(UserInfoType.APPAREANCE)) { packet.writeH(19); // 338 packet.writeD(_player.getVisualHair()); packet.writeD(_player.getVisualHairColor()); packet.writeD(_player.getVisualFace()); - packet.writeC(_player.isHairAccessoryEnabled() ? 0x01 : 0x00); + packet.writeC(_player.isHairAccessoryEnabled() ? 1 : 0); packet.writeD(_player.getVisualHairColor() + 1); // 338 - DK color. } - if (containsMask(UserInfoType.STATUS)) { packet.writeH(6); packet.writeC(_player.getMountType().ordinal()); packet.writeC(_player.getPrivateStoreType().getId()); packet.writeC(_player.hasDwarvenCraft() || (_player.getSkillLevel(248) > 0) ? 1 : 0); - packet.writeC(0x00); + packet.writeC(0); } - if (containsMask(UserInfoType.STATS)) { packet.writeH(64); // 270 @@ -238,21 +226,19 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getMDef()); packet.writeD(_player.getMagicAccuracy()); packet.writeD(_player.getMCriticalHit()); - packet.writeD(0x00); // 270 - packet.writeD(0x00); // 270 + packet.writeD(0); // 270 + packet.writeD(0); // 270 } - if (containsMask(UserInfoType.ELEMENTALS)) { packet.writeH(14); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); + packet.writeH(0); } - if (containsMask(UserInfoType.POSITION)) { packet.writeH(18); @@ -261,7 +247,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getZ()); packet.writeD(_player.isInVehicle() ? _player.getVehicle().getObjectId() : 0); } - if (containsMask(UserInfoType.SPEED)) { packet.writeH(18); @@ -274,28 +259,24 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_flyRunSpd); packet.writeH(_flyWalkSpd); } - if (containsMask(UserInfoType.MULTIPLIER)) { packet.writeH(18); packet.writeF(_moveMultiplier); packet.writeF(_player.getAttackSpeedMultiplier()); } - if (containsMask(UserInfoType.COL_RADIUS_HEIGHT)) { packet.writeH(18); packet.writeF(_player.getCollisionRadius()); packet.writeF(_player.getCollisionHeight()); } - if (containsMask(UserInfoType.ATK_ELEMENTAL)) { packet.writeH(5); - packet.writeC(0x00); - packet.writeH(0x00); + packet.writeC(0); + packet.writeH(0); } - if (containsMask(UserInfoType.CLAN)) { packet.writeH(32 + (_title.length() * 2)); @@ -305,12 +286,11 @@ public class UserInfo extends AbstractMaskPacket packet.writeD(_player.getClanCrestLargeId()); packet.writeD(_player.getClanCrestId()); packet.writeD(_player.getClanPrivileges().getBitmask()); - packet.writeC(_player.isClanLeader() ? 0x01 : 0x00); + packet.writeC(_player.isClanLeader() ? 1 : 0); packet.writeD(_player.getAllyId()); packet.writeD(_player.getAllyCrestId()); - packet.writeC(_player.isInMatchingRoom() ? 0x01 : 0x00); + packet.writeC(_player.isInMatchingRoom() ? 1 : 0); } - if (containsMask(UserInfoType.SOCIAL)) { packet.writeH(30); // 228 @@ -330,82 +310,72 @@ public class UserInfo extends AbstractMaskPacket } else { - packet.writeD(0x00); + packet.writeD(0); } - packet.writeD(0x00); // 228 + packet.writeD(0); // 228 } - if (containsMask(UserInfoType.VITA_FAME)) { packet.writeH(19); // 196 packet.writeD(_player.getVitalityPoints()); - packet.writeC(0x00); // Vita Bonus - packet.writeD(0x00); // _player.getFame() - packet.writeD(0x00); // _player.getRaidbossPoints() - packet.writeC(0x00); // 196 - packet.writeH(0x00); // Henna Seal Engraving Gauge - packet.writeC(0x00); // 196 + packet.writeC(0); // Vita Bonus + packet.writeD(0); // _player.getFame() + packet.writeD(0); // _player.getRaidbossPoints() + packet.writeC(0); // 196 + packet.writeH(0); // Henna Seal Engraving Gauge + packet.writeC(0); // 196 } - if (containsMask(UserInfoType.SLOTS)) { packet.writeH(12); // 152 packet.writeC(_player.getInventory().getTalismanSlots()); packet.writeC(_player.getInventory().getBroochJewelSlots()); packet.writeC(_player.getTeam().getId()); - packet.writeD(0x00); - + packet.writeD(0); if (_player.getInventory().getAgathionSlots() > 0) { - packet.writeC(0x01); // Charm slots + packet.writeC(1); // Charm slots packet.writeC(_player.getInventory().getAgathionSlots() - 1); packet.writeC(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152 } else { - packet.writeC(0x00); // Charm slots - packet.writeC(0x00); + packet.writeC(0); // Charm slots + packet.writeC(0); packet.writeC(_player.getInventory().getArtifactSlots()); // Artifact set slots // 152 } } - if (containsMask(UserInfoType.MOVEMENTS)) { packet.writeH(4); packet.writeC(_player.isInsideZone(ZoneId.WATER) ? 1 : _player.isFlyingMounted() ? 2 : 0); - packet.writeC(_player.isRunning() ? 0x01 : 0x00); + packet.writeC(_player.isRunning() ? 1 : 0); } - if (containsMask(UserInfoType.COLOR)) { packet.writeH(10); packet.writeD(_player.getAppearance().getNameColor()); packet.writeD(_player.getAppearance().getTitleColor()); } - if (containsMask(UserInfoType.INVENTORY_LIMIT)) { packet.writeH(13); - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); packet.writeH(_player.getInventoryLimit()); - packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 - packet.writeC(0x00); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 + packet.writeC(0); // 196 } - if (containsMask(UserInfoType.TRUE_HERO)) { packet.writeH(9); - packet.writeD(0x00); - packet.writeH(0x00); - packet.writeC(_player.isTrueHero() ? 100 : 0x00); + packet.writeD(0); + packet.writeH(0); + packet.writeC(_player.isTrueHero() ? 100 : 0); } - if (containsMask(UserInfoType.ATT_SPIRITS)) // 152 { packet.writeH(26); @@ -416,13 +386,11 @@ public class UserInfo extends AbstractMaskPacket packet.writeD((int) _player.getEarthSpiritDefense()); packet.writeD(_player.getActiveElementalSpiritType()); } - if (containsMask(UserInfoType.RANKING)) // 196 { packet.writeH(6); packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : RankManager.getInstance().getPlayerClassRank(_player) == 1 ? 4 : 0); } - if (containsMask(UserInfoType.STAT_POINTS)) // 235 { packet.writeH(16); @@ -434,7 +402,6 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getVariables().getInt(PlayerVariables.STAT_WIT, 0)); packet.writeH(_player.getVariables().getInt(PlayerVariables.STAT_MEN, 0)); } - if (containsMask(UserInfoType.STAT_ABILITIES)) // 235 { packet.writeH(18); @@ -444,10 +411,9 @@ public class UserInfo extends AbstractMaskPacket packet.writeH(_player.getINT() - _player.getTemplate().getBaseINT() - _player.getVariables().getInt(PlayerVariables.STAT_INT, 0)); // additional INT packet.writeH(_player.getWIT() - _player.getTemplate().getBaseWIT() - _player.getVariables().getInt(PlayerVariables.STAT_WIT, 0)); // additional WIT packet.writeH(_player.getMEN() - _player.getTemplate().getBaseMEN() - _player.getVariables().getInt(PlayerVariables.STAT_MEN, 0)); // additional MEN - packet.writeH(0x00); - packet.writeH(0x00); + packet.writeH(0); + packet.writeH(0); } - if (containsMask(UserInfoType.ELIXIR_USED)) // 286 { packet.writeD(_player.getVariables().getInt(PlayerVariables.ELIXIRS_USED, 0)); // count @@ -482,7 +448,6 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x10; // Party leader } } - if (clan != null) { relation |= 0x20; // Clan member @@ -491,12 +456,10 @@ public class UserInfo extends AbstractMaskPacket relation |= 0x40; // Clan leader } } - if (player.isInSiege()) { relation |= 0x80; // In siege } - return relation; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java index 283bcf1614..90c416726a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocation.java @@ -36,7 +36,6 @@ public class ValidateLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION.writeId(packet); - packet.writeD(_objectId); packet.writeD(_loc.getX()); packet.writeD(_loc.getY()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java index 4d8f9683d0..83f72bf981 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ValidateLocationInVehicle.java @@ -40,7 +40,6 @@ public class ValidateLocationInVehicle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VALIDATE_LOCATION_IN_VEHICLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatObjId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java index b684e70bdc..71367cd26d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/VehicleCheckLocation.java @@ -36,7 +36,6 @@ public class VehicleCheckLocation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_CHECK_LOCATION.writeId(packet); - packet.writeD(_boat.getObjectId()); packet.writeD(_boat.getX()); packet.writeD(_boat.getY()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java index a4a5780f30..5b565c08b7 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/VehicleDeparture.java @@ -46,7 +46,6 @@ public class VehicleDeparture implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_DEPARTURE.writeId(packet); - packet.writeD(_objId); packet.writeD(_moveSpeed); packet.writeD(_rotationSpeed); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java index ec611028bf..4a995a6352 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/VehicleInfo.java @@ -44,7 +44,6 @@ public class VehicleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_INFO.writeId(packet); - packet.writeD(_objId); packet.writeD(_x); packet.writeD(_y); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java index 207a6fd899..bf629dcbbc 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/VehicleStarted.java @@ -42,7 +42,6 @@ public class VehicleStarted implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.VEHICLE_START.writeId(packet); - packet.writeD(_objectId); packet.writeD(_state); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 35ca986d35..5eb9eb7ab9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -30,6 +30,7 @@ public class WareHouseDepositList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; public static final int FREIGHT = 1; + private final int _sendType; private final long _playerAdena; private final List _items = new ArrayList<>(); @@ -49,7 +50,6 @@ public class WareHouseDepositList extends AbstractItemPacket _sendType = sendType; _whType = type; _playerAdena = player.getAdena(); - final boolean isPrivate = _whType == PRIVATE; for (Item temp : player.getInventory().getAvailableItems(true, isPrivate, false)) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index 7af1cd273c..5ece99310a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -32,6 +32,7 @@ public class WareHouseWithdrawalList extends AbstractItemPacket public static final int CLAN = 2; public static final int CASTLE = 3; // not sure public static final int FREIGHT = 1; + private final int _sendType; private Player _player; private long _playerAdena; @@ -60,7 +61,6 @@ public class WareHouseWithdrawalList extends AbstractItemPacket PacketLogger.warning("error while sending withdraw request to: " + _player.getName()); return; } - _items = _player.getActiveWarehouse().getItems(); for (Item item : _items) { @@ -78,15 +78,15 @@ public class WareHouseWithdrawalList extends AbstractItemPacket packet.writeC(_sendType); if (_sendType == 2) { - packet.writeH(0x00); + packet.writeH(0); packet.writeD(_invSize); packet.writeD(_items.size()); for (Item item : _items) { writeItem(packet, item); packet.writeD(item.getObjectId()); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } } else diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java index 5f2dd05f3b..aea1476fb2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaCancel.java @@ -35,8 +35,7 @@ public class ExDivideAdenaCancel implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_CANCEL.writeId(packet); - - packet.writeC(0x00); // TODO: Find me + packet.writeC(0); // TODO: Find me return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java index 6af912cebf..de4e955aba 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/adenadistribution/ExDivideAdenaDone.java @@ -46,9 +46,8 @@ public class ExDivideAdenaDone implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_DIVIDE_ADENA_DONE.writeId(packet); - - packet.writeC(_isPartyLeader ? 0x01 : 0x00); - packet.writeC(_isCCLeader ? 0x01 : 0x00); + packet.writeC(_isPartyLeader ? 1 : 0); + packet.writeC(_isCCLeader ? 1 : 0); packet.writeD(_memberCount); packet.writeQ(_distributedAdenaCount); packet.writeQ(_adenaCount); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java index 549def456e..84b5fead76 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExChooseShapeShiftingItem.java @@ -43,7 +43,6 @@ public class ExChooseShapeShiftingItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CHOOSE_SHAPE_SHIFTING_ITEM.writeId(packet); - packet.writeD(_targetType != null ? _targetType.ordinal() : 0); packet.writeD(_type != null ? _type.ordinal() : 0); packet.writeD(_itemId); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java index 33fb439aa5..ba55887a1a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExCuriousHouseMemberUpdate.java @@ -45,7 +45,6 @@ public class ExCuriousHouseMemberUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CURIOUS_HOUSE_MEMBER_UPDATE.writeId(packet); - packet.writeD(_objId); packet.writeD(_maxHp); packet.writeD(_maxCp); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java index 8ad3659725..be2d29d864 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingExtractionItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPacket { - public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0x00); - public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(0x01); + public static final ExPutShapeShiftingExtractionItemResult FAILED = new ExPutShapeShiftingExtractionItemResult(0); + public static final ExPutShapeShiftingExtractionItemResult SUCCESS = new ExPutShapeShiftingExtractionItemResult(1); private final int _result; @@ -39,7 +39,6 @@ public class ExPutShapeShiftingExtractionItemResult implements IClientOutgoingPa public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_EXTRACTION_ITEM_RESULT.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java index ec82cc14f3..e84d7a7255 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExPutShapeShiftingTargetItemResult.java @@ -25,8 +25,8 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; public static final ExPutShapeShiftingTargetItemResult FAILED = new ExPutShapeShiftingTargetItemResult(RESULT_FAILED, 0); @@ -43,7 +43,6 @@ public class ExPutShapeShiftingTargetItemResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PUT_SHAPE_SHIFTING_TARGET_ITEM_RESULT.writeId(packet); - packet.writeD(_resultId); packet.writeQ(_price); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java index f4d3118cc4..038eae0042 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/appearance/ExShapeShiftingResult.java @@ -25,9 +25,9 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExShapeShiftingResult implements IClientOutgoingPacket { - public static final int RESULT_FAILED = 0x00; - public static final int RESULT_SUCCESS = 0x01; - public static final int RESULT_CLOSE = 0x02; + public static final int RESULT_FAILED = 0; + public static final int RESULT_SUCCESS = 1; + public static final int RESULT_CLOSE = 2; public static final ExShapeShiftingResult FAILED = new ExShapeShiftingResult(RESULT_FAILED, 0, 0); public static final ExShapeShiftingResult CLOSE = new ExShapeShiftingResult(RESULT_CLOSE, 0, 0); @@ -47,7 +47,6 @@ public class ExShapeShiftingResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHAPE_SHIFTING_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_targetItemId); packet.writeD(_extractItemId); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java index eaf0d209fd..4b48b09002 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExConfirmVipAttendanceCheck.java @@ -38,7 +38,7 @@ public class ExConfirmVipAttendanceCheck implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CONFIRM_VIP_ATTENDANCE_CHECK.writeId(packet); - packet.writeC(_available ? 0x01 : 0x00); // can receive reward today? 1 else 0 + packet.writeC(_available ? 1 : 0); // can receive reward today? 1 else 0 packet.writeC(_index); // active reward index packet.writeD(0); packet.writeD(0); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java index 9d61fe68d6..dd94df023f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/attendance/ExVipAttendanceItemList.java @@ -45,10 +45,10 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket OutgoingPackets.EX_VIP_ATTENDANCE_ITEM_LIST.writeId(packet); packet.writeC(_available ? _index + 1 : _index); // index to receive? packet.writeC(_index); // last received index? - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeC(0x01); - packet.writeC(_available ? 0x01 : 0x00); // player can receive reward today? + packet.writeD(0); + packet.writeD(0); + packet.writeC(1); + packet.writeC(_available ? 1 : 0); // player can receive reward today? packet.writeC(250); packet.writeC(AttendanceRewardData.getInstance().getRewardsCount()); // reward size int rewardCounter = 0; @@ -57,11 +57,11 @@ public class ExVipAttendanceItemList implements IClientOutgoingPacket rewardCounter++; packet.writeD(reward.getId()); packet.writeQ(reward.getCount()); - packet.writeC(0x01); // is unknown? - packet.writeC((rewardCounter % 7) == 0 ? 0x01 : 0x00); // is last in row? + packet.writeC(1); // is unknown? + packet.writeC((rewardCounter % 7) == 0 ? 1 : 0); // is last in row? } - packet.writeC(0x00); - packet.writeD(0x00); + packet.writeC(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java index 0282966053..9963a080c6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/autoplay/ExActivateAutoShortcut.java @@ -41,7 +41,7 @@ public class ExActivateAutoShortcut implements IClientOutgoingPacket { OutgoingPackets.EX_ACTIVATE_AUTO_SHORTCUT.writeId(packet); packet.writeH(_position); - packet.writeC(_active ? 0x01 : 0x00); + packet.writeC(_active ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/castlewar/ExMercenaryCastleWarCastleInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/castlewar/ExMercenaryCastleWarCastleInfo.java index 9504fa6999..064283c93a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/castlewar/ExMercenaryCastleWarCastleInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/castlewar/ExMercenaryCastleWarCastleInfo.java @@ -41,7 +41,6 @@ public class ExMercenaryCastleWarCastleInfo implements IClientOutgoingPacket { OutgoingPackets.EX_MERCENARY_CASTLEWAR_CASTLE_INFO.writeId(packet); packet.writeD(_castle.getResidenceId()); - final var clan = _castle.getOwner(); if (clan != null) { @@ -56,16 +55,13 @@ public class ExMercenaryCastleWarCastleInfo implements IClientOutgoingPacket packet.writeD(0); packet.writeString(""); packet.writeString(""); - } - packet.writeD(_castle.getTaxPercent(TaxType.BUY)); packet.writeQ((long) (_castle.getTreasury() * _castle.getTaxRate(TaxType.BUY))); packet.writeQ((long) (_castle.getTreasury() + (_castle.getTreasury() * _castle.getTaxRate(TaxType.BUY)))); final Calendar cal = Calendar.getInstance(); cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis()); packet.writeD((int) (cal.getTimeInMillis() / 1000)); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionCloseUI.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionCloseUI.java index 494a5464a2..6a9a1ae36a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionCloseUI.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionCloseUI.java @@ -29,7 +29,7 @@ public class ExCollectionCloseUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLLECTION_CLOSE_UI.writeId(packet); - packet.writeC(0x00); + packet.writeC(0); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionFavoriteList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionFavoriteList.java index 7c441b7681..92ae04b2ba 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionFavoriteList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/collection/ExCollectionFavoriteList.java @@ -29,7 +29,7 @@ public class ExCollectionFavoriteList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_COLLECTION_FAVORITE_LIST.writeId(packet); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java index 4c3ae253ea..c79b68becc 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyInfo.java @@ -39,7 +39,6 @@ public class ExResponseCommissionBuyInfo extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_INFO.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java index ddfa8b6db1..c1d29735b8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionBuyItem.java @@ -40,7 +40,6 @@ public class ExResponseCommissionBuyItem implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_BUY_ITEM.writeId(packet); - packet.writeD(_commissionItem != null ? 1 : 0); if (_commissionItem != null) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java index aa4bbbde24..01e4782408 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionDelete.java @@ -39,7 +39,6 @@ public class ExResponseCommissionDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_DELETE.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java index e7e3c39816..b915574175 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionInfo.java @@ -55,7 +55,6 @@ public class ExResponseCommissionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_INFO.writeId(packet); - packet.writeD(_result); packet.writeD(_itemId); packet.writeQ(_presetPricePerUnit); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java index 4963393b42..a012b3ab30 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionList.java @@ -64,7 +64,6 @@ public class ExResponseCommissionList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_LIST.writeId(packet); - packet.writeD(_replyType.getClientId()); switch (_replyType) { @@ -73,13 +72,11 @@ public class ExResponseCommissionList extends AbstractItemPacket { packet.writeD((int) Instant.now().getEpochSecond()); packet.writeD(_chunkId); - int chunkSize = _items.size() - _listIndexStart; if (chunkSize > MAX_CHUNK_SIZE) { chunkSize = MAX_CHUNK_SIZE; } - packet.writeD(chunkSize); for (int i = _listIndexStart; i < (_listIndexStart + chunkSize); i++) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java index b1b0a97d7a..183547af06 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExResponseCommissionRegister.java @@ -39,7 +39,6 @@ public class ExResponseCommissionRegister implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RESPONSE_COMMISSION_REGISTER.writeId(packet); - packet.writeD(_result); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java index 74d8a95587..b68386e4ed 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/commission/ExShowCommission.java @@ -35,8 +35,7 @@ public class ExShowCommission implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_COMMISSION.writeId(packet); - - packet.writeD(0x01); + packet.writeD(1); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java index 0c267ecf34..11b1ff1e0a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantFail.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExEnchantFail implements IClientOutgoingPacket { public static final ExEnchantFail STATIC_PACKET = new ExEnchantFail(0, 0); + private final int _itemOne; private final int _itemTwo; @@ -39,7 +40,6 @@ public class ExEnchantFail implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_FAIL.writeId(packet); - packet.writeD(_itemOne); packet.writeD(_itemTwo); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java index 71ba811ed5..87d29a8e7c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/compound/ExEnchantSucess.java @@ -36,7 +36,6 @@ public class ExEnchantSucess implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ENCHANT_SUCESS.writeId(packet); - packet.writeD(_itemId); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java index eb4eb8b26c..ec67d50fb6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/crystalization/ExGetCrystalizingEstimation.java @@ -39,7 +39,6 @@ public class ExGetCrystalizingEstimation implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_GET_CRYSTALIZING_ESTIMATION.writeId(packet); - packet.writeD(_items.size()); for (ItemChanceHolder holder : _items) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java index ac16c14f5b..ebf5b64751 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java @@ -43,18 +43,18 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket } OutgoingPackets.EX_CONNECTED_TIME_AND_GETTABLE_REWARD.writeId(packet); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_oneDayRewardAvailableCount); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java index 8667d9144f..57acfedd38 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java @@ -62,7 +62,6 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket } OutgoingPackets.EX_ONE_DAY_RECEIVE_REWARD_LIST.writeId(packet); - packet.writeD(_dayRemainTime); packet.writeD(_weekRemainTime); packet.writeD(_monthRemainTime); @@ -75,7 +74,7 @@ public class ExOneDayReceiveRewardList implements IClientOutgoingPacket packet.writeH(reward.getId()); final int status = reward.getStatus(_player); packet.writeC(status); - packet.writeC(reward.getRequiredCompletions() > 1 ? 0x01 : 0x00); + packet.writeC(reward.getRequiredCompletions() > 1 ? 1 : 0); packet.writeD(reward.getParams().getInt("level", -1) == -1 ? (status == 1 ? 0 : reward.getProgress(_player)) : _player.getLevel()); packet.writeD(reward.getRequiredCompletions()); } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java index f0d1fb0d65..03c8bc9b68 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/AbstractElementalSpiritPacket.java @@ -43,9 +43,7 @@ abstract class AbstractElementalSpiritPacket implements IClientOutgoingPacket packet.writeD(spirit.getMaxCharacteristics()); packet.writeD(spirit.getMaxCharacteristics()); packet.writeD(spirit.getMaxCharacteristics()); - packet.writeC(1); // unk - for (int j = 0; j < 1; j++) { packet.writeH(2); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java index 3a53a42a95..53c6d5b3e9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritAbsorbInfo.java @@ -45,16 +45,14 @@ public class ElementalSpiritAbsorbInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_ABSORB_INFO.writeId(packet); - final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type)); if (spirit == null) { - packet.writeC(0x00); - packet.writeC(0x00); + packet.writeC(0); + packet.writeC(0); return true; } - - packet.writeC(0x01); + packet.writeC(1); packet.writeC(_type); packet.writeC(spirit.getStage()); packet.writeQ(spirit.getExperience()); @@ -62,7 +60,6 @@ public class ElementalSpiritAbsorbInfo implements IClientOutgoingPacket packet.writeQ(spirit.getExperienceToNextLevel()); // MaxExp packet.writeD(spirit.getLevel()); packet.writeD(spirit.getMaxLevel()); - final List absorbItems = spirit.getAbsorbItems(); packet.writeD(absorbItems.size()); // AbsorbCount for (ElementalSpiritAbsorbItemHolder absorbItem : absorbItems) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java index 430c43f891..7012b8a7a2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritEvolutionInfo.java @@ -44,7 +44,6 @@ public class ElementalSpiritEvolutionInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_EVOLUTION_INFO.writeId(packet); - final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type)); if (spirit == null) { @@ -52,13 +51,11 @@ public class ElementalSpiritEvolutionInfo implements IClientOutgoingPacket packet.writeD(0); return true; } - packet.writeC(_type); packet.writeD(spirit.getNpcId()); - packet.writeD(0x01); // unk + packet.writeD(1); // unk packet.writeD(spirit.getStage()); packet.writeF(100); // chance ?? - final List items = spirit.getItemsToEvolve(); packet.writeD(items.size()); for (ItemHolder item : items) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java index 83c7057dfb..030eec0eb4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritExtractInfo.java @@ -42,7 +42,6 @@ public class ElementalSpiritExtractInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_EXTRACT_INFO.writeId(packet); - final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type)); if (spirit == null) { @@ -50,15 +49,12 @@ public class ElementalSpiritExtractInfo implements IClientOutgoingPacket packet.writeC(0); return true; } - packet.writeC(_type); // active elemental spirit packet.writeC(1); // is extract ? - packet.writeC(1); // cost count // for each cost count packet.writeD(57); // item id packet.writeD(ElementalSpiritData.EXTRACT_FEES[spirit.getStage() - 1]); // item count - packet.writeD(spirit.getExtractItem()); packet.writeD(spirit.getExtractAmount()); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java index 15fa123db6..ba363bf243 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ElementalSpiritInfo.java @@ -41,7 +41,6 @@ public class ElementalSpiritInfo extends AbstractElementalSpiritPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_INFO.writeId(packet); - final ElementalSpirit[] spirits = _player.getSpirits(); if (spirits == null) { @@ -50,20 +49,16 @@ public class ElementalSpiritInfo extends AbstractElementalSpiritPacket packet.writeC(0); return true; } - packet.writeC(_type); // show spirit info window 1; Change type 2; Only update 0 packet.writeC(_spiritType); - packet.writeC(spirits.length); // spirit count - for (ElementalSpirit spirit : spirits) { packet.writeC(spirit.getType()); - packet.writeC(0x01); // spirit active ? + packet.writeC(1); // spirit active ? // if active writeSpiritInfo(packet, spirit); } - packet.writeD(1); // Reset talent items count for (int j = 0; j < 1; j++) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java index bc05ef3212..66488267d4 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/ExElementalSpiritGetExp.java @@ -38,7 +38,6 @@ public class ExElementalSpiritGetExp implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_ELEMENTAL_SPIRIT_GET_EXP.writeId(packet); - packet.writeC(_type); packet.writeQ(_experience); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java index 7f380efe99..8f5cfd3c98 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/elementalspirits/UpdateElementalSpiritPacket.java @@ -41,7 +41,6 @@ public abstract class UpdateElementalSpiritPacket extends AbstractElementalSpiri { packet.writeC(_update ? 1 : 0); packet.writeC(_type); - if (_update) { final ElementalSpirit spirit = _player.getElementalSpirit(ElementalType.of(_type)); @@ -49,7 +48,6 @@ public abstract class UpdateElementalSpiritPacket extends AbstractElementalSpiri { return; } - packet.writeC(_type); writeSpiritInfo(packet, spirit); } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java index 23b770e406..ebe77fa654 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/equipmentupgrade/ExShowUpgradeSystem.java @@ -29,7 +29,7 @@ public class ExShowUpgradeSystem extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHOW_UPGRADE_SYSTEM.writeId(packet); - packet.writeH(0x01); + packet.writeH(1); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java index fa605b548a..a99ad7f4e3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExFishingStart.java @@ -52,7 +52,7 @@ public class ExFishingStart implements IClientOutgoingPacket packet.writeD(_baitLocation.getX()); packet.writeD(_baitLocation.getY()); packet.writeD(_baitLocation.getZ()); - packet.writeC(0x01); // 0 = newbie, 1 = normal, 2 = night + packet.writeC(1); // 0 = newbie, 1 = normal, 2 = night return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java index 046ad04cb6..74501fe7ff 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/fishing/ExUserInfoFishing.java @@ -49,7 +49,6 @@ public class ExUserInfoFishing implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_USER_INFO_FISHING.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeC(_isFishing ? 1 : 0); if (_baitLocation == null) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index dc0e3e05bc..336a384bcc 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -47,9 +47,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FRIEND_DETAIL_INFO.writeId(packet); - packet.writeD(_objectId); - if (_friend == null) { packet.writeS(_name); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java index 0d4bb47ff0..a90b7b6083 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequest.java @@ -33,8 +33,7 @@ public class FriendAddRequest implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST.writeId(packet); - - packet.writeC(0x00); + packet.writeC(0); packet.writeS(_requestorName); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java index 9add9c9caa..d24139644c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendAddRequestResult.java @@ -49,7 +49,6 @@ public class FriendAddRequestResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_ADD_REQUEST_RESULT.writeId(packet); - packet.writeD(_result); packet.writeD(_charId); packet.writeS(_charName); @@ -57,7 +56,7 @@ public class FriendAddRequestResult implements IClientOutgoingPacket packet.writeD(_charObjectId); packet.writeD(_charLevel); packet.writeD(_charClassId); - packet.writeH(0x00); // Always 0 on retail + packet.writeH(0); // Always 0 on retail return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java index a135944662..13a7d01967 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java @@ -86,12 +86,10 @@ public class FriendList implements IClientOutgoingPacket } continue; } - if (player1.isOnline()) { online = true; } - classid = player1.getClassId().getId(); level = player1.getLevel(); _info.add(new FriendInfo(objId, name, online, classid, level)); @@ -102,14 +100,13 @@ public class FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._classid); packet.writeD(info._level); } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java index 07c23f9fd2..1bb4142e34 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendRemove.java @@ -38,7 +38,6 @@ public class FriendRemove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_REMOVE.writeId(packet); - packet.writeD(_responce); packet.writeS(_charName); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java index e8dbddcd63..a3990c0879 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/FriendStatus.java @@ -52,7 +52,6 @@ public class FriendStatus implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.FRIEND_STATUS.writeId(packet); - packet.writeD(_type); packet.writeS(_name); switch (_type) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java index 8752104e06..78da5850b8 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2Friend.java @@ -50,7 +50,6 @@ public class L2Friend implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND.writeId(packet); - packet.writeD(_action ? 1 : 3); // 1-add 3-remove packet.writeD(_objid); packet.writeS(_name); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java index b69a253635..e50693cb11 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/friend/L2FriendList.java @@ -81,17 +81,16 @@ public class L2FriendList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.L2_FRIEND_LIST.writeId(packet); - packet.writeD(_info.size()); for (FriendInfo info : _info) { packet.writeD(info._objId); // character id packet.writeS(info._name); - packet.writeD(info._online ? 0x01 : 0x00); // online - packet.writeD(info._online ? info._objId : 0x00); // object id if online + packet.writeD(info._online ? 1 : 0); // online + packet.writeD(info._online ? info._objId : 0); // object id if online packet.writeD(info._level); packet.writeD(info._classId); - packet.writeH(0x00); + packet.writeH(0); } return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java index 0d4fa5cb5d..d0b92dbd1d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneEnter.java @@ -40,7 +40,7 @@ public class TimedHuntingZoneEnter implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); - packet.writeC(0x01); // bEnterSuccess + packet.writeC(1); // bEnterSuccess packet.writeD(_zoneId); packet.writeD((int) ((Chronos.currentTimeMillis() / 60) / 1000)); // nEnterTimeStamp (current time in minutes) packet.writeD(_player.getTimedHuntingZoneRemainingTime(_zoneId) / 1000); // nRemainTime (zone left time) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java index 2c93f25c76..c80dbcfa6a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/huntingzones/TimedHuntingZoneExit.java @@ -35,7 +35,7 @@ public class TimedHuntingZoneExit implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TIME_RESTRICT_FIELD_USER_ENTER.writeId(packet); - packet.writeC(0x00); // bEnterSuccess + packet.writeC(0); // bEnterSuccess return true; } } \ No newline at end of file diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java index 6fc3384705..d0bf1fdfde 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemListNew.java @@ -43,7 +43,6 @@ public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket { _shopType = shopType; _player = player; - switch (shopType) { case 3: // Normal Lcoin Shop @@ -72,10 +71,9 @@ public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PURCHASE_LIMIT_SHOP_ITEM_LIST_NEW.writeId(packet); - packet.writeC(_shopType); - packet.writeC(0x01); // Page. (311) - packet.writeC(0x01); // MaxPage. (311) + packet.writeC(1); // Page. (311) + packet.writeC(1); // MaxPage. (311) packet.writeD(_products.size()); for (LimitShopProductHolder product : _products) { @@ -96,7 +94,6 @@ public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket packet.writeH(product.getIngredientEnchants()[2]); packet.writeH(product.getIngredientEnchants()[3]); // 306 packet.writeH(product.getIngredientEnchants()[4]); // 306 - // Check limits. if (product.getAccountDailyLimit() > 0) // Sale period. { @@ -104,7 +101,7 @@ public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket { if ((_player.getAccountVariables().getLong(AccountVariables.LCOIN_SHOP_PRODUCT_TIME + product.getProductionId(), 0) + 86400000) > Chronos.currentTimeMillis()) { - packet.writeD(0x00); + packet.writeD(0); } else // Reset limit. { @@ -121,7 +118,7 @@ public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket { if (_player.getAccountVariables().getInt(AccountVariables.LCOIN_SHOP_PRODUCT_COUNT + product.getProductionId(), 0) >= product.getAccountBuyLimit()) { - packet.writeD(0x00); + packet.writeD(0); } else { @@ -130,13 +127,12 @@ public class ExPurchaseLimitShopItemListNew implements IClientOutgoingPacket } else // No account limits. { - packet.writeD(0x01); + packet.writeD(1); } - packet.writeD(0x00); // nRemainSec - packet.writeD(0x00); // nRemainServerItemAmount - packet.writeH(0x00); // sCircleNum (311) + packet.writeD(0); // nRemainSec + packet.writeD(0); // nRemainServerItemAmount + packet.writeH(0); // sCircleNum (311) } - return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemResult.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemResult.java index d2e7f33d40..fafd159bca 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemResult.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/limitshop/ExPurchaseLimitShopItemResult.java @@ -43,7 +43,6 @@ public class ExPurchaseLimitShopItemResult implements IClientOutgoingPacket _category = category; _productId = productId; _rewards = rewards; - switch (_category) { case 3: // Normal Lcoin Shop diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampExpInfoUI.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampExpInfoUI.java index 8e23bfb677..52777d85fc 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampExpInfoUI.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampExpInfoUI.java @@ -38,7 +38,7 @@ public class ExMagicLampExpInfoUI implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MAGICLAMP_EXP_INFO.writeId(packet); - packet.writeD(Config.ENABLE_MAGIC_LAMP ? 0x01 : 0x00); // IsOpen + packet.writeD(Config.ENABLE_MAGIC_LAMP ? 1 : 0); // IsOpen packet.writeD(Config.MAGIC_LAMP_MAX_LEVEL_EXP); // MaxMagicLampExp packet.writeD(_player.getLampExp()); // MagicLampExp packet.writeD(_player.getLampCount()); // MagicLampCount diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java index 677c09091f..706c179a9c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorAdd.java @@ -37,7 +37,6 @@ public class ExMentorAdd implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_ADD.writeId(packet); - packet.writeS(_mentor.getName()); packet.writeD(_mentor.getActiveClass()); packet.writeD(_mentor.getLevel()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java index b3e3dcb1e7..2f08d72ba6 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ExMentorList.java @@ -63,9 +63,8 @@ public class ExMentorList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MENTOR_LIST.writeId(packet); - packet.writeD(_type); - packet.writeD(0x00); + packet.writeD(0); packet.writeD(_mentees.size()); for (Mentee mentee : _mentees) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java index e2a71fecd7..3f3a83b27d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/mentoring/ListMenteeWaiting.java @@ -30,6 +30,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ListMenteeWaiting implements IClientOutgoingPacket { private static final int PLAYERS_PER_PAGE = 64; + private final List _possibleCandiates = new ArrayList<>(); private final int _page; @@ -49,18 +50,15 @@ public class ListMenteeWaiting implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.LIST_MENTEE_WAITING.writeId(packet); - - packet.writeD(0x01); // always 1 in retail + packet.writeD(1); // always 1 in retail if (_possibleCandiates.isEmpty()) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); return true; } - packet.writeD(_possibleCandiates.size()); packet.writeD(_possibleCandiates.size() % PLAYERS_PER_PAGE); - for (Player player : _possibleCandiates) { if ((1 <= (PLAYERS_PER_PAGE * _page)) && (1 > (PLAYERS_PER_PAGE * (_page - 1)))) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java index cf65146546..e4b4e6dc6f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/ExPetInfo.java @@ -44,10 +44,8 @@ public class ExPetInfo extends AbstractMaskPacket (byte) 0x00, (byte) 0x00 }; - private int _initSize = 0; private int _blockSize = 0; - private int _clanCrest = 0; private int _clanLargeCrest = 0; private int _allyCrest = 0; @@ -69,88 +67,71 @@ public class ExPetInfo extends AbstractMaskPacket _masks[2] |= 0x10; addComponentType(NpcInfoType.NAME); } - addComponentType(NpcInfoType.ATTACKABLE, NpcInfoType.RELATIONS, NpcInfoType.TITLE, NpcInfoType.ID, NpcInfoType.POSITION, NpcInfoType.ALIVE, NpcInfoType.RUNNING, NpcInfoType.PVP_FLAG); if (summon.getHeading() > 0) { addComponentType(NpcInfoType.HEADING); } - if ((summon.getStat().getPAtkSpd() > 0) || (summon.getStat().getMAtkSpd() > 0)) { addComponentType(NpcInfoType.ATK_CAST_SPEED); } - if (summon.getRunSpeed() > 0) { addComponentType(NpcInfoType.SPEED_MULTIPLIER); } - if ((summon.getWeapon() > 0) || (summon.getArmor() > 0)) { addComponentType(NpcInfoType.EQUIPPED); } - if (summon.getTeam() != Team.NONE) { addComponentType(NpcInfoType.TEAM); } - if (summon.isInsideZone(ZoneId.WATER) || summon.isFlying()) { addComponentType(NpcInfoType.SWIM_OR_FLY); } - if (summon.isFlying()) { addComponentType(NpcInfoType.FLYING); } - if (summon.getMaxHp() > 0) { addComponentType(NpcInfoType.MAX_HP); } - if (summon.getMaxMp() > 0) { addComponentType(NpcInfoType.MAX_MP); } - if (summon.getCurrentHp() <= summon.getMaxHp()) { addComponentType(NpcInfoType.CURRENT_HP); } - if (summon.getCurrentMp() <= summon.getMaxMp()) { addComponentType(NpcInfoType.CURRENT_MP); } - if (!_abnormalVisualEffects.isEmpty()) { addComponentType(NpcInfoType.ABNORMALS); } - if (summon.getTemplate().getWeaponEnchant() > 0) { addComponentType(NpcInfoType.ENCHANT); } - if (summon.getTransformationDisplayId() > 0) { addComponentType(NpcInfoType.TRANSFORMATION); } - if (summon.isShowSummonAnimation()) { addComponentType(NpcInfoType.SUMMONED); } - if (summon.getReputation() != 0) { addComponentType(NpcInfoType.REPUTATION); } - if (summon.getOwner().getClan() != null) { _clanId = summon.getOwner().getAppearance().getVisibleClanId(); @@ -160,9 +141,7 @@ public class ExPetInfo extends AbstractMaskPacket _allyId = summon.getOwner().getAppearance().getVisibleAllyCrestId(); addComponentType(NpcInfoType.CLAN); } - addComponentType(NpcInfoType.COLOR_EFFECT); - // TODO: Confirm me if (summon.isInCombat()) { @@ -176,9 +155,8 @@ public class ExPetInfo extends AbstractMaskPacket { _statusMask |= 0x04; } - _statusMask |= 0x08; - if (_statusMask != 0) + if (_statusMask != 0x00) { addComponentType(NpcInfoType.VISUAL_STATE); } @@ -228,28 +206,24 @@ public class ExPetInfo extends AbstractMaskPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PET_INFO.writeId(packet); - packet.writeD(_summon.getObjectId()); packet.writeC(_value); // 0=teleported 1=default 2=summoned packet.writeH(37); // mask_bits_37 packet.writeB(_masks); - // Block 1 packet.writeC(_initSize); - if (containsMask(NpcInfoType.ATTACKABLE)) { - packet.writeC(_summon.isAutoAttackable(_attacker) ? 0x01 : 0x00); + packet.writeC(_summon.isAutoAttackable(_attacker) ? 1 : 0); } if (containsMask(NpcInfoType.RELATIONS)) { - packet.writeQ(0x00); + packet.writeQ(0); } if (containsMask(NpcInfoType.TITLE)) { packet.writeS(_title); } - // Block 2 packet.writeH(_blockSize); if (containsMask(NpcInfoType.ID)) @@ -268,7 +242,7 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.UNKNOWN2)) { - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.ATK_CAST_SPEED)) { @@ -284,19 +258,19 @@ public class ExPetInfo extends AbstractMaskPacket { packet.writeD(_summon.getWeapon()); packet.writeD(_summon.getArmor()); // Armor id? - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.ALIVE)) { - packet.writeC(_summon.isDead() ? 0x00 : 0x01); + packet.writeC(_summon.isDead() ? 0 : 1); } if (containsMask(NpcInfoType.RUNNING)) { - packet.writeC(_summon.isRunning() ? 0x01 : 0x00); + packet.writeC(_summon.isRunning() ? 1 : 0); } if (containsMask(NpcInfoType.SWIM_OR_FLY)) { - packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 0x01 : _summon.isFlying() ? 0x02 : 0x00); + packet.writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); } if (containsMask(NpcInfoType.TEAM)) { @@ -308,20 +282,20 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.FLYING)) { - packet.writeD(_summon.isFlying() ? 0x01 : 00); + packet.writeD(_summon.isFlying() ? 1 : 0); } if (containsMask(NpcInfoType.CLONE)) { - packet.writeD(0x00); // Player ObjectId with Decoy + packet.writeD(0); // Player ObjectId with Decoy } if (containsMask(NpcInfoType.COLOR_EFFECT)) { // No visual effect - packet.writeD(0x00); // Unknown + packet.writeD(0); // Unknown } if (containsMask(NpcInfoType.DISPLAY_EFFECT)) { - packet.writeD(0x00); + packet.writeD(0); } if (containsMask(NpcInfoType.TRANSFORMATION)) { @@ -345,12 +319,12 @@ public class ExPetInfo extends AbstractMaskPacket } if (containsMask(NpcInfoType.SUMMONED)) { - packet.writeC(_summon.isShowSummonAnimation() ? 0x02 : 0x00); // 2 - do some animation on spawn + packet.writeC(_summon.isShowSummonAnimation() ? 2 : 0); // 2 - do some animation on spawn } if (containsMask(NpcInfoType.UNKNOWN12)) { - packet.writeD(0x00); - packet.writeD(0x00); + packet.writeD(0); + packet.writeD(0); } if (containsMask(NpcInfoType.NAME)) { @@ -380,12 +354,10 @@ public class ExPetInfo extends AbstractMaskPacket packet.writeD(_allyId); packet.writeD(_allyCrest); } - if (containsMask(NpcInfoType.VISUAL_STATE)) { packet.writeD(_statusMask); } - if (containsMask(NpcInfoType.ABNORMALS)) { packet.writeH(_abnormalVisualEffects.size()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetDelete.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetDelete.java index 17dba0fec9..f9b697323e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetDelete.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetDelete.java @@ -35,7 +35,6 @@ public class PetDelete implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_DELETE.writeId(packet); - packet.writeD(_petType); packet.writeD(_petObjId); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java index 6e26ae016c..fa9c9d8693 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInfo.java @@ -71,7 +71,6 @@ public class PetInfo implements IClientOutgoingPacket _curFed = sum.getLifeTimeRemaining(); _maxFed = sum.getLifeTime(); } - if (summon.isBetrayed()) { _statusMask |= 0x01; // Auto attackable status @@ -99,19 +98,15 @@ public class PetInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_INFO.writeId(packet); - packet.writeC(_summon.getSummonType()); packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getTemplate().getDisplayId() + 1000000); - packet.writeD(_summon.getX()); packet.writeD(_summon.getY()); packet.writeD(_summon.getZ()); packet.writeD(_summon.getHeading()); - packet.writeD(_summon.getStat().getMAtkSpd()); packet.writeD(_summon.getStat().getPAtkSpd()); - packet.writeH(_runSpd); packet.writeH(_walkSpd); packet.writeH(_swimRunSpd); @@ -120,16 +115,13 @@ public class PetInfo implements IClientOutgoingPacket packet.writeH(_flWalkSpd); packet.writeH(_flyRunSpd); packet.writeH(_flyWalkSpd); - packet.writeF(_moveMultiplier); packet.writeF(_summon.getAttackSpeedMultiplier()); // attack speed multiplier packet.writeF(_summon.getTemplate().getFCollisionRadius()); packet.writeF(_summon.getTemplate().getFCollisionHeight()); - packet.writeD(_summon.getWeapon()); // right hand weapon packet.writeD(_summon.getArmor()); // body armor - packet.writeD(0x00); // left hand weapon - + packet.writeD(0); // left hand weapon packet.writeC(_summon.isDead() ? 0 : _summon.isShowSummonAnimation() ? 2 : _value); packet.writeD(-1); // High Five NPCString ID if (_summon.isPet()) @@ -142,24 +134,19 @@ public class PetInfo implements IClientOutgoingPacket } packet.writeD(-1); // High Five NPCString ID packet.writeS(_summon.getTitle()); // owner name - packet.writeC(_summon.getPvpFlag()); // confirmed packet.writeD(_summon.getReputation()); // confirmed - packet.writeD(_curFed); // how fed it is packet.writeD(_maxFed); // max fed it can be packet.writeD((int) _summon.getCurrentHp()); // current hp packet.writeD(_summon.getMaxHp()); // max hp packet.writeD((int) _summon.getCurrentMp()); // current mp packet.writeD(_summon.getMaxMp()); // max mp - packet.writeQ(_summon.getStat().getSp()); // sp packet.writeH(_summon.getLevel()); // level packet.writeQ(_summon.getStat().getExp()); - // 0% absolute value packet.writeQ(Math.min(_summon.getExpForThisLevel(), _summon.getStat().getExp())); // 0% absolute value - packet.writeQ(_summon.getExpForNextLevel()); // 100% absoulte value packet.writeD(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0); // weight packet.writeD(_summon.getMaxLoad()); // max weight it can carry @@ -176,12 +163,10 @@ public class PetInfo implements IClientOutgoingPacket packet.writeD((int) _summon.getStat().getMoveSpeed()); // speed packet.writeD(_summon.getPAtkSpd()); // atkspeed packet.writeD(_summon.getMAtkSpd()); // casting speed - packet.writeC(0); // TODO: Check me, might be ride status packet.writeC(_summon.getTeam().getId()); // Confirmed packet.writeC(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit - Confirmed packet.writeC(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit - - Confirmed - packet.writeD(-1); packet.writeD(0); final Set aves = _summon.getEffectList().getCurrentAbnormalVisualEffects(); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java index f45d3262ac..19688209cb 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetInventoryUpdate.java @@ -47,7 +47,6 @@ public class PetInventoryUpdate extends AbstractInventoryUpdate public boolean write(PacketWriter packet) { OutgoingPackets.PET_INVENTORY_UPDATE.writeId(packet); - writeItems(packet); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java index cd0744b2c4..80e9863809 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetItemList.java @@ -36,7 +36,6 @@ public class PetItemList extends AbstractItemPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_ITEM_LIST.writeId(packet); - packet.writeH(_items.size()); for (Item item : _items) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusShow.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusShow.java index 68143367e8..d2e571e518 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusShow.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusShow.java @@ -39,7 +39,6 @@ public class PetStatusShow implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_SHOW.writeId(packet); - packet.writeD(_summonType); packet.writeD(_summonObjectId); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusUpdate.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusUpdate.java index c29dec61c1..9f1edddf54 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusUpdate.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pet/PetStatusUpdate.java @@ -53,7 +53,6 @@ public class PetStatusUpdate implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.PET_STATUS_UPDATE.writeId(packet); - packet.writeD(_summon.getSummonType()); packet.writeD(_summon.getObjectId()); packet.writeD(_summon.getX()); @@ -70,7 +69,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket packet.writeQ(_summon.getStat().getExp()); packet.writeQ(_summon.getExpForThisLevel()); // 0% absolute value packet.writeQ(_summon.getExpForNextLevel()); // 100% absolute value - packet.writeD(0x01); // TODO: Find me! + packet.writeD(1); // TODO: Find me! return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeClassicRaidInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeClassicRaidInfo.java index 36168fb35d..df5be64f25 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeClassicRaidInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV3/ExPledgeClassicRaidInfo.java @@ -39,7 +39,6 @@ public class ExPledgeClassicRaidInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_CLASSIC_RAID_INFO.writeId(packet); - if (_clan == null) { packet.writeD(0); @@ -48,7 +47,6 @@ public class ExPledgeClassicRaidInfo implements IClientOutgoingPacket { final int stage = GlobalVariablesManager.getInstance().getInt(GlobalVariablesManager.MONSTER_ARENA_VARIABLE + _clan.getId(), 0); packet.writeD(stage); - // Skill rewards. packet.writeD(5); for (int i = 1; i <= 5; i++) @@ -57,7 +55,6 @@ public class ExPledgeClassicRaidInfo implements IClientOutgoingPacket packet.writeD(i); } } - return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java index 43f7f9a362..cc69c4af1e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusList.java @@ -34,12 +34,12 @@ public class ExPledgeBonusList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_BONUS_LIST.writeId(packet); - packet.writeC(0x00); // 140 + packet.writeC(0); // 140 ClanRewardData.getInstance().getClanRewardBonuses(ClanRewardType.MEMBERS_ONLINE).stream().sorted(Comparator.comparingInt(ClanRewardBonus::getLevel)).forEach(bonus -> { packet.writeD(bonus.getSkillReward().getSkillId()); }); - packet.writeC(0x00); // 140 + packet.writeC(0); // 140 ClanRewardData.getInstance().getClanRewardBonuses(ClanRewardType.HUNTING_MONSTERS).stream().sorted(Comparator.comparingInt(ClanRewardBonus::getLevel)).forEach(bonus -> { packet.writeD(bonus.getSkillReward().getSkillId()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java index 25fa9b94e2..3db1b1c11b 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pledgebonus/ExPledgeBonusOpen.java @@ -50,7 +50,6 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Player: " + _player + " attempting to write to a null clan!"); return false; } - final ClanRewardBonus highestMembersOnlineBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.MEMBERS_ONLINE); final ClanRewardBonus highestHuntingBonus = ClanRewardData.getInstance().getHighestReward(ClanRewardType.HUNTING_MONSTERS); final ClanRewardBonus membersOnlineBonus = ClanRewardType.MEMBERS_ONLINE.getAvailableBonus(clan); @@ -75,25 +74,22 @@ public class ExPledgeBonusOpen implements IClientOutgoingPacket LOGGER.warning("Couldn't find skill reward for highest available hunting bonus!!"); return false; } - // General OP Code OutgoingPackets.EX_PLEDGE_BONUS_OPEN.writeId(packet); - // Members online bonus packet.writeD(highestMembersOnlineBonus.getRequiredAmount()); packet.writeD(clan.getMaxOnlineMembers()); - packet.writeC(0x02); // 140 - packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0x00); - packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 0x01 : 0x00); - + packet.writeC(2); // 140 + packet.writeD(membersOnlineBonus != null ? highestMembersOnlineBonus.getSkillReward().getSkillId() : 0); + packet.writeC(membersOnlineBonus != null ? membersOnlineBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.MEMBERS_ONLINE) ? 1 : 0); // Hunting bonus packet.writeD(highestHuntingBonus.getRequiredAmount()); packet.writeD(clan.getHuntingPoints()); - packet.writeC(0x02); // 140 - packet.writeD(huntingBonus != null ? highestHuntingBonus.getSkillReward().getSkillId() : 0x00); - packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0x00); - packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 0x01 : 0x00); + packet.writeC(2); // 140 + packet.writeD(huntingBonus != null ? highestHuntingBonus.getSkillReward().getSkillId() : 0); + packet.writeC(huntingBonus != null ? huntingBonus.getLevel() : 0); + packet.writeC(clan.canClaimBonusReward(_player, ClanRewardType.HUNTING_MONSTERS) ? 1 : 0); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pledgedonation/ExPledgeContributionList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pledgedonation/ExPledgeContributionList.java index d4f7953ec1..21020e8d87 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pledgedonation/ExPledgeContributionList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/pledgedonation/ExPledgeContributionList.java @@ -39,7 +39,6 @@ public class ExPledgeContributionList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PLEDGE_CONTRIBUTION_LIST.writeId(packet); - packet.writeD(_contributors.size()); for (ClanMember contributor : _contributors) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java index fb735b8925..e75426e598 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRBuyProduct.java @@ -69,7 +69,6 @@ public class ExBRBuyProduct implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_BUY_PRODUCT.writeId(packet); - packet.writeD(_reply); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java index 742b3eba9d..91a186b81d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRGamePoint.java @@ -39,10 +39,9 @@ public class ExBRGamePoint implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_GAME_POINT.writeId(packet); - packet.writeD(_charId); packet.writeQ(_charPoints); - packet.writeD(0x00); + packet.writeD(0); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java index 50f21df46a..e36f2ff502 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductInfo.java @@ -45,7 +45,6 @@ public class ExBRProductInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_INFO.writeId(packet); - packet.writeD(_item.getBrId()); packet.writeD(_item.getPrice()); packet.writeD(_item.getItems().size()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java index dc851ffd43..0f042ba043 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/primeshop/ExBRProductList.java @@ -45,9 +45,8 @@ public class ExBRProductList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_BR_PRODUCT_LIST.writeId(packet); - packet.writeQ(_player.getAdena()); // Adena - packet.writeQ(0x00); // Hero coins + packet.writeQ(0); // Hero coins packet.writeC(_type); // Type 0 - Home, 1 - History, 2 - Favorites packet.writeD(_primeList.size()); for (PrimeShopGroup brItem : _primeList) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java index 320140ace6..bf67164bfe 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java @@ -39,7 +39,6 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RAID_BOSS_SPAWN_INFO.writeId(packet); - packet.writeD(_statuses.size()); // count for (Entry entry : _statuses.entrySet()) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftExtract.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftExtract.java index 5d082bad06..0ec53792ce 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftExtract.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftExtract.java @@ -33,7 +33,7 @@ public class ExCraftExtract implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CRAFT_EXTRACT.writeId(packet); - packet.writeC(0x00); + packet.writeC(0); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftInfo.java index 24b3008866..b9dc4c096c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftInfo.java @@ -38,12 +38,10 @@ public class ExCraftInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CRAFT_INFO.writeId(packet); - final PlayerRandomCraft rc = _player.getRandomCraft(); packet.writeD(rc.getFullCraftPoints()); // Full points owned packet.writeD(rc.getCraftPoints()); // Craft Points (10k = 1%) - packet.writeC(rc.isSayhaRoll() ? 0x01 : 0x00); // Will get sayha? - + packet.writeC(rc.isSayhaRoll() ? 1 : 0); // Will get sayha? return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomInfo.java index 4d0da6f059..638956b1c5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomInfo.java @@ -40,7 +40,6 @@ public class ExCraftRandomInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CRAFT_RANDOM_INFO.writeId(packet); - final List rewards = _player.getRandomCraft().getRewards(); int size = 5; packet.writeD(size); // size @@ -49,30 +48,28 @@ public class ExCraftRandomInfo implements IClientOutgoingPacket final RandomCraftRewardItemHolder holder = rewards.get(i); if ((holder != null) && (holder.getItemId() != 0)) { - packet.writeC(holder.isLocked() ? 0x01 : 0x00); // Locked + packet.writeC(holder.isLocked() ? 1 : 0); // Locked packet.writeD(holder.getLockLeft()); // Rolls it will stay locked packet.writeD(holder.getItemId()); // Item id packet.writeQ(holder.getItemCount()); // Item count } else { - packet.writeC(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeQ(0x00); + packet.writeC(0); + packet.writeD(0); + packet.writeD(0); + packet.writeQ(0); } size--; } - // Write missing for (int i = size; i > 0; i--) { - packet.writeC(0x00); - packet.writeD(0x00); - packet.writeD(0x00); - packet.writeQ(0x00); + packet.writeC(0); + packet.writeD(0); + packet.writeD(0); + packet.writeQ(0); } - return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomLockSlot.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomLockSlot.java index d4f6f05a0c..206d10c5f1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomLockSlot.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomLockSlot.java @@ -33,7 +33,7 @@ public class ExCraftRandomLockSlot implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CRAFT_RANDOM_LOCK_SLOT.writeId(packet); - packet.writeC(0x00); + packet.writeC(0); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomMake.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomMake.java index 9b82b3d21e..1da2dae3c9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomMake.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomMake.java @@ -38,11 +38,11 @@ public class ExCraftRandomMake implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CRAFT_RANDOM_MAKE.writeId(packet); - packet.writeC(0x00); // Close window + packet.writeC(0); // Close window packet.writeH(0x0F); // Unknown packet.writeD(_itemId); packet.writeQ(_itemCount); - packet.writeC(0x00); // Enchantment level + packet.writeC(0); // Enchantment level return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomRefresh.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomRefresh.java index 8ffe0f4ede..084eeb46d3 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomRefresh.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/randomcraft/ExCraftRandomRefresh.java @@ -33,7 +33,7 @@ public class ExCraftRandomRefresh implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_CRAFT_RANDOM_REFRESH.writeId(packet); - packet.writeC(0x00); + packet.writeC(0); return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java index d1896f32a7..5c835c1dea 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java @@ -47,7 +47,6 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_HERO_AND_LEGEND_INFO.writeId(packet); - if (!Hero.getInstance().getHeroes().isEmpty()) { try (Connection con = DatabaseFactory.getConnection(); @@ -63,7 +62,6 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket { packet.writeC(1); // ?? shows 78 on JP packet.writeC(1); // ?? shows 0 on JP - packet.writeString(rset.getString("char_name")); final int clanId = rset.getInt("clanid"); if (clanId > 0) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java index b7395dee4e..3e7261542a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadMyRankingInfo.java @@ -55,7 +55,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_MY_RANKING_INFO.writeId(packet); - final Date date = new Date(); final Calendar calendar = new GregorianCalendar(); calendar.setTime(date); @@ -99,7 +98,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket { PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } - int previousPlace = 0; int previousWins = 0; int previousLoses = 0; @@ -128,7 +126,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket { PacketLogger.warning("Olympiad my ranking: Couldnt load data: " + e.getMessage()); } - int heroCount = 0; int legendCount = 0; if (Hero.getInstance().getCompleteHeroes().containsKey(_player.getObjectId())) @@ -137,7 +134,6 @@ public class ExOlympiadMyRankingInfo implements IClientOutgoingPacket heroCount = hero.getInt("count", 0); legendCount = hero.getInt("legend_count", 0); } - packet.writeD(year); // Year packet.writeD(month); // Month packet.writeD(Math.min(Olympiad.getInstance().getCurrentCycle() - 1, 0)); // cycle ? diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java index bad88659b0..db5efac89a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java @@ -64,20 +64,17 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_OLYMPIAD_RANKING_INFO.writeId(packet); - packet.writeC(_tabId); // Tab id packet.writeC(_rankingType); // ranking type packet.writeC(_unk); // unk, shows 1 all time packet.writeD(_classId); // class id (default 148) or caller class id for personal rank packet.writeD(_serverId); // 0 - all servers, server id - for caller server packet.writeD(933); // unk, 933 all time - if (!_playerList.isEmpty()) { final RankingOlympiadCategory category = RankingOlympiadCategory.values()[_tabId]; writeFilteredRankingData(packet, category, category.getScopeByGroup(_rankingType), ClassId.getClassId(_classId)); } - return true; } @@ -100,10 +97,8 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket private void writeScopeData(PacketWriter packet, RankingOlympiadScope scope, List> list, List> snapshot) { - Entry playerData = list.stream().filter(it -> it.getValue().getInt("charId", 0) == _player.getObjectId()).findFirst().orElse(null); final int indexOf = list.indexOf(playerData); - final List> limited; switch (scope) { @@ -132,9 +127,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket limited = Collections.emptyList(); } } - packet.writeD(limited.size()); - int rank = 1; for (Entry data : limited.stream().sorted(Entry.comparingByKey()).collect(Collectors.toList())) { @@ -143,7 +136,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket packet.writeString(player.getString("name")); // name packet.writeString(player.getString("clanName")); // clan name packet.writeD(scope == RankingOlympiadScope.SELF ? data.getKey() : curRank); // rank - if (!snapshot.isEmpty()) { int snapshotRank = 1; @@ -160,7 +152,6 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket { packet.writeD(scope == RankingOlympiadScope.SELF ? data.getKey() : curRank); } - packet.writeD(Config.SERVER_ID); // server id packet.writeD(player.getInt("level")); // level packet.writeD(player.getInt("classId")); // class id diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPetRankingList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPetRankingList.java index 1530d22cc2..8fd721e11a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPetRankingList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPetRankingList.java @@ -60,13 +60,11 @@ public class ExPetRankingList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_PET_RANKING_LIST.writeId(packet); - packet.writeC(_season); packet.writeC(_tabId); packet.writeC(_type); packet.writeD(_race); packet.writeC(0); - if (!_playerList.isEmpty() && (_type != 255) && (_race != 255)) { final RankingCategory category = RankingCategory.values()[_season]; @@ -76,7 +74,6 @@ public class ExPetRankingList implements IClientOutgoingPacket { packet.writeD(0); } - return true; } @@ -111,7 +108,6 @@ public class ExPetRankingList implements IClientOutgoingPacket { Entry playerData = list.stream().filter(it -> it.getValue().getInt("charId", 0) == _player.getObjectId()).findFirst().orElse(null); final int indexOf = list.indexOf(playerData); - final List> limited; switch (scope) { @@ -140,9 +136,7 @@ public class ExPetRankingList implements IClientOutgoingPacket limited = Collections.emptyList(); } } - packet.writeD(limited.size()); - int rank = 1; for (Entry data : limited.stream().sorted(Entry.comparingByKey()).collect(Collectors.toList())) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPledgeRankingList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPledgeRankingList.java index 363ba2eff3..2af1892fa7 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPledgeRankingList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPledgeRankingList.java @@ -67,13 +67,10 @@ public class ExPledgeRankingList implements IClientOutgoingPacket private void writeScopeData(PacketWriter packet, boolean isTop150, List> list, List> snapshot) { - Entry playerData = list.stream().filter(it -> it.getValue().getInt("clan_id", 0) == _player.getClanId()).findFirst().orElse(null); final int indexOf = list.indexOf(playerData); final List> limited = isTop150 ? list.stream().limit(150).collect(Collectors.toList()) : playerData == null ? Collections.emptyList() : list.subList(Math.max(0, indexOf - 10), Math.min(list.size(), indexOf + 10)); - packet.writeD(limited.size()); - int rank = 1; for (Entry data : limited.stream().sorted(Entry.comparingByKey()).collect(Collectors.toList())) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingList.java index ad8f5d0034..164286d6f1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingList.java @@ -114,10 +114,8 @@ public class ExPvpRankingList implements IClientOutgoingPacket private void writeScopeData(PacketWriter packet, RankingScope scope, List> list, List> snapshot) { - Entry playerData = list.stream().filter(it -> it.getValue().getInt("charId", 0) == _player.getObjectId()).findFirst().orElse(null); final int indexOf = list.indexOf(playerData); - final List> limited; switch (scope) { @@ -146,9 +144,7 @@ public class ExPvpRankingList implements IClientOutgoingPacket limited = Collections.emptyList(); } } - packet.writeD(limited.size()); - int rank = 1; for (Entry data : limited.stream().sorted(Entry.comparingByKey()).collect(Collectors.toList())) { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java index 3b3728f090..f2e96db6b1 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java @@ -48,7 +48,6 @@ public class ExRankingCharInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RANKING_CHAR_INFO.writeId(packet); - if (!_playerList.isEmpty()) { for (Integer id : _playerList.keySet()) @@ -59,7 +58,6 @@ public class ExRankingCharInfo implements IClientOutgoingPacket packet.writeD(id); // server rank packet.writeD(player.getInt("raceRank")); // race rank packet.writeD(player.getInt("classRank")); // class rank - for (Integer id2 : _snapshotList.keySet()) { final StatSet snapshot = _snapshotList.get(id2); @@ -68,7 +66,7 @@ public class ExRankingCharInfo implements IClientOutgoingPacket packet.writeD(id2); // server rank snapshot packet.writeD(snapshot.getInt("raceRank")); // race rank snapshot packet.writeD(snapshot.getInt("classRank")); // class rank snapshot - packet.writeD(0); + packet.writeD(0); packet.writeD(0); packet.writeD(0); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java index f89d104f27..54de929cd5 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java @@ -55,12 +55,10 @@ public class ExRankingCharRankers implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_RANKING_CHAR_RANKERS.writeId(packet); - packet.writeC(_group); packet.writeC(_scope); packet.writeD(_race); packet.writeD(_player.getClassId().getId()); - if (!_playerList.isEmpty()) { switch (_group) @@ -71,7 +69,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket { final int count = _playerList.size() > 150 ? 150 : _playerList.size(); packet.writeD(count); - for (Integer id : _playerList.keySet()) { final StatSet player = _playerList.get(id); @@ -130,7 +127,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket packet.writeD(plr.getInt("classId")); packet.writeD(plr.getInt("race")); packet.writeD(id2); // server rank - if (!_snapshotList.isEmpty()) { for (Integer id3 : _snapshotList.keySet()) @@ -168,7 +164,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } } packet.writeD(count > 100 ? 100 : count); - int i = 1; for (Integer id : _playerList.keySet()) { @@ -218,7 +213,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket else { boolean found = false; - final Map raceList = new ConcurrentHashMap<>(); int i = 1; for (Integer id : _playerList.keySet()) @@ -230,7 +224,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket i++; } } - for (Integer id : raceList.keySet()) { final StatSet player = raceList.get(id); @@ -284,9 +277,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket i++; } } - packet.writeD(clanList.size()); - for (Integer id : clanList.keySet()) { final StatSet player = clanList.get(id); @@ -342,9 +333,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } } friendList.add(_player.getObjectId()); - packet.writeD(count); - for (int id : _playerList.keySet()) { final StatSet player = _playerList.get(id); @@ -381,7 +370,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket else { packet.writeD(1); - packet.writeString(_player.getName()); if (_player.getClan() != null) { @@ -431,7 +419,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket } } packet.writeD(count > 100 ? 100 : count); - int i = 1; for (Integer id : _playerList.keySet()) { @@ -481,7 +468,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket else { boolean found = false; - final Map raceList = new ConcurrentHashMap<>(); int i = 1; for (Integer id : _playerList.keySet()) @@ -493,7 +479,6 @@ public class ExRankingCharRankers implements IClientOutgoingPacket i++; } } - for (Integer id : raceList.keySet()) { final StatSet player = raceList.get(id); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java index 2463589c81..c09b3e899d 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMove.java @@ -47,18 +47,15 @@ public class ExFlyMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(_mapId); - packet.writeD(_locations.size()); for (SayuneEntry loc : _locations) { packet.writeD(loc.getId()); - packet.writeD(0x00); // ?? + packet.writeD(0); // ?? packet.writeD(loc.getX()); packet.writeD(loc.getY()); packet.writeD(loc.getZ()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java index 03fc6b580d..70b3fb25d2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExFlyMoveBroadcast.java @@ -47,16 +47,13 @@ public class ExFlyMoveBroadcast implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_FLY_MOVE_BROADCAST.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_type.ordinal()); packet.writeD(_mapId); - packet.writeD(_targetLoc.getX()); packet.writeD(_targetLoc.getY()); packet.writeD(_targetLoc.getZ()); - packet.writeD(0x00); // ? + packet.writeD(0); // ? packet.writeD(_currentLoc.getX()); packet.writeD(_currentLoc.getY()); packet.writeD(_currentLoc.getZ()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java index cfe11a27e0..49e5d86910 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/sayune/ExNotifyFlyMoveStart.java @@ -35,7 +35,6 @@ public class ExNotifyFlyMoveStart implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_NOTIFY_FLY_MOVE_START.writeId(packet); - return true; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java index d5640a47ef..0efa37ae8c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExMoveToLocationInShuttle.java @@ -51,7 +51,6 @@ public class ExMoveToLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_MOVE_TO_LOCATION_IN_SUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_airShipId); packet.writeD(_targetX); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java index 0cbe2c3e02..a0314c39aa 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOff.java @@ -46,7 +46,6 @@ public class ExShuttleGetOff implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_OFF.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_x); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java index 5211bef5ba..061bcafed9 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleGetOn.java @@ -43,7 +43,6 @@ public class ExShuttleGetOn implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_GET_ON.writeId(packet); - packet.writeD(_playerObjectId); packet.writeD(_shuttleObjectId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java index 97d54a9019..c8aee1fde7 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleInfo.java @@ -43,7 +43,6 @@ public class ExShuttleInfo implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SHUTTLE_INFO.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD(_shuttle.getX()); packet.writeD(_shuttle.getY()); @@ -60,8 +59,8 @@ public class ExShuttleInfo implements IClientOutgoingPacket packet.writeD(loc.getY()); packet.writeD(loc.getZ()); } - packet.writeD(stop.isDoorOpen() ? 0x01 : 0x00); - packet.writeD(stop.hasDoorChanged() ? 0x01 : 0x00); + packet.writeD(stop.isDoorOpen() ? 1 : 0); + packet.writeD(stop.hasDoorChanged() ? 1 : 0); } return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java index 6ba38f29a1..28b33b998e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExShuttleMove.java @@ -43,7 +43,6 @@ public class ExShuttleMove implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUTTLE_MOVE.writeId(packet); - packet.writeD(_shuttle.getObjectId()); packet.writeD((int) _shuttle.getStat().getMoveSpeed()); packet.writeD((int) _shuttle.getStat().getRotationSpeed()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java index bf2b6ea6eb..6c31189d6a 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExStopMoveInShuttle.java @@ -44,7 +44,6 @@ public class ExStopMoveInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_STOP_MOVE_IN_SHUTTLE.writeId(packet); - packet.writeD(_objectId); packet.writeD(_boatId); packet.writeD(_pos.getX()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java index f7f6849732..8492f42a6e 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/shuttle/ExValidateLocationInShuttle.java @@ -44,7 +44,6 @@ public class ExValidateLocationInShuttle implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_VALIDATE_LOCATION_IN_SHUTTLE.writeId(packet); - packet.writeD(_player.getObjectId()); packet.writeD(_shipId); packet.writeD(_loc.getX()); diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExShowSharingLocationUi.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExShowSharingLocationUi.java index ace3c3deeb..4f9698963c 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExShowSharingLocationUi.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExShowSharingLocationUi.java @@ -35,7 +35,6 @@ public class ExShowSharingLocationUi implements IClientOutgoingPacket @Override public boolean write(PacketWriter packet) { - OutgoingPackets.EX_SHARED_POSITION_SHARING_UI.writeId(packet); packet.writeQ(Config.SHARING_LOCATION_COST); return true; diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExTeleportFavoritesList.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExTeleportFavoritesList.java index 0f68a71088..6bd6a492d2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExTeleportFavoritesList.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExTeleportFavoritesList.java @@ -42,14 +42,12 @@ public class ExTeleportFavoritesList implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_TELEPORT_FAVORITES_LIST.writeId(packet); - - packet.writeC(_enable ? 0x01 : 0x00); + packet.writeC(_enable ? 1 : 0); packet.writeD(_teleports.size()); for (int id : _teleports) { packet.writeD(id); } - return true; } } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java index 1d59c6d002..e7654ed911 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/loginserver/network/serverpackets/AccountKicked.java @@ -60,7 +60,7 @@ public class AccountKicked implements IOutgoingPacket { OutgoingPackets.ACCOUNT_KICKED.writeId(packet); packet.writeD(_reason.getCode()); - return true; } } + diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java index 2e3a1f6163..1fe813e393 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/loginserver/network/serverpackets/GGAuth.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: response + * Format: d d: response */ public class GGAuth implements IOutgoingPacket { diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/loginserver/network/serverpackets/Init.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/loginserver/network/serverpackets/Init.java index 4b3f71f30e..d725f45ca2 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/loginserver/network/serverpackets/Init.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/loginserver/network/serverpackets/Init.java @@ -52,7 +52,6 @@ public class Init implements IOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.INIT.writeId(packet); - packet.writeD(_sessionId); // session id packet.writeD(0x0000c621); // protocol revision diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java index 8c534554a8..f4dcd22b00 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/loginserver/network/serverpackets/LoginFail.java @@ -21,7 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.loginserver.network.OutgoingPackets; /** - * Fromat: d d: the failure reason + * Format: d d: the failure reason */ public class LoginFail implements IOutgoingPacket {